Magellan Linux

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

    Contents of /trunk/poppler/patches/poppler-0.6.4-bindings-2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 492 - (show annotations) (download)
    Fri Feb 15 14:32:22 2008 UTC (16 years, 2 months ago) by niro
    File size: 3018 byte(s) 
    -fixed patch, missing a glib instance
    1 diff -Naur poppler-0.6.4/glib/Makefile.am poppler-0.6.4-magellan/glib/Makefile.am
    2 --- poppler-0.6.4/glib/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    3 +++ poppler-0.6.4-magellan/glib/Makefile.am 2008-02-15 15:33:57.000000000 +0100
    4 @@ -4,7 +4,7 @@
    5 $(CAIRO_CFLAGS)
    6
    7 cairo_libs = \
    8 - $(top_builddir)/poppler/libpoppler-cairo.la \
    9 + -lpoppler \
    10 $(CAIRO_LIBS)
    11
    12 endif
    13 @@ -84,7 +84,7 @@
    14 poppler-private.h
    15
    16 libpoppler_glib_la_LIBADD = \
    17 - $(top_builddir)/poppler/libpoppler.la \
    18 + -lpoppler \
    19 $(POPPLER_GLIB_LIBS) \
    20 $(FREETYPE_LIBS) \
    21 $(FONTCONFIG_LIBS) \
    22 @@ -98,7 +98,7 @@
    23 test-poppler-glib.cc
    24
    25 test_poppler_glib_LDADD = \
    26 - $(top_builddir)/poppler/libpoppler.la \
    27 + -lpoppler \
    28 libpoppler-glib.la \
    29 $(POPPLER_GLIB_LIBS) \
    30 $(FREETYPE_LIBS) \
    31 diff -Naur poppler-0.6.4/Makefile.am poppler-0.6.4-magellan/Makefile.am
    32 --- poppler-0.6.4/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    33 +++ poppler-0.6.4-magellan/Makefile.am 2008-02-15 15:15:08.000000000 +0100
    34 @@ -29,7 +29,7 @@
    35 utils_subdir = utils
    36 endif
    37
    38 -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
    39 +SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
    40
    41 EXTRA_DIST = \
    42 README-XPDF \
    43 @@ -40,9 +40,7 @@
    44
    45 pkgconfigdir = $(libdir)/pkgconfig
    46 pkgconfig_DATA = \
    47 - poppler.pc \
    48 $(cairo_pc_file) \
    49 - $(splash_pc_file) \
    50 $(glib_pc_file) \
    51 $(qt_pc_file) \
    52 $(qt4_pc_file)
    53 diff -Naur poppler-0.6.4/qt/Makefile.am poppler-0.6.4-magellan/qt/Makefile.am
    54 --- poppler-0.6.4/qt/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    55 +++ poppler-0.6.4-magellan/qt/Makefile.am 2008-02-15 15:16:08.000000000 +0100
    56 @@ -24,7 +24,7 @@
    57 poppler-private.h
    58
    59 libpoppler_qt_la_LIBADD = \
    60 - $(top_builddir)/poppler/libpoppler.la \
    61 + -lpoppler \
    62 $(POPPLER_QT_LIBS) \
    63 $(FREETYPE_LIBS) \
    64 $(FONTCONFIG_LIBS)
    65 @@ -41,7 +41,7 @@
    66 test-poppler-qt.cpp
    67
    68 test_poppler_qt_LDADD = \
    69 - $(top_builddir)/poppler/libpoppler.la \
    70 + -lpoppler \
    71 libpoppler-qt.la \
    72 $(POPPLER_QT_LIBS) \
    73 $(FREETYPE_LIBS)
    74 diff -Naur poppler-0.6.4/qt4/src/Makefile.am poppler-0.6.4-magellan/qt4/src/Makefile.am
    75 --- poppler-0.6.4/qt4/src/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    76 +++ poppler-0.6.4-magellan/qt4/src/Makefile.am 2008-02-15 15:17:20.000000000 +0100
    77 @@ -36,7 +36,7 @@
    78 poppler-private.h
    79
    80 libpoppler_qt4_la_LIBADD = \
    81 - $(top_builddir)/poppler/libpoppler.la \
    82 + -lpoppler \
    83 $(FONTCONFIG_LIBS) \
    84 $(POPPLER_QT4_LIBS)
    85
    86 diff -Naur poppler-0.6.4/qt4/tests/Makefile.am poppler-0.6.4-magellan/qt4/tests/Makefile.am
    87 --- poppler-0.6.4/qt4/tests/Makefile.am 2008-01-21 21:00:59.000000000 +0100
    88 +++ poppler-0.6.4-magellan/qt4/tests/Makefile.am 2008-02-15 15:17:42.000000000 +0100
    89 @@ -7,7 +7,7 @@
    90 $(POPPLER_QT4_CFLAGS)
    91
    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)