Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/poppler/patches/poppler-0.15.0-bindings.patch

    Contents of /trunk/poppler/patches/poppler-0.15.0-bindings.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1160 - (show annotations) (download)
    Wed Sep 29 10:04:06 2010 UTC (13 years, 7 months ago) by niro
    File size: 6115 byte(s) 
    -re-based patch against 0.15.0-r1
    1 diff -Naur poppler-0.15.0/glib/demo/Makefile.am poppler-0.15.0-magellan/glib/demo/Makefile.am
    2 --- poppler-0.15.0/glib/demo/Makefile.am 2010-07-24 01:18:27.000000000 +0200
    3 +++ poppler-0.15.0-magellan/glib/demo/Makefile.am 2010-09-29 11:54:11.000000000 +0200
    4 @@ -51,5 +51,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.15.0/glib/Makefile.am poppler-0.15.0-magellan/glib/Makefile.am
    12 --- poppler-0.15.0/glib/Makefile.am 2010-09-16 21:05:23.000000000 +0200
    13 +++ poppler-0.15.0-magellan/glib/Makefile.am 2010-09-29 12:09:12.000000000 +0200
    14 @@ -69,7 +69,7 @@
    15 poppler-private.h
    16
    17 libpoppler_glib_la_LIBADD = \
    18 - $(top_builddir)/poppler/libpoppler.la \
    19 + -lpoppler \
    20 $(top_builddir)/poppler/libpoppler-cairo.la \
    21 $(POPPLER_GLIB_LIBS) \
    22 $(GDK_LIBS) \
    23 @@ -85,7 +85,7 @@
    24 test-poppler-glib.cc
    25
    26 test_poppler_glib_LDADD = \
    27 - $(top_builddir)/poppler/libpoppler.la \
    28 + -lpoppler \
    29 libpoppler-glib.la \
    30 $(POPPLER_GLIB_LIBS) \
    31 $(GDK_LIBS) \
    32 diff -Naur poppler-0.15.0/glib/reference/Makefile.am poppler-0.15.0-magellan/glib/reference/Makefile.am
    33 --- poppler-0.15.0/glib/reference/Makefile.am 2010-07-24 01:18:27.000000000 +0200
    34 +++ poppler-0.15.0-magellan/glib/reference/Makefile.am 2010-09-29 11:57:44.000000000 +0200
    35 @@ -73,7 +73,7 @@
    36 $(GDK_CFLAGS) \
    37 $(FREETYPE_CFLAGS)
    38
    39 -GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la \
    40 +GTKDOC_LIBS=-lpoppler \
    41 $(top_builddir)/glib/libpoppler-glib.la \
    42 $(POPPLER_GLIB_LIBS) \
    43 $(FREETYPE_LIBS) \
    44 diff -Naur poppler-0.15.0/Makefile.am poppler-0.15.0-magellan/Makefile.am
    45 --- poppler-0.15.0/Makefile.am 2010-07-24 01:18:27.000000000 +0200
    46 +++ poppler-0.15.0-magellan/Makefile.am 2010-09-29 11:59:46.000000000 +0200
    47 @@ -34,7 +34,7 @@
    48 utils_subdir = utils
    49 endif
    50
    51 -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
    52 +SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
    53
    54 EXTRA_DIST = \
    55 README-XPDF \
    56 @@ -53,13 +53,10 @@
    57
    58 pkgconfigdir = $(libdir)/pkgconfig
    59 pkgconfig_DATA = \
    60 - poppler.pc \
    61 $(cairo_pc_file) \
    62 - $(splash_pc_file) \
    63 $(glib_pc_file) \
    64 $(qt_pc_file) \
    65 - $(qt4_pc_file) \
    66 - $(cpp_pc_file)
    67 + $(qt4_pc_file)
    68
    69 # Add CMake buildsystem files here so they get added on make dist
    70 EXTRA_DIST += \
    71 diff -Naur poppler-0.15.0/qt/Makefile.am poppler-0.15.0-magellan/qt/Makefile.am
    72 --- poppler-0.15.0/qt/Makefile.am 2010-07-24 01:18:28.000000000 +0200
    73 +++ poppler-0.15.0-magellan/qt/Makefile.am 2010-09-29 12:00:40.000000000 +0200
    74 @@ -25,7 +25,7 @@
    75 poppler-private.h
    76
    77 libpoppler_qt_la_LIBADD = \
    78 - $(top_builddir)/poppler/libpoppler.la \
    79 + -lpoppler \
    80 $(POPPLER_QT_LIBS) \
    81 $(FREETYPE_LIBS) \
    82 $(FONTCONFIG_LIBS)
    83 @@ -42,7 +42,7 @@
    84 test-poppler-qt.cpp
    85
    86 test_poppler_qt_LDADD = \
    87 - $(top_builddir)/poppler/libpoppler.la \
    88 + -lpoppler \
    89 libpoppler-qt.la \
    90 $(libqt3_LIBS) \
    91 $(FREETYPE_LIBS)
    92 diff -Naur poppler-0.15.0/qt4/demos/Makefile.am poppler-0.15.0-magellan/qt4/demos/Makefile.am
    93 --- poppler-0.15.0/qt4/demos/Makefile.am 2010-07-24 01:18:28.000000000 +0200
    94 +++ poppler-0.15.0-magellan/qt4/demos/Makefile.am 2010-09-29 12:01:35.000000000 +0200
    95 @@ -9,7 +9,7 @@
    96 $(POPPLER_QT4_CFLAGS)
    97
    98 LDADDS = \
    99 - $(top_builddir)/poppler/libpoppler.la \
    100 + -lpoppler \
    101 $(top_builddir)/qt4/src/libpoppler-qt4.la \
    102 $(FONTCONFIG_LIBS) \
    103 $(POPPLER_QT4_LIBS)
    104 diff -Naur poppler-0.15.0/qt4/src/Makefile.am poppler-0.15.0-magellan/qt4/src/Makefile.am
    105 --- poppler-0.15.0/qt4/src/Makefile.am 2010-09-16 21:05:23.000000000 +0200
    106 +++ poppler-0.15.0-magellan/qt4/src/Makefile.am 2010-09-29 12:04:39.000000000 +0200
    107 @@ -55,7 +55,7 @@
    108 -Dpoppler_qt4_EXPORTS
    109
    110 libpoppler_qt4_la_LIBADD = \
    111 - $(top_builddir)/poppler/libpoppler.la \
    112 + -lpoppler \
    113 $(top_builddir)/poppler/libpoppler-arthur.la \
    114 $(FONTCONFIG_LIBS) \
    115 $(POPPLER_QT4_LIBS)
    116 diff -Naur poppler-0.15.0/qt4/tests/Makefile.am poppler-0.15.0-magellan/qt4/tests/Makefile.am
    117 --- poppler-0.15.0/qt4/tests/Makefile.am 2010-09-01 21:02:04.000000000 +0200
    118 +++ poppler-0.15.0-magellan/qt4/tests/Makefile.am 2010-09-29 12:05:10.000000000 +0200
    119 @@ -9,7 +9,7 @@
    120 $(POPPLER_QT4_CFLAGS)
    121
    122 LDADDS = \
    123 - $(top_builddir)/poppler/libpoppler.la \
    124 + -lpoppler \
    125 $(top_builddir)/qt4/src/libpoppler-qt4.la \
    126 $(FONTCONFIG_LIBS) \
    127 $(POPPLER_QT4_LIBS)
    128 diff -Naur poppler-0.15.0/test/Makefile.am poppler-0.15.0-magellan/test/Makefile.am
    129 --- poppler-0.15.0/test/Makefile.am 2010-07-24 01:18:28.000000000 +0200
    130 +++ poppler-0.15.0-magellan/test/Makefile.am 2010-09-29 12:06:36.000000000 +0200
    131 @@ -53,14 +53,14 @@
    132 gtk-splash-test.cc
    133
    134 gtk_splash_test_LDADD = \
    135 - $(top_builddir)/poppler/libpoppler.la \
    136 + -lpoppler \
    137 $(GTK_TEST_LIBS)
    138
    139 gtk_cairo_test_SOURCES = \
    140 gtk-cairo-test.cc
    141
    142 gtk_cairo_test_LDADD = \
    143 - $(top_builddir)/poppler/libpoppler.la \
    144 + -lpoppler \
    145 $(top_builddir)/glib/libpoppler-glib.la \
    146 $(CAIRO_LIBS) \
    147 $(GTK_TEST_LIBS) \
    148 @@ -71,7 +71,7 @@
    149
    150 pdf_inspector_LDADD = \
    151 $(top_builddir)/poppler/libpoppler-cairo.la \
    152 - $(top_builddir)/poppler/libpoppler.la \
    153 + -lpoppler \
    154 $(CAIRO_LIBS) \
    155 $(FREETYPE_LIBS) \
    156 $(GTK_TEST_LIBS) \
    157 @@ -82,7 +82,7 @@
    158 perf-test-preview-dummy.cc
    159
    160 perf_test_LDADD = \
    161 - $(top_builddir)/poppler/libpoppler.la \
    162 + -lpoppler \
    163 $(FREETYPE_LIBS) \
    164 $(X_EXTRA_LIBS)
    165
    166 @@ -90,7 +90,7 @@
    167 pdf-fullrewrite.cc
    168
    169 pdf_fullrewrite_LDADD = \
    170 - $(top_builddir)/poppler/libpoppler.la
    171 + -lpoppler
    172
    173 EXTRA_DIST = \
    174 pdf-operators.c \
    175 diff -Naur poppler-0.15.0/utils/Makefile.am poppler-0.15.0-magellan/utils/Makefile.am
    176 --- poppler-0.15.0/utils/Makefile.am 2010-08-31 22:43:18.000000000 +0200
    177 +++ poppler-0.15.0-magellan/utils/Makefile.am 2010-09-29 12:07:18.000000000 +0200
    178 @@ -20,7 +20,7 @@
    179 $(ABIWORD_CFLAGS)
    180
    181 LDADD = \
    182 - $(top_builddir)/poppler/libpoppler.la \
    183 + -lpoppler \
    184 $(UTILS_LIBS) \
    185 $(FONTCONFIG_LIBS)
    186