Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 493 - (hide annotations) (download)
    Fri Feb 15 14:37:07 2008 UTC (16 years, 3 months ago) by niro
    File size: 3952 byte(s) 
    -fixed patch again
    1 niro 493 diff -Naur poppler-0.6.4/glib/demo/Makefile.am poppler-0.6.4-magellan/glib/demo/Makefile.am
    2     --- poppler-0.6.4/glib/demo/Makefile.am 2008-01-21 21:00:59.000000000 +0100
    3     +++ poppler-0.6.4-magellan/glib/demo/Makefile.am 2008-02-15 15:38:32.000000000 +0100
    4     @@ -26,5 +26,5 @@
    5    
    6     LDADD = \
    7     $(top_builddir)/glib/libpoppler-glib.la \
    8     - $(top_builddir)/poppler/libpoppler.la \
    9     + -lpoppler \
    10     $(GTK_TEST_LIBS)
    11 niro 492 diff -Naur poppler-0.6.4/glib/Makefile.am poppler-0.6.4-magellan/glib/Makefile.am
    12     --- poppler-0.6.4/glib/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    13     +++ poppler-0.6.4-magellan/glib/Makefile.am 2008-02-15 15:33:57.000000000 +0100
    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     @@ -84,7 +84,7 @@
    24     poppler-private.h
    25    
    26     libpoppler_glib_la_LIBADD = \
    27     - $(top_builddir)/poppler/libpoppler.la \
    28     + -lpoppler \
    29     $(POPPLER_GLIB_LIBS) \
    30     $(FREETYPE_LIBS) \
    31     $(FONTCONFIG_LIBS) \
    32     @@ -98,7 +98,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     $(FREETYPE_LIBS) \
    41 niro 493 diff -Naur poppler-0.6.4/glib/reference/Makefile.am poppler-0.6.4-magellan/glib/reference/Makefile.am
    42     --- poppler-0.6.4/glib/reference/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    43     +++ poppler-0.6.4-magellan/glib/reference/Makefile.am 2008-02-15 15:39:10.000000000 +0100
    44     @@ -72,7 +72,7 @@
    45     $(POPPLER_GLIB_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 niro 492 diff -Naur poppler-0.6.4/Makefile.am poppler-0.6.4-magellan/Makefile.am
    54     --- poppler-0.6.4/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    55     +++ poppler-0.6.4-magellan/Makefile.am 2008-02-15 15:15:08.000000000 +0100
    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.6.4/qt/Makefile.am poppler-0.6.4-magellan/qt/Makefile.am
    76     --- poppler-0.6.4/qt/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    77     +++ poppler-0.6.4-magellan/qt/Makefile.am 2008-02-15 15:16:08.000000000 +0100
    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.6.4/qt4/src/Makefile.am poppler-0.6.4-magellan/qt4/src/Makefile.am
    97     --- poppler-0.6.4/qt4/src/Makefile.am 2008-01-21 20:59:14.000000000 +0100
    98     +++ poppler-0.6.4-magellan/qt4/src/Makefile.am 2008-02-15 15:17:20.000000000 +0100
    99     @@ -36,7 +36,7 @@
    100     poppler-private.h
    101    
    102     libpoppler_qt4_la_LIBADD = \
    103     - $(top_builddir)/poppler/libpoppler.la \
    104     + -lpoppler \
    105     $(FONTCONFIG_LIBS) \
    106     $(POPPLER_QT4_LIBS)
    107    
    108     diff -Naur poppler-0.6.4/qt4/tests/Makefile.am poppler-0.6.4-magellan/qt4/tests/Makefile.am
    109     --- poppler-0.6.4/qt4/tests/Makefile.am 2008-01-21 21:00:59.000000000 +0100
    110     +++ poppler-0.6.4-magellan/qt4/tests/Makefile.am 2008-02-15 15:17:42.000000000 +0100
    111     @@ -7,7 +7,7 @@
    112     $(POPPLER_QT4_CFLAGS)
    113    
    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)