add forgotten patch thanks Florian Steinel

Package-Manager: portage-2.1.3.7

3 files changed, 166 insertions, 5 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index e8bbf4dd6942..42475b896c98 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.67 2007/09/04 06:53:33 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.68 2007/09/04 10:43:47 genstef Exp $
+
+  04 Sep 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/poppler-0.6-bindings.patch:
+  add forgotten patch thanks Florian Steinel
 
 *poppler-bindings-0.6 (04 Sep 2007)
 
diff --git a/app-text/poppler-bindings/Manifest b/app-text/poppler-bindings/Manifest
index 8eab1181856e..5e67f1dc9f0a 100644
--- a/app-text/poppler-bindings/Manifest
+++ b/app-text/poppler-bindings/Manifest
@@ -10,6 +10,10 @@ AUX poppler-0.5.9-bindings.patch 3054 RMD160 bcf7519ed57111d5def87857dce2249b282
 MD5 a33645793c2942d9cc014b50cd9282d6 files/poppler-0.5.9-bindings.patch 3054
 RMD160 bcf7519ed57111d5def87857dce2249b282ff67b files/poppler-0.5.9-bindings.patch 3054
 SHA256 958aca4607713a7d58db40461995e0a869a8b48e3c425e76b19b183965a4aa50 files/poppler-0.5.9-bindings.patch 3054
+AUX poppler-0.6-bindings.patch 4980 RMD160 8e2953d6dd3612d1fa5aaedd373bf0b1b90043c4 SHA1 9525ef7dffdf993035d8a33a3851e1dbca200dad SHA256 03ee71d16535b8c58acec513401435af12a6179e4e0d0b7e11b700b80ceff7f6
+MD5 88467fd38cc5a550ea8035bcc3a9f729 files/poppler-0.6-bindings.patch 4980
+RMD160 8e2953d6dd3612d1fa5aaedd373bf0b1b90043c4 files/poppler-0.6-bindings.patch 4980
+SHA256 03ee71d16535b8c58acec513401435af12a6179e4e0d0b7e11b700b80ceff7f6 files/poppler-0.6-bindings.patch 4980
 DIST poppler-0.5.3.tar.gz 1049900 RMD160 3456de23955fc4001842c76d32deba308bd7f968 SHA1 e197f5cf56f0676b5ca313577dd6456a393c46ec SHA256 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
 DIST poppler-0.5.4.tar.gz 1062401 RMD160 f28c89b03388757067505df3c60a1d878626b0dd SHA1 edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1 SHA256 ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
 DIST poppler-0.5.9.tar.gz 1169002 RMD160 3aab75dfb1f4226048c23ed9b6f08fdb2608feb1 SHA1 8053ede1d7e3d30a3dd934b4d8738334f966004e SHA256 bee251e5149ac9dd8824aac316456b78a82f4e1954eb3c1a94db3625340ef61e
@@ -36,10 +40,10 @@ EBUILD poppler-bindings-0.6.ebuild 1731 RMD160 e4abfc54483282d3eb1ccb87ea3253e49
 MD5 f8e7e62addf7b6541b5302495d282b80 poppler-bindings-0.6.ebuild 1731
 RMD160 e4abfc54483282d3eb1ccb87ea3253e49c69ed2a poppler-bindings-0.6.ebuild 1731
 SHA256 4d73b59fff0b45ef924831efb13de830d7b66924ecefde4e79c3510d4c0b06fb poppler-bindings-0.6.ebuild 1731
-MISC ChangeLog 9902 RMD160 fcb2c22e0c224b70691fd7064359133281f677fb SHA1 a95b5b48c17c0bbcc1ca65ee661eb26f41002d5f SHA256 fc7a487ac48d6526ff8da77eae9d7e394e604036db697887d122f9356cdc8e53
-MD5 89de46c5b1c05b451fc8f8bd9e96b7d5 ChangeLog 9902
-RMD160 fcb2c22e0c224b70691fd7064359133281f677fb ChangeLog 9902
-SHA256 fc7a487ac48d6526ff8da77eae9d7e394e604036db697887d122f9356cdc8e53 ChangeLog 9902
+MISC ChangeLog 10038 RMD160 637a6393fbe763417a3b74454f4d8533a3dd9f47 SHA1 0b95765145d4adadebccbf64eba140fe43304e67 SHA256 f9b66fb19d04866a5c5f74eab5771fe430923d7304a248c9a490eb20fb1a6ec6
+MD5 799c23120973bb3afe2c2afae7147007 ChangeLog 10038
+RMD160 637a6393fbe763417a3b74454f4d8533a3dd9f47 ChangeLog 10038
+SHA256 f9b66fb19d04866a5c5f74eab5771fe430923d7304a248c9a490eb20fb1a6ec6 ChangeLog 10038
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/app-text/poppler-bindings/files/poppler-0.6-bindings.patch b/app-text/poppler-bindings/files/poppler-0.6-bindings.patch
new file mode 100644
index 000000000000..f54075726c04
--- /dev/null
+++ b/app-text/poppler-bindings/files/poppler-0.6-bindings.patch
@@ -0,0 +1,153 @@
+diff -ur poppler-0.6.orig/glib/demo/Makefile.am poppler-0.6/glib/demo/Makefile.am
+--- poppler-0.6.orig/glib/demo/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/glib/demo/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -25,5 +25,5 @@
+ 
+ LDADD =						\
+ 	$(top_builddir)/glib/libpoppler-glib.la	\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(GTK_TEST_LIBS)
+diff -ur poppler-0.6.orig/glib/Makefile.am poppler-0.6/glib/Makefile.am
+--- poppler-0.6.orig/glib/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/glib/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -84,7 +84,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD =				\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+ 	$(FONTCONFIG_LIBS)				\
+@@ -98,7 +98,7 @@
+        test-poppler-glib.c
+ 
+ test_poppler_glib_LDADD =			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-glib.la			\
+ 	$(POPPLER_GLIB_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+Nur in poppler-0.6.orig/glib: Makefile.am.orig.
+diff -ur poppler-0.6.orig/glib/reference/Makefile.am poppler-0.6/glib/reference/Makefile.am
+--- poppler-0.6.orig/glib/reference/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/glib/reference/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -72,7 +72,7 @@
+ 	$(POPPLER_GLIB_CFLAGS)				\
+ 	$(FREETYPE_CFLAGS)
+ 
+-GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
++GTKDOC_LIBS=-lpoppler	\
+ 	$(top_builddir)/glib/libpoppler-glib.la		\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+diff -ur poppler-0.6.orig/Makefile.am poppler-0.6/Makefile.am
+--- poppler-0.6.orig/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -29,7 +29,7 @@
+ utils_subdir = utils
+ endif
+ 
+-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
++SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
+ 
+ EXTRA_DIST =					\
+ 	README-XPDF				\
+@@ -40,9 +40,7 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA =				\
+-	poppler.pc				\
+ 	$(cairo_pc_file)			\
+-	$(splash_pc_file)			\
+ 	$(glib_pc_file)				\
+ 	$(qt_pc_file)                           \
+ 	$(qt4_pc_file)
+diff -ur poppler-0.6.orig/qt/Makefile.am poppler-0.6/qt/Makefile.am
+--- poppler-0.6.orig/qt/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/qt/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -24,7 +24,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -41,7 +41,7 @@
+        test-poppler-qt.cpp
+ 
+ test_poppler_qt_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	libpoppler-qt.la			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)
+diff -ur poppler-0.6.orig/qt4/src/Makefile.am poppler-0.6/qt4/src/Makefile.am
+--- poppler-0.6.orig/qt4/src/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/qt4/src/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -36,7 +36,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt4_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+ 
+Nur in poppler-0.6.orig/qt4/src: Makefile.am.orig.
+diff -ur poppler-0.6.orig/qt4/tests/Makefile.am poppler-0.6/qt4/tests/Makefile.am
+--- poppler-0.6.orig/qt4/tests/Makefile.am	2007-09-04 12:40:45.000000000 +0200
++++ poppler-0.6/qt4/tests/Makefile.am	2007-09-04 12:40:00.000000000 +0200
+@@ -7,7 +7,7 @@
+ 	$(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS =					\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+diff -ur poppler-0.6.orig/test/Makefile.am poppler-0.6/test/Makefile.am
+--- poppler-0.6.orig/test/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/test/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -42,14 +42,14 @@
+        gtk-splash-test.cc
+ 
+ gtk_splash_test_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(GTK_TEST_LIBS)
+ 
+ gtk_cairo_test_SOURCES =			\
+        gtk-cairo-test.cc
+ 
+ gtk_cairo_test_LDADD =					\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler		\
+ 	$(top_builddir)/glib/libpoppler-glib.la		\
+ 	$(CAIRO_LIBS)					\
+ 	$(GTK_TEST_LIBS)				\
+@@ -59,7 +59,7 @@
+        pdf-inspector.cc
+ 
+ pdf_inspector_LDADD =					\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler		\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(CAIRO_LIBS)					\
+ 	$(FREETYPE_LIBS)				\
+diff -ur poppler-0.6.orig/utils/Makefile.am poppler-0.6/utils/Makefile.am
+--- poppler-0.6.orig/utils/Makefile.am	2007-09-04 12:40:29.000000000 +0200
++++ poppler-0.6/utils/Makefile.am	2007-09-04 12:40:58.000000000 +0200
+@@ -29,7 +29,7 @@
+ 	$(ABIWORD_CFLAGS)
+ 
+ LDADD =						\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
+