Magellan Linux

Annotation of /trunk/poppler/patches/poppler-0.10.6-bindings.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 838 - (hide annotations) (download)
Wed Jun 10 17:57:17 2009 UTC (15 years ago) by niro
File size: 6044 byte(s)
-change all missing $(top_builddir)/poppler/libpoppler.la references to -lpoppler for 0.10.6 version

1 niro 838 diff -Naur poppler-0.10.6/glib/demo/Makefile.am poppler-0.10.6-magellan/glib/demo/Makefile.am
2     --- poppler-0.10.6/glib/demo/Makefile.am 2009-03-29 23:50:51.000000000 +0200
3     +++ poppler-0.10.6-magellan/glib/demo/Makefile.am 2009-06-10 20:24:37.000000000 +0200
4     @@ -36,5 +36,5 @@
5    
6     LDADD = \
7     $(top_builddir)/glib/libpoppler-glib.la \
8     - $(top_builddir)/poppler/libpoppler.la \
9     + -lpoppler \
10     $(GTK_TEST_LIBS)
11     diff -Naur poppler-0.10.6/glib/Makefile.am poppler-0.10.6-magellan/glib/Makefile.am
12     --- poppler-0.10.6/glib/Makefile.am 2009-03-29 23:50:51.000000000 +0200
13     +++ poppler-0.10.6-magellan/glib/Makefile.am 2009-06-10 20:24:37.000000000 +0200
14     @@ -4,7 +4,7 @@
15     $(CAIRO_CFLAGS)
16    
17     cairo_libs = \
18     - $(top_builddir)/poppler/libpoppler-cairo.la \
19     + -lpoppler \
20     $(CAIRO_LIBS)
21    
22     endif
23     @@ -87,7 +87,7 @@
24     poppler-private.h
25    
26     libpoppler_glib_la_LIBADD = \
27     - $(top_builddir)/poppler/libpoppler.la \
28     + -lpoppler \
29     $(POPPLER_GLIB_LIBS) \
30     $(GDK_LIBS) \
31     $(FREETYPE_LIBS) \
32     @@ -103,7 +103,7 @@
33     test-poppler-glib.cc
34    
35     test_poppler_glib_LDADD = \
36     - $(top_builddir)/poppler/libpoppler.la \
37     + -lpoppler \
38     libpoppler-glib.la \
39     $(POPPLER_GLIB_LIBS) \
40     $(GDK_LIBS) \
41     diff -Naur poppler-0.10.6/glib/reference/Makefile.am poppler-0.10.6-magellan/glib/reference/Makefile.am
42     --- poppler-0.10.6/glib/reference/Makefile.am 2009-03-29 23:50:42.000000000 +0200
43     +++ poppler-0.10.6-magellan/glib/reference/Makefile.am 2009-06-10 20:24:37.000000000 +0200
44     @@ -73,7 +73,7 @@
45     $(GDK_CFLAGS) \
46     $(FREETYPE_CFLAGS)
47    
48     -GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la \
49     +GTKDOC_LIBS=-lpoppler \
50     $(top_builddir)/glib/libpoppler-glib.la \
51     $(POPPLER_GLIB_LIBS) \
52     $(FREETYPE_LIBS) \
53     diff -Naur poppler-0.10.6/Makefile.am poppler-0.10.6-magellan/Makefile.am
54     --- poppler-0.10.6/Makefile.am 2009-03-29 23:50:51.000000000 +0200
55     +++ poppler-0.10.6-magellan/Makefile.am 2009-06-10 20:24:37.000000000 +0200
56     @@ -29,7 +29,7 @@
57     utils_subdir = utils
58     endif
59    
60     -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
61     +SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
62    
63     EXTRA_DIST = \
64     README-XPDF \
65     @@ -40,9 +40,7 @@
66    
67     pkgconfigdir = $(libdir)/pkgconfig
68     pkgconfig_DATA = \
69     - poppler.pc \
70     $(cairo_pc_file) \
71     - $(splash_pc_file) \
72     $(glib_pc_file) \
73     $(qt_pc_file) \
74     $(qt4_pc_file)
75     diff -Naur poppler-0.10.6/qt/Makefile.am poppler-0.10.6-magellan/qt/Makefile.am
76     --- poppler-0.10.6/qt/Makefile.am 2009-03-29 23:50:51.000000000 +0200
77     +++ poppler-0.10.6-magellan/qt/Makefile.am 2009-06-10 20:24:37.000000000 +0200
78     @@ -24,7 +24,7 @@
79     poppler-private.h
80    
81     libpoppler_qt_la_LIBADD = \
82     - $(top_builddir)/poppler/libpoppler.la \
83     + -lpoppler \
84     $(POPPLER_QT_LIBS) \
85     $(FREETYPE_LIBS) \
86     $(FONTCONFIG_LIBS)
87     @@ -41,7 +41,7 @@
88     test-poppler-qt.cpp
89    
90     test_poppler_qt_LDADD = \
91     - $(top_builddir)/poppler/libpoppler.la \
92     + -lpoppler \
93     libpoppler-qt.la \
94     $(POPPLER_QT_LIBS) \
95     $(FREETYPE_LIBS)
96     diff -Naur poppler-0.10.6/qt4/demos/Makefile.am poppler-0.10.6-magellan/qt4/demos/Makefile.am
97     --- poppler-0.10.6/qt4/demos/Makefile.am 2009-03-29 23:50:42.000000000 +0200
98     +++ poppler-0.10.6-magellan/qt4/demos/Makefile.am 2009-06-10 20:27:35.000000000 +0200
99     @@ -7,7 +7,7 @@
100     $(POPPLER_QT4_CFLAGS)
101    
102     LDADDS = \
103     - $(top_builddir)/poppler/libpoppler.la \
104     + -lpoppler \
105     $(top_builddir)/qt4/src/libpoppler-qt4.la \
106     $(FONTCONFIG_LIBS) \
107     $(POPPLER_QT4_LIBS)
108     diff -Naur poppler-0.10.6/qt4/src/Makefile.am poppler-0.10.6-magellan/qt4/src/Makefile.am
109     --- poppler-0.10.6/qt4/src/Makefile.am 2009-03-29 23:50:42.000000000 +0200
110     +++ poppler-0.10.6-magellan/qt4/src/Makefile.am 2009-06-10 20:24:37.000000000 +0200
111     @@ -52,7 +52,7 @@
112     poppler-private.h
113    
114     libpoppler_qt4_la_LIBADD = \
115     - $(top_builddir)/poppler/libpoppler.la \
116     + -lpoppler \
117     $(FONTCONFIG_LIBS) \
118     $(POPPLER_QT4_LIBS)
119    
120     diff -Naur poppler-0.10.6/qt4/tests/Makefile.am poppler-0.10.6-magellan/qt4/tests/Makefile.am
121     --- poppler-0.10.6/qt4/tests/Makefile.am 2009-03-29 23:50:42.000000000 +0200
122     +++ poppler-0.10.6-magellan/qt4/tests/Makefile.am 2009-06-10 20:24:37.000000000 +0200
123     @@ -7,7 +7,7 @@
124     $(POPPLER_QT4_CFLAGS)
125    
126     LDADDS = \
127     - $(top_builddir)/poppler/libpoppler.la \
128     + -lpoppler \
129     $(top_builddir)/qt4/src/libpoppler-qt4.la \
130     $(FONTCONFIG_LIBS) \
131     $(POPPLER_QT4_LIBS)
132     diff -Naur poppler-0.10.6/test/Makefile.am poppler-0.10.6-magellan/test/Makefile.am
133     --- poppler-0.10.6/test/Makefile.am 2009-03-29 23:50:51.000000000 +0200
134     +++ poppler-0.10.6-magellan/test/Makefile.am 2009-06-10 20:28:51.000000000 +0200
135     @@ -51,14 +51,14 @@
136     gtk-splash-test.cc
137    
138     gtk_splash_test_LDADD = \
139     - $(top_builddir)/poppler/libpoppler.la \
140     + -lpoppler \
141     $(GTK_TEST_LIBS)
142    
143     gtk_cairo_test_SOURCES = \
144     gtk-cairo-test.cc
145    
146     gtk_cairo_test_LDADD = \
147     - $(top_builddir)/poppler/libpoppler.la \
148     + -lpoppler \
149     $(top_builddir)/glib/libpoppler-glib.la \
150     $(CAIRO_LIBS) \
151     $(GTK_TEST_LIBS) \
152     @@ -69,7 +69,7 @@
153    
154     pdf_inspector_LDADD = \
155     $(top_builddir)/poppler/libpoppler-cairo.la \
156     - $(top_builddir)/poppler/libpoppler.la \
157     + -lpoppler \
158     $(CAIRO_LIBS) \
159     $(FREETYPE_LIBS) \
160     $(GTK_TEST_LIBS) \
161     @@ -80,7 +80,7 @@
162     perf-test-preview-dummy.cc
163    
164     perf_test_LDADD = \
165     - $(top_builddir)/poppler/libpoppler.la \
166     + -lpoppler \
167     $(FREETYPE_LIBS) \
168     $(X_EXTRA_LIBS)
169    
170     @@ -88,7 +88,7 @@
171     pdf-fullrewrite.cc
172    
173     pdf_fullrewrite_LDADD = \
174     - $(top_builddir)/poppler/libpoppler.la
175     + -lpoppler
176    
177     EXTRA_DIST = \
178     pdf-operators.c \
179     diff -Naur poppler-0.10.6/utils/Makefile.am poppler-0.10.6-magellan/utils/Makefile.am
180     --- poppler-0.10.6/utils/Makefile.am 2009-03-29 23:50:51.000000000 +0200
181     +++ poppler-0.10.6-magellan/utils/Makefile.am 2009-06-10 20:29:20.000000000 +0200
182     @@ -29,7 +29,7 @@
183     $(ABIWORD_CFLAGS)
184    
185     LDADD = \
186     - $(top_builddir)/poppler/libpoppler.la \
187     + -lpoppler \
188     $(UTILS_LIBS) \
189     $(FONTCONFIG_LIBS)
190