pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print update to 0.6.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5de52c217808
branches:  trunk
changeset: 534904:5de52c217808
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sat Nov 03 16:10:38 2007 +0000

description:
update to 0.6.1
This switches to the new 0.6 branch which is not source compatible
to 0.5.x.
Most notable changes:
-Merge xpdf 3.02 changes
-Support for Sound objects
-Support for Opening/Closing page actions
-Support for page duration
-Improve PS Tokenizer performance
-Beginning of Interactive Form support
-xpdfrc is no longer used for anything
-Fix security issue MOAB-06-01-2007
-Lots of bugs fixed

diffstat:

 print/poppler-glib/Makefile    |   3 +-
 print/poppler-glib/PLIST       |   5 ++-
 print/poppler-qt/Makefile      |  10 ++++-
 print/poppler/Makefile         |   4 +-
 print/poppler/Makefile.common  |   4 +-
 print/poppler/buildlink3.mk    |   3 +-
 print/poppler/distinfo         |  16 +++------
 print/poppler/patches/patch-aa |  16 ++++----
 print/poppler/patches/patch-ab |  70 ++++++++++++++++++++++++------------------
 print/poppler/patches/patch-ac |  49 -----------------------------
 print/poppler/patches/patch-ad |  52 -------------------------------
 print/poppler/patches/patch-ae |  13 -------
 print/poppler/patches/patch-af |  30 ------------------
 13 files changed, 72 insertions(+), 203 deletions(-)

diffs (truncated from 464 to 300 lines):

diff -r 7309c1f37f4c -r 5de52c217808 print/poppler-glib/Makefile
--- a/print/poppler-glib/Makefile       Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler-glib/Makefile       Sat Nov 03 16:10:38 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2007/08/09 18:42:51 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/11/03 16:10:40 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-glib-${POPPLER_VERS}
-PKGREVISION=           1
 
 COMMENT=               PDF rendering library (GLib wrapper)
 
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler-glib/PLIST
--- a/print/poppler-glib/PLIST  Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler-glib/PLIST  Sat Nov 03 16:10:38 2007 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2006/11/28 21:47:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/11/03 16:10:40 drochner Exp $
 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-form-field.h
 include/poppler/glib/poppler-page.h
 include/poppler/glib/poppler.h
 lib/libpoppler-glib.la
@@ -15,8 +16,10 @@
 share/gtk-doc/html/poppler/index.sgml
 share/gtk-doc/html/poppler/left.png
 share/gtk-doc/html/poppler/poppler-poppler-action.html
+share/gtk-doc/html/poppler/poppler-poppler-attachment.html
 share/gtk-doc/html/poppler/poppler-poppler-document.html
 share/gtk-doc/html/poppler/poppler-poppler-enums.html
+share/gtk-doc/html/poppler/poppler-poppler-form-field.html
 share/gtk-doc/html/poppler/poppler-poppler-page.html
 share/gtk-doc/html/poppler/poppler-poppler.html
 share/gtk-doc/html/poppler/poppler.devhelp
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler-qt/Makefile
--- a/print/poppler-qt/Makefile Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler-qt/Makefile Sat Nov 03 16:10:38 2007 +0000
@@ -1,13 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2007/08/09 18:42:51 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/11/03 16:10:40 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-qt-${POPPLER_VERS}
-PKGREVISION=           1
 
 COMMENT=               PDF rendering library (QT wrapper)
 
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-cairo-output
+CONFIGURE_ARGS+=       --disable-splash-output
+CONFIGURE_ARGS+=       --enable-poppler-qt
+CONFIGURE_ARGS+=       --disable-gtk-test
+CONFIGURE_ARGS+=       --disable-utils
+
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-qt.pc.in
 
 INCS=-I. -I.. -I../poppler `pkg-config poppler --cflags` -I${QTDIR}/include
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler/Makefile
--- a/print/poppler/Makefile    Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler/Makefile    Sat Nov 03 16:10:38 2007 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/08/09 18:42:51 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2007/11/03 16:10:38 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=   2
-
 COMMENT=               PDF rendering library
 
 USE_TOOLS+=            gmake
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler/Makefile.common     Sat Nov 03 16:10:38 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.8 2007/08/09 18:42:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.9 2007/11/03 16:10:38 drochner Exp $
 #
 
-POPPLER_VERS=          0.5.4
+POPPLER_VERS=          0.6.1
 DISTNAME=              poppler-${POPPLER_VERS}
 CATEGORIES=            print
 MASTER_SITES=          http://poppler.freedesktop.org/
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler/buildlink3.mk
--- a/print/poppler/buildlink3.mk       Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler/buildlink3.mk       Sat Nov 03 16:10:38 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/11/03 16:10:38 drochner Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 POPPLER_BUILDLINK3_MK:=        ${POPPLER_BUILDLINK3_MK}+
@@ -17,5 +17,6 @@
 .endif # POPPLER_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler/distinfo
--- a/print/poppler/distinfo    Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler/distinfo    Sat Nov 03 16:10:38 2007 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.17 2007/08/02 14:41:18 drochner Exp $
+$NetBSD: distinfo,v 1.18 2007/11/03 16:10:38 drochner Exp $
 
-SHA1 (poppler-0.5.4.tar.gz) = edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1
-RMD160 (poppler-0.5.4.tar.gz) = f28c89b03388757067505df3c60a1d878626b0dd
-Size (poppler-0.5.4.tar.gz) = 1062401 bytes
-SHA1 (patch-aa) = dba62eabac1d77b5a64c47aaa0ba94208149668b
-SHA1 (patch-ab) = 5ff54831e530c857b88f90c91108d1a04178579e
-SHA1 (patch-ac) = ba2f2e83897e4c56541da6e9e4f1b61d60fea9b0
-SHA1 (patch-ad) = 437c1514654d3c4caa00f674de9dbd3d66e58127
-SHA1 (patch-ae) = 9f118e4d70df1c523807aa5faeda798a3d7f74f1
-SHA1 (patch-af) = e27499a90ebf76f376a411e310fe16c21d22f30e
+SHA1 (poppler-0.6.1.tar.gz) = f28184df94fe6312db0a11e285d7832c3cfd0797
+RMD160 (poppler-0.6.1.tar.gz) = 19496a6b3a5aeb7eca2f7edc2e957868880a90f4
+Size (poppler-0.6.1.tar.gz) = 1286501 bytes
+SHA1 (patch-aa) = 8172f8e6a176a20579c83be77c18c55d73559313
+SHA1 (patch-ab) = 8cb260eb13eba003f5b0ecb825bdb1a4785f042b
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler/patches/patch-aa
--- a/print/poppler/patches/patch-aa    Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler/patches/patch-aa    Sat Nov 03 16:10:38 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2006/05/31 18:13:54 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2007/11/03 16:10:38 drochner Exp $
 
---- glib/Makefile.in.orig      2006-05-22 22:15:15.000000000 +0200
+--- glib/Makefile.in.orig      2007-05-30 20:32:26.000000000 +0200
 +++ glib/Makefile.in
 @@ -66,7 +66,7 @@ am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
@@ -8,10 +8,10 @@
  libpoppler_glib_la_DEPENDENCIES =  \
 -      $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
 +      $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+       $(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 @@ PROGRAMS = $(noinst_PROGRAMS)
+@@ -78,7 +78,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
@@ -20,7 +20,7 @@
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -310,7 +310,7 @@ libpoppler_glib_la_SOURCES = \
+@@ -319,7 +319,7 @@ libpoppler_glib_la_SOURCES = \
        poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -28,8 +28,8 @@
 +      $(prefix)/lib/libpoppler.la             \
        $(POPPLER_GLIB_LIBS)                            \
        $(FREETYPE_LIBS)                                \
-       $(cairo_libs)
-@@ -320,7 +320,7 @@ test_poppler_glib_SOURCES = \
+       $(FONTCONFIG_LIBS)                              \
+@@ -330,7 +330,7 @@ test_poppler_glib_SOURCES = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff -r 7309c1f37f4c -r 5de52c217808 print/poppler/patches/patch-ab
--- a/print/poppler/patches/patch-ab    Sat Nov 03 16:00:25 2007 +0000
+++ b/print/poppler/patches/patch-ab    Sat Nov 03 16:10:38 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/10/12 14:12:15 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $
 
---- utils/Makefile.in.orig     2006-09-22 02:54:29.000000000 +0200
+--- utils/Makefile.in.orig     2007-08-15 01:30:09.000000000 +0200
 +++ utils/Makefile.in
 @@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
@@ -8,32 +8,38 @@
  CONFIG_CLEAN_FILES =
 -@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
 +am__EXEEXT_1 = pdftoppm$(EXEEXT)
+ @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
-@@ -60,35 +60,35 @@ am__objects_1 = parseargs.$(OBJEXT)
- am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
+@@ -62,18 +62,18 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+ am__DEPENDENCIES_1 =
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
        $(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la
- am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
+ am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
+ @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
+@@ -86,24 +86,24 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
        HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
  am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
 -@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
 -@BUILD_SPLASH_OUTPUT_TRUE@    $(am__objects_1)
@@ -41,25 +47,27 @@
 +      $(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -278,12 +278,12 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
+@@ -301,12 +301,12 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ win32_libs = @win32_libs@
 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
 -@BUILD_SPLASH_OUTPUT_TRUE@    pdftoppm.cc                             \
 -@BUILD_SPLASH_OUTPUT_TRUE@    $(common)
@@ -71,17 +79,19 @@
 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
 +pdftoppm_binary = pdftoppm
 +pdftoppm_manpage = pdftoppm.1
- INCLUDES = \
-       -I$(top_srcdir)                         \
-       -I$(top_srcdir)/utils                   \
-@@ -291,8 +291,8 @@ INCLUDES = \
-       $(UTILS_CFLAGS)
+ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
+ @BUILD_ABIWORD_OUTPUT_TRUE@   pdftoabw.cc                             \
+ @BUILD_ABIWORD_OUTPUT_TRUE@   $(common)
+@@ -321,9 +321,10 @@ INCLUDES = \
+       $(ABIWORD_CFLAGS)
  
  LDADD = \
 -      $(top_builddir)/poppler/libpoppler.la   \
--      $(UTILS_LIBS)
 +      $(prefix)/lib/libpoppler.la     \
-+      $(UTILS_LIBS) $(PTHREAD_STUBLIB)
+       $(UTILS_LIBS)                           \
+-      $(FONTCONFIG_LIBS)
++      $(FONTCONFIG_LIBS) \



Home | Main Index | Thread Index | Old Index