diff options
Diffstat (limited to 'graphics/poppler/files')
| -rw-r--r-- | graphics/poppler/files/patch-glib_Makefile.in | 40 | ||||
| -rw-r--r-- | graphics/poppler/files/patch-qt4_src_Makefile.in | 28 |
2 files changed, 35 insertions, 33 deletions
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in index 94d7703cd62b..4afb4b2aa878 100644 --- a/graphics/poppler/files/patch-glib_Makefile.in +++ b/graphics/poppler/files/patch-glib_Makefile.in @@ -1,40 +1,42 @@ ---- glib/Makefile.in.orig 2008-03-24 09:03:54.000000000 -0400 -+++ glib/Makefile.in 2008-03-24 09:04:38.000000000 -0400 -@@ -66,7 +66,6 @@ - @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) +--- glib/Makefile.in.orig 2010-08-14 16:50:48.000000000 +0200 ++++ glib/Makefile.in 2010-08-14 16:50:48.000000000 +0200 +@@ -82,7 +82,6 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = libpoppler_glib_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ +- $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-cairo.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) - am__objects_1 = poppler-enums.lo -@@ -80,7 +79,6 @@ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@@ -105,8 +104,7 @@ @BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT) test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \ -@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ - @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ +-@BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ ++@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ -@@ -295,7 +293,7 @@ - @BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(CAIRO_LIBS) - + @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler +@@ -386,7 +384,7 @@ + top_srcdir = @top_srcdir@ + win32_libs = @win32_libs@ + AM_LDFLAGS = @auto_import_flags@ -SUBDIRS = . reference demo +SUBDIRS = . reference INCLUDES = \ -DG_LOG_DOMAIN=\"Poppler\" \ -I$(top_srcdir) \ -@@ -336,7 +334,7 @@ +@@ -439,7 +437,7 @@ poppler-private.h libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ ++ -lpoppler \ + $(top_builddir)/poppler/libpoppler-cairo.la \ $(POPPLER_GLIB_LIBS) \ $(GDK_LIBS) \ - $(FREETYPE_LIBS) \ -@@ -348,7 +346,7 @@ +@@ -451,7 +449,7 @@ @BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \ diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in index e9f0ee2e3749..916eabc22f88 100644 --- a/graphics/poppler/files/patch-qt4_src_Makefile.in +++ b/graphics/poppler/files/patch-qt4_src_Makefile.in @@ -1,19 +1,19 @@ ---- qt4/src/Makefile.in.orig 2008-07-02 14:06:32.000000000 -0500 -+++ qt4/src/Makefile.in 2008-07-02 14:07:35.000000000 -0500 -@@ -62,7 +62,6 @@ +--- qt4/src/Makefile.in.orig 2010-07-07 14:22:29.000000000 +0200 ++++ qt4/src/Makefile.in 2010-07-07 14:23:40.000000000 +0200 +@@ -79,7 +79,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_qt4_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__append_1) +- $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-arthur.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \ - poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \ -@@ -303,7 +302,7 @@ - poppler-export.h \ - poppler-private.h +@@ -384,7 +383,7 @@ + poppler-page-transition-private.h --libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \ -+libpoppler_qt4_la_LIBADD = -lpoppler \ - $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1) - libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0 - all: all-am + libpoppler_qt4_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(top_builddir)/poppler/libpoppler-arthur.la \ + $(FONTCONFIG_LIBS) \ + $(POPPLER_QT4_LIBS) |