patches/gtk3+-17-addin-scf.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18292 9ff9c0fa64d9
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.

diff -urN -x'*.orig' gtk+-2.20.0/modules/printbackends/papi/gtkprintbackendpapi.c ../../SUNWgtk2-2.20.0.hacked/i386/gtk+-2.20.0/modules/printbackends/papi/gtkprintbackendpapi.c
--- gtk+-2.20.0/modules/printbackends/papi/gtkprintbackendpapi.c	2010-06-02 16:59:52.625769784 +0100
+++ ../../SUNWgtk2-2.20.0.hacked/i386/gtk+-2.20.0/modules/printbackends/papi/gtkprintbackendpapi.c	2010-06-02 17:21:20.508741889 +0100
@@ -814,12 +814,6 @@
     return FALSE;
 }
 
-void
-merge_ppd_data (papi_attribute_t ***attributes, gchar *ppdfile)
-{
-  get_ppd_attrs (attributes, ppdfile);
-}
-
 
 static void
 papi_display_printer_status_done (gpointer user_data)
diff -urN -x'*.orig' gtk+-2.20.0/modules/printbackends/papi/Makefile.am ../../SUNWgtk2-2.20.0.hacked/i386/gtk+-2.20.0/modules/printbackends/papi/Makefile.am
--- gtk+-2.20.0/modules/printbackends/papi/Makefile.am	2009-10-09 06:00:45.000000000 +0100
+++ ../../SUNWgtk2-2.20.0.hacked/i386/gtk+-2.20.0/modules/printbackends/papi/Makefile.am	2010-06-02 19:18:53.084646936 +0100
@@ -28,7 +28,7 @@
 	gtkprinterpapi.h		\
 	gtkprintbackendpapi.h
 
-libprintbackend_papi_la_LDFLAGS =  -avoid-version -module $(no_undefined)
-libprintbackend_papi_la_LIBADD = $(LDADDS) -lpapi
+libprintbackend_papi_la_LDFLAGS =  -avoid-version -module $(no_undefined) -zdefs
+libprintbackend_papi_la_LIBADD = $(LDADDS) -lpapi -lscf
 
 -include $(top_srcdir)/git.mk