From c4ba99b48bcc8c1ac54e5e59ec0104cf5b686c0e Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 04:26:24 +0100 Subject: [PATCH] rebuilt with debug package and specfile fixes [release 2.18.8-2mamba;Sat Jul 17 2021] --- README.md | 6 +- libgnomeprint-2.18.8-bison-3.7.6.patch | 39 +++++++++ libgnomeprint-2.18.8-glibc-2.33.patch | 9 +++ libgnomeprint-2.18.8-libfreetype-2.10.0.patch | 38 +++++++++ libgnomeprint.spec | 81 ++++++++++--------- 5 files changed, 130 insertions(+), 43 deletions(-) create mode 100644 libgnomeprint-2.18.8-bison-3.7.6.patch create mode 100644 libgnomeprint-2.18.8-glibc-2.33.patch create mode 100644 libgnomeprint-2.18.8-libfreetype-2.10.0.patch diff --git a/README.md b/README.md index 344aab1..723379b 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ GNOME Print is a C-based API that implements the Postscript imaging model. It is being used by various GNOME applications. -There are two extensions to the Postscript imaging model supported by GNOME -Print: Alpha channel support and anti-aliasing. -GNOME Print includes a rasterizing engine that transforms the requests into -bitmaps for native drivers. +There are two extensions to the Postscript imaging model supported by GNOME Print: Alpha channel support and anti-aliasing. +GNOME Print includes a rasterizing engine that transforms the requests into bitmaps for native drivers. diff --git a/libgnomeprint-2.18.8-bison-3.7.6.patch b/libgnomeprint-2.18.8-bison-3.7.6.patch new file mode 100644 index 0000000..d9fbbdd --- /dev/null +++ b/libgnomeprint-2.18.8-bison-3.7.6.patch @@ -0,0 +1,39 @@ +http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch + +--- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100 ++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100 +@@ -6,8 +6,6 @@ + #include + #include + +-#define YYPARSE_PARAM graph +- + static void + set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s) + { +@@ -99,7 +97,7 @@ + } + + static int yylex (void *lvalp); +-static int yyerror (const char *s); ++static int yyerror (graph_t *g, const char *s); + %} + + %union { +@@ -117,6 +115,7 @@ + %type

pool + + %pure_parser ++%parse-param { graph_t *graph } + + %start graph + %% +@@ -185,7 +184,7 @@ + %% + + static int +-yyerror (const char *s) ++yyerror (graph_t *g, const char *s) + { + return -1; + } diff --git a/libgnomeprint-2.18.8-glibc-2.33.patch b/libgnomeprint-2.18.8-glibc-2.33.patch new file mode 100644 index 0000000..dd91954 --- /dev/null +++ b/libgnomeprint-2.18.8-glibc-2.33.patch @@ -0,0 +1,9 @@ +--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c ++++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include diff --git a/libgnomeprint-2.18.8-libfreetype-2.10.0.patch b/libgnomeprint-2.18.8-libfreetype-2.10.0.patch new file mode 100644 index 0000000..7e1956b --- /dev/null +++ b/libgnomeprint-2.18.8-libfreetype-2.10.0.patch @@ -0,0 +1,38 @@ +Fix build with freetype 2.5.1. +https://bugzilla.gnome.org/show_bug.cgi?id=719592 +--- libgnomeprint/gnome-font-face.c.orig 2010-02-09 06:32:51.000000000 -0600 ++++ libgnomeprint/gnome-font-face.c 2013-11-30 04:10:52.000000000 -0600 +@@ -36,7 +36,8 @@ + #include + #include + +-#include ++#include ++#include FT_OUTLINE_H + + #include + #include +--- libgnomeprint/gnome-print-gdi.c.orig 2010-02-09 06:32:51.000000000 -0600 ++++ libgnomeprint/gnome-print-gdi.c 2013-11-30 04:10:07.000000000 -0600 +@@ -36,7 +36,7 @@ + #include + + #include +-#include ++#include FT_FREETYPE_H + + #define WIN32_LEAN_AND_MEAN + #include +--- libgnomeprint/gnome-rfont.c.orig 2010-02-09 06:32:51.000000000 -0600 ++++ libgnomeprint/gnome-rfont.c 2013-11-30 04:09:50.000000000 -0600 +@@ -28,8 +28,8 @@ + + #include + #include FT_FREETYPE_H +-#include +-#include ++#include FT_GLYPH_H ++#include FT_BBOX_H + #include + #include + #include diff --git a/libgnomeprint.spec b/libgnomeprint.spec index b553df5..099c5a1 100644 --- a/libgnomeprint.spec +++ b/libgnomeprint.spec @@ -1,59 +1,54 @@ -#%define gnomever 2.30.1 +%define majver %(echo %version | cut -d. -f 1-2) +%define pkgname libgnomeprint -%define majver %(echo %version | cut -d. -f 1-2) -%define gnomegroup desktop -%define pkgname libgnomeprint - -Name: libgnomeprint -Version: 2.18.8 -Release: 1mamba +Name: libgnomeprint +Version: 2.18.8 +Release: 2mamba Summary: C-based API that implements the Postscript imaging model -Group: System/Libraries +Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.gnome.org/ -# bugfixes: http://ftp.gnome.org/pub/GNOME/sources/%{pkgname} +URL: https://www.gnome.org/ Source: http://ftp.acc.umu.se/pub/GNOME/sources/libgnomeprint/%{majver}/libgnomeprint-%{version}.tar.gz -#http://ftp.gnome.org/pub/GNOME/%{gnomegroup}/%{gnomemajver}/%{gnomever}/sources/%{pkgname}-%{version}.tar.bz2 +Patch0: libgnomeprint-2.18.8-libfreetype-2.10.0.patch +Patch1: libgnomeprint-2.18.8-bison-3.7.6.patch +Patch2: libgnomeprint-2.18.8-glibc-2.33.patch License: LGPL -BuildRequires: perl-XML-Parser -BuildRequires: pkgconfig -BuildRequires: gettext-devel -BuildRequires: libz-devel -BuildRequires: bison, flex ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: gtk-doc BuildRequires: libart_lgpl-devel +BuildRequires: libbrotli-devel +BuildRequires: libbzip2-devel BuildRequires: libcups-devel -BuildRequires: libe2fs-devel +BuildRequires: libexpat-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel -BuildRequires: libgcrypt-devel BuildRequires: libglib-devel BuildRequires: libgnomecups-devel -BuildRequires: libgnutls-devel -BuildRequires: libgpg-error-devel -BuildRequires: libkrb5-devel +BuildRequires: libgraphite2-devel +BuildRequires: libharfbuzz-devel +BuildRequires: liblzma-devel BuildRequires: libpango-devel +BuildRequires: libpcre-devel +BuildRequires: libpng-devel BuildRequires: libxml2-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: perl-GSSAPI BuildRequires: gnome-doc-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -# FIXME: -# checking for db2html... false +BuildRequires: perl-XML-Parser +BuildRequires: pkgconfig +BuildRequires: gettext-devel +BuildRequires: libz-devel +BuildRequires: bison +BuildRequires: flex %description GNOME Print is a C-based API that implements the Postscript imaging model. It is being used by various GNOME applications. -There are two extensions to the Postscript imaging model supported by GNOME -Print: Alpha channel support and anti-aliasing. -GNOME Print includes a rasterizing engine that transforms the requests into -bitmaps for native drivers. +There are two extensions to the Postscript imaging model supported by GNOME Print: Alpha channel support and anti-aliasing. +GNOME Print includes a rasterizing engine that transforms the requests into bitmaps for native drivers. %package devel Group: Development/Libraries @@ -63,12 +58,9 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description devel GNOME Print is a C-based API that implements the Postscript imaging model. It is being used by various GNOME applications. -There are two extensions to the Postscript imaging model supported by GNOME -Print: Alpha channel support and anti-aliasing. -GNOME Print includes a rasterizing engine that transforms the requests into -bitmaps for native drivers. - -This package contains static libraries and header files need for development. +There are two extensions to the Postscript imaging model supported by GNOME Print: Alpha channel support and anti-aliasing. +GNOME Print includes a rasterizing engine that transforms the requests into bitmaps for native drivers. +This package contains static libraries and header files needed for development. %package apidocs Summary: %{name} API documentation @@ -78,11 +70,18 @@ Requires: gtk-doc %description apidocs %{name} API documentation. +%debug_package + %prep %setup -q +%patch0 -p0 +%patch1 -p1 +%patch2 -p1 %build -%configure --disable-gtk-doc --with-cups +%configure \ + --disable-gtk-doc \ + --with-cups # I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl %make @@ -108,7 +107,7 @@ Requires: gtk-doc %{_libdir}/libgnomeprint/%{version}/modules/transports/* %{_libdir}/libgnomeprint/%{version}/modules/lib* %{_libdir}/libgnomeprint/%{version}/modules/filters/* -%doc AUTHORS COPYING.LIB ChangeLog NEWS README +%doc AUTHORS COPYING.LIB %files devel %defattr(-,root,root,-) @@ -119,12 +118,16 @@ Requires: gtk-doc %dir %{_includedir}/libgnomeprint-* %dir %{_includedir}/libgnomeprint-*/libgnomeprint %{_includedir}/libgnomeprint-*/libgnomeprint/* +%doc ChangeLog NEWS README %files apidocs %defattr(-,root,root) %{_datadir}/gtk-doc/html/%{name}/ %changelog +* Sat Jul 17 2021 Silvan Calarco 2.18.8-2mamba +- rebuilt with debug package and specfile fixes + * Tue Sep 28 2010 Automatic Build System 2.18.8-1mamba - automatic update to 2.18.8 by autodist