Contents of /trunk/poppler/patches/poppler-0.5.4-bindings.patch
Parent Directory
| 
Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 2981 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 2981 byte(s)
-import
| 1 | diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.2.orig/glib/Makefile.am poppler-0.5.2/glib/Makefile.am |
| 2 | --- poppler-0.5.2.orig/glib/Makefile.am 2006-05-19 18:09:00.000000000 -0400 |
| 3 | +++ poppler-0.5.2/glib/Makefile.am 2006-05-22 19:55:31.000000000 -0400 |
| 4 | @@ -81,7 +81,7 @@ |
| 5 | poppler-private.h |
| 6 | |
| 7 | libpoppler_glib_la_LIBADD = \ |
| 8 | - $(top_builddir)/poppler/libpoppler.la \ |
| 9 | + -lpoppler \ |
| 10 | $(POPPLER_GLIB_LIBS) \ |
| 11 | $(FREETYPE_LIBS) \ |
| 12 | $(cairo_libs) |
| 13 | @@ -94,7 +94,7 @@ |
| 14 | test-poppler-glib.c |
| 15 | |
| 16 | test_poppler_glib_LDADD = \ |
| 17 | - $(top_builddir)/poppler/libpoppler.la \ |
| 18 | + -lpoppler \ |
| 19 | libpoppler-glib.la \ |
| 20 | $(POPPLER_GLIB_LIBS) \ |
| 21 | $(FREETYPE_LIBS) \ |
| 22 | diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.2.orig/Makefile.am poppler-0.5.2/Makefile.am |
| 23 | --- poppler-0.5.2.orig/Makefile.am 2006-01-10 11:09:33.000000000 -0500 |
| 24 | +++ poppler-0.5.2/Makefile.am 2006-05-22 19:55:31.000000000 -0400 |
| 25 | @@ -29,7 +29,7 @@ |
| 26 | utils_subdir = utils |
| 27 | endif |
| 28 | |
| 29 | -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) |
| 30 | +SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir) |
| 31 | |
| 32 | EXTRA_DIST = \ |
| 33 | README-XPDF \ |
| 34 | @@ -40,9 +40,7 @@ |
| 35 | |
| 36 | pkgconfigdir = $(libdir)/pkgconfig |
| 37 | pkgconfig_DATA = \ |
| 38 | - poppler.pc \ |
| 39 | $(cairo_pc_file) \ |
| 40 | - $(splash_pc_file) \ |
| 41 | $(glib_pc_file) \ |
| 42 | $(qt_pc_file) \ |
| 43 | $(qt4_pc_file) |
| 44 | diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.2.orig/qt/Makefile.am poppler-0.5.2/qt/Makefile.am |
| 45 | --- poppler-0.5.2.orig/qt/Makefile.am 2006-02-28 17:51:10.000000000 -0500 |
| 46 | +++ poppler-0.5.2/qt/Makefile.am 2006-05-22 19:55:31.000000000 -0400 |
| 47 | @@ -22,7 +22,7 @@ |
| 48 | poppler-private.h |
| 49 | |
| 50 | libpoppler_qt_la_LIBADD = \ |
| 51 | - $(top_builddir)/poppler/libpoppler.la \ |
| 52 | + -lpoppler \ |
| 53 | $(POPPLER_QT_LIBS) \ |
| 54 | $(FREETYPE_LIBS) |
| 55 | |
| 56 | @@ -38,7 +38,7 @@ |
| 57 | test-poppler-qt.cpp |
| 58 | |
| 59 | test_poppler_qt_LDADD = \ |
| 60 | - $(top_builddir)/poppler/libpoppler.la \ |
| 61 | + -lpoppler \ |
| 62 | libpoppler-qt.la \ |
| 63 | $(POPPLER_QT_LIBS) \ |
| 64 | $(FREETYPE_LIBS) |
| 65 | diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.2.orig/qt4/src/Makefile.am poppler-0.5.2/qt4/src/Makefile.am |
| 66 | --- poppler-0.5.2.orig/qt4/src/Makefile.am 2006-05-19 13:44:23.000000000 -0400 |
| 67 | +++ poppler-0.5.2/qt4/src/Makefile.am 2006-05-22 19:56:44.000000000 -0400 |
| 68 | @@ -27,7 +27,7 @@ |
| 69 | poppler-private.h |
| 70 | |
| 71 | libpoppler_qt4_la_LIBADD = \ |
| 72 | - $(top_builddir)/poppler/libpoppler.la \ |
| 73 | + -lpoppler \ |
| 74 | $(top_builddir)/poppler/libpoppler-arthur.la \ |
| 75 | $(POPPLER_QT4_LIBS) |
| 76 | |
| 77 | diff --exclude-from=/home/dang/.diffrc -u -ruN poppler-0.5.2.orig/qt4/tests/Makefile.am poppler-0.5.2/qt4/tests/Makefile.am |
| 78 | --- poppler-0.5.2.orig/qt4/tests/Makefile.am 2006-01-23 09:43:39.000000000 -0500 |
| 79 | +++ poppler-0.5.2/qt4/tests/Makefile.am 2006-05-22 19:55:31.000000000 -0400 |
| 80 | @@ -7,7 +7,7 @@ |
| 81 | $(POPPLER_QTTEST_CXXFLAGS) |
| 82 | |
| 83 | LDADDS = \ |
| 84 | - $(top_builddir)/poppler/libpoppler.la \ |
| 85 | + -lpoppler \ |
| 86 | $(top_builddir)/qt4/src/libpoppler-qt4.la \ |
| 87 | $(POPPLER_QT4_LIBS) |
| 88 |