From 73fed47faa4ebb8d86da8283e60eeb164a064130 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 23 May 2006 12:23:05 +0000 Subject: [PATCH] - Update to 0.5.2 --- graphics/poppler-gtk/pkg-plist | 2 ++ graphics/poppler/Makefile | 4 +-- graphics/poppler/distinfo | 6 ++-- graphics/poppler/files/patch-Makefile.in | 20 +++++++++++++ graphics/poppler/files/patch-configure | 12 ++++---- graphics/poppler/files/patch-glib_Makefile.in | 29 ++++++++++--------- graphics/poppler/pkg-plist | 3 ++ 7 files changed, 51 insertions(+), 25 deletions(-) create mode 100644 graphics/poppler/files/patch-Makefile.in diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist index 980f6301364d..63a74ee06d85 100644 --- a/graphics/poppler-gtk/pkg-plist +++ b/graphics/poppler-gtk/pkg-plist @@ -2,6 +2,7 @@ include/poppler/glib/poppler-action.h include/poppler/glib/poppler-attachment.h include/poppler/glib/poppler-document.h include/poppler/glib/poppler-enums.h +include/poppler/glib/poppler-features.h include/poppler/glib/poppler-page.h include/poppler/glib/poppler.h lib/libpoppler-glib.a @@ -20,6 +21,7 @@ libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/poppler-poppler-page.html %%DOCSDIR%%/poppler/poppler-poppler.html %%DOCSDIR%%/poppler/poppler.devhelp +%%DOCSDIR%%/poppler/poppler.devhelp2 %%DOCSDIR%%/poppler/right.png %%DOCSDIR%%/poppler/style.css %%DOCSDIR%%/poppler/up.png diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 38f542528644..09e63664802e 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -7,8 +7,8 @@ # PORTNAME= poppler -PORTVERSION= 0.5.1 -PORTREVISION?= 1 +PORTVERSION= 0.5.2 +PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index ba73162585d8..cd7211d97943 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -MD5 (poppler-0.5.1.tar.gz) = a136cd731892f4570933034ba97c8704 -SHA256 (poppler-0.5.1.tar.gz) = 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe -SIZE (poppler-0.5.1.tar.gz) = 954930 +MD5 (poppler-0.5.2.tar.gz) = e4e22cdec4a8b9d50be8a905089a4a25 +SHA256 (poppler-0.5.2.tar.gz) = b3f2b753b6070e42f391c74a0edd06bb6cb0a3d33e5dc1a08ff204777508ee99 +SIZE (poppler-0.5.2.tar.gz) = 1046998 diff --git a/graphics/poppler/files/patch-Makefile.in b/graphics/poppler/files/patch-Makefile.in new file mode 100644 index 000000000000..a93d4d7c840d --- /dev/null +++ b/graphics/poppler/files/patch-Makefile.in @@ -0,0 +1,20 @@ +--- Makefile.in.orig Tue May 23 07:59:21 2006 ++++ Makefile.in Tue May 23 08:00:41 2006 +@@ -76,7 +76,7 @@ + DATA = $(pkgconfig_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4 ++DIST_SUBDIRS = goo fofi splash poppler utils glib qt qt4 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -254,7 +254,7 @@ + @BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4 + @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc + @BUILD_UTILS_TRUE@utils_subdir = utils +-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) ++SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) $(qt4_subdir) + EXTRA_DIST = \ + README-XPDF \ + poppler.pc.in \ diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure index 72b0d9459e11..c8c36c268cea 100644 --- a/graphics/poppler/files/patch-configure +++ b/graphics/poppler/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Wed Apr 12 12:53:56 2006 -+++ configure Wed Apr 12 13:06:36 2006 -@@ -24849,7 +24849,7 @@ +--- configure.orig Tue May 23 08:07:51 2006 ++++ configure Tue May 23 08:08:07 2006 +@@ -24856,7 +24856,7 @@ fi fi -if test "x$have_qt" == "xyes"; then +if test "x$have_qt" = "xyes"; then - POPPLER_QT_CXXFLAGS="-I$qt_incdir" - POPPLER_QT_LIBS="$qt_libdir/$qt_test_library" - : + ac_ext=cc + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in index 111a8521c47c..ccf1f8d15e8c 100644 --- a/graphics/poppler/files/patch-glib_Makefile.in +++ b/graphics/poppler/files/patch-glib_Makefile.in @@ -1,32 +1,33 @@ ---- glib/Makefile.in.orig Wed Mar 8 20:40:26 2006 -+++ glib/Makefile.in Wed Mar 8 20:42:17 2006 -@@ -65,7 +65,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +--- glib/Makefile.in.orig Tue May 23 08:12:00 2006 ++++ glib/Makefile.in Tue May 23 08:13:09 2006 +@@ -66,7 +66,7 @@ + @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \ + @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) libpoppler_glib_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS) +- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) + am__objects_1 = poppler-enums.lo + am_libpoppler_glib_la_OBJECTS = $(am__objects_1) poppler-action.lo \ +@@ -77,7 +77,7 @@ am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT) test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) test_poppler_glib_DEPENDENCIES = \ - $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \ -+ $(top_builddir)/poppler/libpoppler-cairo.la libpoppler-glib.la \ ++ libpoppler-glib.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler -@@ -306,7 +305,7 @@ libpoppler_glib_la_SOURCES = \ +@@ -310,7 +310,7 @@ poppler-private.h libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ + -lpoppler \ - $(top_builddir)/poppler/libpoppler-cairo.la \ $(POPPLER_GLIB_LIBS) \ $(FREETYPE_LIBS) \ -@@ -317,7 +316,7 @@ test_poppler_glib_SOURCES = \ + $(cairo_libs) +@@ -320,7 +320,7 @@ test-poppler-glib.c test_poppler_glib_LDADD = \ diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index a5ae00cfe342..1f06ace7eeda 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -44,6 +44,9 @@ include/poppler/Stream.h include/poppler/TextOutputDev.h include/poppler/UGooString.h include/poppler/UTF8.h +include/poppler/UnicodeCClassTables.h +include/poppler/UnicodeCompTables.h +include/poppler/UnicodeDecompTables.h include/poppler/UnicodeMap.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h