packages: gtk+2/gtk+2.spec, gtk+2/gtk+2-papi.patch (NEW) - added papi patch...

qboosh qboosh at pld-linux.org
Thu Jan 26 18:07:34 CET 2012


Author: qboosh                       Date: Thu Jan 26 17:07:34 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added papi patch, build papi subpackage

---- Files affected:
packages/gtk+2:
   gtk+2.spec (1.358 -> 1.359) , gtk+2-papi.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gtk+2/gtk+2.spec
diff -u packages/gtk+2/gtk+2.spec:1.358 packages/gtk+2/gtk+2.spec:1.359
--- packages/gtk+2/gtk+2.spec:1.358	Tue Jan 24 23:09:59 2012
+++ packages/gtk+2/gtk+2.spec	Thu Jan 26 18:07:29 2012
@@ -1,9 +1,9 @@
 # $Revision$, $Date$
-# TODO: papi print backend?
 #
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	cups		# disable CUPS support
+%bcond_without	papi		# disable PAPI support
 %bcond_without	static_libs	# don't build static library
 #
 Summary:	The GIMP Toolkit
@@ -24,12 +24,15 @@
 # Source0-md5:	6d80261125b964aef2f2cbfbb1a9da2a
 Patch0:		%{name}-arch_confdir.patch
 Patch1:		gobject-introspection.patch
+Patch2:		%{name}-papi.patch
 URL:		http://www.gtk.org/
 BuildRequires:	atk-devel >= 1:1.30.0-3
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	cairo-devel >= 1.6.0
-%{?with_cups:BuildRequires:	cups-devel}
+%if %{with cups} || %{with papi}
+BuildRequires:	cups-devel
+%endif
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	gdk-pixbuf2-devel >= 2.22.0
@@ -42,6 +45,7 @@
 BuildRequires:	libxml2-progs >= 1:2.6.31
 BuildRequires:	libxslt-progs >= 1.1.20
 BuildRequires:	pango-devel >= 1:1.28.1-4
+%{?with_papi:BuildRequires:	papi-devel}
 BuildRequires:	perl-base
 BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
@@ -228,10 +232,24 @@
 %description cups -l pl.UTF-8
 Moduł GTK+ do drukowania przez CUPS.
 
+%package papi
+Summary:	PAPI printing module for GTK+
+Summary(pl.UTF-8):	Moduł GTK+ do drukowania przez PAPI
+Group:		X11/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	papi
+
+%description papi
+PAPI printing module for GTK+.
+
+%description papi -l pl.UTF-8
+Moduł GTK+ do drukowania przez PAPI.
+
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' gtk/gtk-builder-convert
 
@@ -243,11 +261,13 @@
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+CPPFLAGS="%{rpmcppflags}%{?with_papi: -I/usr/include/papi}"
 %configure \
-	%{!?with_cups:ac_cv_path_CUPS_CONFIG=no} \
+	%{!?with_cups:--disable-cups} \
 	%{?debug:--enable-debug=yes} \
 	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
 	--enable-man \
+	%{!?with_papi:--disable-papi} \
 	--enable-shm \
 	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
 	--with-gdktarget=x11 \
@@ -419,12 +439,21 @@
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-cups.so
 %endif
 
+%if %{with papi}
+%files papi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-papi.so
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.359  2012/01/26 17:07:29  qboosh
+- added papi patch, build papi subpackage
+
 Revision 1.358  2012/01/24 22:09:59  megabajt
 - updated to 2.24.9
 - removed revert_iconview_change.patch (applied upstream)

================================================================
Index: packages/gtk+2/gtk+2-papi.patch
diff -u /dev/null packages/gtk+2/gtk+2-papi.patch:1.1
--- /dev/null	Thu Jan 26 18:07:34 2012
+++ packages/gtk+2/gtk+2-papi.patch	Thu Jan 26 18:07:29 2012
@@ -0,0 +1,11 @@
+--- gtk+-2.24.9/modules/printbackends/papi/gtkprintbackendpapi.c.orig	2012-01-24 20:38:37.000000000 +0100
++++ gtk+-2.24.9/modules/printbackends/papi/gtkprintbackendpapi.c	2012-01-26 17:38:26.005675277 +0100
+@@ -352,7 +352,7 @@
+   const gchar *title;
+   char *prtnm = NULL;
+   GtkPrintDuplex val;
+-  papi_status_t pstatus = NULL;
++  papi_status_t pstatus = PAPI_OK;
+   papi_attribute_t **attrs = NULL;
+   papi_job_ticket_t *ticket = NULL;
+   
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gtk+2.spec?r1=1.358&r2=1.359&f=u



More information about the pld-cvs-commit mailing list