add forgotten patch thanks Florian Steinel

(Portage version: 2.1.3.7)

2 files changed, 158 insertions, 1 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/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)
+