Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 492 by niro, Fri Feb 15 14:32:22 2008 UTC revision 493 by niro, Fri Feb 15 14:37:07 2008 UTC
# Line 1  Line 1 
1    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  diff -Naur poppler-0.6.4/glib/Makefile.am poppler-0.6.4-magellan/glib/Makefile.am  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  --- 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  +++ poppler-0.6.4-magellan/glib/Makefile.am 2008-02-15 15:33:57.000000000 +0100
# Line 28  diff -Naur poppler-0.6.4/glib/Makefile.a Line 38  diff -Naur poppler-0.6.4/glib/Makefile.a
38   libpoppler-glib.la \   libpoppler-glib.la \
39   $(POPPLER_GLIB_LIBS) \   $(POPPLER_GLIB_LIBS) \
40   $(FREETYPE_LIBS) \   $(FREETYPE_LIBS) \
41    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  diff -Naur poppler-0.6.4/Makefile.am poppler-0.6.4-magellan/Makefile.am  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  --- 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  +++ poppler-0.6.4-magellan/Makefile.am 2008-02-15 15:15:08.000000000 +0100

Legend:
Removed from v.492  
changed lines
  Added in v.493