* [gentoo-commits] gentoo-x86 commit in net-print/gutenprint/files: gutenprint-5.2.7-genppd.patch
@ 2011-09-15 21:30 Tim Harder (radhermit)
0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder (radhermit) @ 2011-09-15 21:30 UTC (permalink / raw
To: gentoo-commits
radhermit 11/09/15 21:30:06
Added: gutenprint-5.2.7-genppd.patch
Log:
Revision bump and remove old. Fixes bug #382927 with help from Martin von Gagern and Rafał Mużyło.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Revision Changes Path
1.1 net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch?rev=1.1&content-type=text/plain
Index: gutenprint-5.2.7-genppd.patch
===================================================================
--- gutenprint-5.2.7/configure.ac.orig
+++ gutenprint-5.2.7/configure.ac
@@ -128,8 +128,8 @@
dnl *_cflags: cflags for pkg-config
dnl *_libs: libs for pkg-config
-GUTENPRINT_LIBS="-lgutenprint"
-GUTENPRINTUI2_LIBS="-lgutenprintui2"
+GUTENPRINT_LIBS='$(top_builddir)/src/main/libgutenprint.la'
+GUTENPRINTUI2_LIBS='$(top_builddir)/src/gutenprintui2/libgutenprintui2.la'
gutenprint_version=${GUTENPRINT_VERSION}
gutenprintui2_version=${GUTENPRINT_VERSION}
--- gutenprint-5.2.7/src/cups/Makefile.am.orig
+++ gutenprint-5.2.7/src/cups/Makefile.am
@@ -96,16 +96,16 @@
cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
## Data
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/gutenprint/files: gutenprint-5.2.7-genppd.patch
@ 2011-10-27 6:55 Tim Harder (radhermit)
0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder (radhermit) @ 2011-10-27 6:55 UTC (permalink / raw
To: gentoo-commits
radhermit 11/10/27 06:55:15
Modified: gutenprint-5.2.7-genppd.patch
Log:
Drop library patch portion that pollutes pkgconfig files.
(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)
Revision Changes Path
1.2 net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch?r1=1.1&r2=1.2
Index: gutenprint-5.2.7-genppd.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gutenprint-5.2.7-genppd.patch 15 Sep 2011 21:30:05 -0000 1.1
+++ gutenprint-5.2.7-genppd.patch 27 Oct 2011 06:55:15 -0000 1.2
@@ -1,16 +1,3 @@
---- gutenprint-5.2.7/configure.ac.orig
-+++ gutenprint-5.2.7/configure.ac
-@@ -128,8 +128,8 @@
- dnl *_cflags: cflags for pkg-config
- dnl *_libs: libs for pkg-config
-
--GUTENPRINT_LIBS="-lgutenprint"
--GUTENPRINTUI2_LIBS="-lgutenprintui2"
-+GUTENPRINT_LIBS='$(top_builddir)/src/main/libgutenprint.la'
-+GUTENPRINTUI2_LIBS='$(top_builddir)/src/gutenprintui2/libgutenprintui2.la'
- gutenprint_version=${GUTENPRINT_VERSION}
- gutenprintui2_version=${GUTENPRINT_VERSION}
-
--- gutenprint-5.2.7/src/cups/Makefile.am.orig
+++ gutenprint-5.2.7/src/cups/Makefile.am
@@ -96,16 +96,16 @@
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-27 7:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-15 21:30 [gentoo-commits] gentoo-x86 commit in net-print/gutenprint/files: gutenprint-5.2.7-genppd.patch Tim Harder (radhermit)
-- strict thread matches above, loose matches on Subject: below --
2011-10-27 6:55 Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox