updated on Thu Jan 26 16:09:46 UTC 2012
[aur-mirror.git] / poppler-qt3 / poppler-bindings.patch
blob475418332a0a825d43dd10afb3075efeeb8225bd
1 --- src/poppler-0.14.0//Makefile.am 2010-03-15 15:25:51.000000000 -0400
2 +++ patch/Makefile.am 2010-06-23 22:07:12.000000000 -0400
3 @@ -34,7 +34,7 @@
4 utils_subdir = utils
5 endif
7 -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
8 +SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
10 EXTRA_DIST = \
11 README-XPDF \
12 @@ -46,13 +46,9 @@
14 pkgconfigdir = $(libdir)/pkgconfig
15 pkgconfig_DATA = \
16 - poppler.pc \
17 - $(cairo_pc_file) \
18 - $(splash_pc_file) \
19 $(glib_pc_file) \
20 $(qt_pc_file) \
21 - $(qt4_pc_file) \
22 - $(cpp_pc_file)
23 + $(qt4_pc_file)
25 # Add CMake buildsystem files here so they get added on make dist
26 EXTRA_DIST += \
27 --- src/poppler-0.14.0//glib/Makefile.am 2010-06-08 15:18:44.000000000 -0400
28 +++ patch/glib_Makefile.am 2010-06-23 22:01:39.000000000 -0400
29 @@ -67,7 +67,7 @@
30 poppler-private.h
32 libpoppler_glib_la_LIBADD = \
33 - $(top_builddir)/poppler/libpoppler.la \
34 + -lpoppler \
35 $(top_builddir)/poppler/libpoppler-cairo.la \
36 $(POPPLER_GLIB_LIBS) \
37 $(GDK_LIBS) \
38 @@ -83,7 +83,7 @@
39 test-poppler-glib.cc
41 test_poppler_glib_LDADD = \
42 - $(top_builddir)/poppler/libpoppler.la \
43 + -lpoppler \
44 libpoppler-glib.la \
45 $(POPPLER_GLIB_LIBS) \
46 $(GDK_LIBS) \
47 --- src/poppler-0.14.0//glib/demo/Makefile.am 2010-02-16 17:11:06.000000000 -0500
48 +++ patch/glib_demo_Makefile.am 2010-06-23 21:52:33.000000000 -0400
49 @@ -49,5 +49,5 @@
51 LDADD = \
52 $(top_builddir)/glib/libpoppler-glib.la \
53 - $(top_builddir)/poppler/libpoppler.la \
54 + -lpoppler \
55 $(GTK_TEST_LIBS)
56 --- src/poppler-0.14.0//glib/reference/Makefile.am 2010-01-16 18:43:07.000000000 -0500
57 +++ patch/glib_reference_Makefile.am 2010-06-23 21:53:36.000000000 -0400
58 @@ -73,7 +73,7 @@
59 $(GDK_CFLAGS) \
60 $(FREETYPE_CFLAGS)
62 -GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la \
63 +GTKDOC_LIBS=-lpoppler \
64 $(top_builddir)/glib/libpoppler-glib.la \
65 $(POPPLER_GLIB_LIBS) \
66 $(FREETYPE_LIBS) \
67 --- src/poppler-0.14.0//qt/Makefile.am 2010-03-27 09:08:46.000000000 -0400
68 +++ patch/qt_Makefile.am 2010-06-23 21:54:50.000000000 -0400
69 @@ -25,7 +25,7 @@
70 poppler-private.h
72 libpoppler_qt_la_LIBADD = \
73 - $(top_builddir)/poppler/libpoppler.la \
74 + -lpoppler \
75 $(POPPLER_QT_LIBS) \
76 $(FREETYPE_LIBS) \
77 $(FONTCONFIG_LIBS)
78 @@ -42,7 +42,7 @@
79 test-poppler-qt.cpp
81 test_poppler_qt_LDADD = \
82 - $(top_builddir)/poppler/libpoppler.la \
83 + -lpoppler \
84 libpoppler-qt.la \
85 $(libqt3_LIBS) \
86 $(FREETYPE_LIBS)
87 --- src/poppler-0.14.0//qt4/demos/Makefile.am 2010-01-16 18:43:07.000000000 -0500
88 +++ patch/qt4_demos_Makefile.am 2010-06-23 21:55:38.000000000 -0400
89 @@ -7,7 +7,7 @@
90 $(POPPLER_QT4_CFLAGS)
92 LDADDS = \
93 - $(top_builddir)/poppler/libpoppler.la \
94 + -lpoppler \
95 $(top_builddir)/qt4/src/libpoppler-qt4.la \
96 $(FONTCONFIG_LIBS) \
97 $(POPPLER_QT4_LIBS)
98 --- src/poppler-0.14.0//qt4/src/Makefile.am 2010-06-08 15:28:43.000000000 -0400
99 +++ patch/qt4_src_Makefile.am 2010-06-23 21:56:14.000000000 -0400
100 @@ -52,7 +52,7 @@
101 poppler-page-transition-private.h
103 libpoppler_qt4_la_LIBADD = \
104 - $(top_builddir)/poppler/libpoppler.la \
105 + -lpoppler \
106 $(top_builddir)/poppler/libpoppler-arthur.la \
107 $(FONTCONFIG_LIBS) \
108 $(POPPLER_QT4_LIBS)
109 --- src/poppler-0.14.0//qt4/tests/Makefile.am 2010-01-16 18:43:07.000000000 -0500
110 +++ patch/qt4_tests_Makefile.am 2010-06-23 21:57:00.000000000 -0400
111 @@ -7,7 +7,7 @@
112 $(POPPLER_QT4_CFLAGS)
114 LDADDS = \
115 - $(top_builddir)/poppler/libpoppler.la \
116 + -lpoppler \
117 $(top_builddir)/qt4/src/libpoppler-qt4.la \
118 $(FONTCONFIG_LIBS) \
119 $(POPPLER_QT4_LIBS)
120 --- src/poppler-0.14.0//test/Makefile.am 2010-01-16 18:43:07.000000000 -0500
121 +++ patch/test_Makefile.am 2010-06-23 21:58:59.000000000 -0400
122 @@ -53,14 +53,14 @@
123 gtk-splash-test.cc
125 gtk_splash_test_LDADD = \
126 - $(top_builddir)/poppler/libpoppler.la \
127 + -lpoppler \
128 $(GTK_TEST_LIBS)
130 gtk_cairo_test_SOURCES = \
131 gtk-cairo-test.cc
133 gtk_cairo_test_LDADD = \
134 - $(top_builddir)/poppler/libpoppler.la \
135 + -lpoppler \
136 $(top_builddir)/glib/libpoppler-glib.la \
137 $(CAIRO_LIBS) \
138 $(GTK_TEST_LIBS) \
139 @@ -71,7 +71,7 @@
141 pdf_inspector_LDADD = \
142 $(top_builddir)/poppler/libpoppler-cairo.la \
143 - $(top_builddir)/poppler/libpoppler.la \
144 + -lpoppler \
145 $(CAIRO_LIBS) \
146 $(FREETYPE_LIBS) \
147 $(GTK_TEST_LIBS) \
148 @@ -82,7 +82,7 @@
149 perf-test-preview-dummy.cc
151 perf_test_LDADD = \
152 - $(top_builddir)/poppler/libpoppler.la \
153 + -lpoppler \
154 $(FREETYPE_LIBS) \
155 $(X_EXTRA_LIBS)
157 @@ -90,7 +90,7 @@
158 pdf-fullrewrite.cc
160 pdf_fullrewrite_LDADD = \
161 - $(top_builddir)/poppler/libpoppler.la
162 + -lpoppler
164 EXTRA_DIST = \
165 pdf-operators.c \
166 --- src/poppler-0.14.0//utils/Makefile.am 2010-01-16 18:43:07.000000000 -0500
167 +++ patch/utils_Makefile.am 2010-06-23 21:59:28.000000000 -0400
168 @@ -20,7 +20,7 @@
169 $(ABIWORD_CFLAGS)
171 LDADD = \
172 - $(top_builddir)/poppler/libpoppler.la \
173 + -lpoppler \
174 $(UTILS_LIBS) \
175 $(FONTCONFIG_LIBS)