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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print update to 0.10.4
From: drochner <drochner%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 07:17:51 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/37816adfcf7f
branches:  trunk
changeset: 554337:37816adfcf7f
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Feb 12 20:55:07 2009 +0000

description:
update to 0.10.4
changes:
-fixed some crashes and a memory leak
-fixed pdfimages to work for jpeg
pkgsrc change: pulled in color management support from the development
branch (but tested by me for many weeks), as an option which is on
per default

diffstat:

 print/poppler-glib/Makefile    |    3 +-
 print/poppler-qt/Makefile      |    3 +-
 print/poppler-qt4/Makefile     |    3 +-
 print/poppler-utils/Makefile   |    3 +-
 print/poppler/Makefile         |   14 +-
 print/poppler/Makefile.common  |    4 +-
 print/poppler/buildlink3.mk    |    8 +-
 print/poppler/distinfo         |   14 +-
 print/poppler/patches/patch-ai |  353 +++++++++++++++-
 print/poppler/patches/patch-aj |   51 ++
 print/poppler/patches/patch-ak |   27 +
 print/poppler/patches/patch-ca |  936 +++++++++++++++++++++++++++++++++++++++++
 print/poppler/patches/patch-cb |  156 ++++++
 13 files changed, 1559 insertions(+), 16 deletions(-)

diffs (truncated from 1710 to 300 lines):

diff -r 62255436a236 -r 37816adfcf7f print/poppler-glib/Makefile
--- a/print/poppler-glib/Makefile       Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler-glib/Makefile       Thu Feb 12 20:55:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/11/20 14:28:22 dillo Exp $
+# $NetBSD: Makefile,v 1.18 2009/02/12 20:55:07 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -24,6 +24,7 @@
 # Don't compile GTK+ test program.
 CONFIGURE_ARGS+=       --disable-gtk-test
 CONFIGURE_ARGS+=       --disable-utils
+CONFIGURE_ARGS+=       --disable-cms
 
 BUILD_DIRS=            goo fofi poppler glib
 INSTALL_DIRS=          glib
diff -r 62255436a236 -r 37816adfcf7f print/poppler-qt/Makefile
--- a/print/poppler-qt/Makefile Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler-qt/Makefile Thu Feb 12 20:55:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/11/20 14:28:22 dillo Exp $
+# $NetBSD: Makefile,v 1.18 2009/02/12 20:55:07 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -14,6 +14,7 @@
 CONFIGURE_ARGS+=       --enable-poppler-qt
 CONFIGURE_ARGS+=       --disable-gtk-test
 CONFIGURE_ARGS+=       --disable-utils
+CONFIGURE_ARGS+=       --disable-cms
 
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-qt.pc.in
 
diff -r 62255436a236 -r 37816adfcf7f print/poppler-qt4/Makefile
--- a/print/poppler-qt4/Makefile        Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler-qt4/Makefile        Thu Feb 12 20:55:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/11/20 14:28:22 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2009/02/12 20:55:07 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -13,6 +13,7 @@
 CONFIGURE_ARGS+=       --enable-poppler-qt4
 CONFIGURE_ARGS+=       --disable-gtk-test
 CONFIGURE_ARGS+=       --disable-utils
+CONFIGURE_ARGS+=       --disable-cms
 
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-qt4.pc.in
 
diff -r 62255436a236 -r 37816adfcf7f print/poppler-utils/Makefile
--- a/print/poppler-utils/Makefile      Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler-utils/Makefile      Thu Feb 12 20:55:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/11/20 14:28:22 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2009/02/12 20:55:07 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -27,6 +27,7 @@
 CONFIGURE_ARGS+=       --disable-poppler-glib
 # Enable build and install of the tools
 CONFIGURE_ARGS+=       --enable-utils  # the default
+CONFIGURE_ARGS+=       --disable-cms
 
 BUILD_DIRS=            utils # implies INSTALL_DIRS too
 
diff -r 62255436a236 -r 37816adfcf7f print/poppler/Makefile
--- a/print/poppler/Makefile    Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler/Makefile    Thu Feb 12 20:55:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/01/07 13:54:14 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2009/02/12 20:55:07 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -30,6 +30,18 @@
 # Don't build and install the tools
 CONFIGURE_ARGS+=       --disable-utils
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.poppler
+PKG_SUPPORTED_OPTIONS= poppler-cms
+PKG_SUGGESTED_OPTIONS= poppler-cms
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpoppler-cms)
+CONFIGURE_ARGS+=       --enable-cms
+.include "../../graphics/lcms/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-cms
+.endif
+
 .include "../../mk/bsd.prefs.mk"
 
 post-install:
diff -r 62255436a236 -r 37816adfcf7f print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler/Makefile.common     Thu Feb 12 20:55:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2009/01/13 10:18:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.27 2009/02/12 20:55:07 drochner Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=          0.10.3
+POPPLER_VERS=          0.10.4
 DISTNAME=              poppler-${POPPLER_VERS}
 CATEGORIES=            print
 MASTER_SITES=          http://poppler.freedesktop.org/
diff -r 62255436a236 -r 37816adfcf7f print/poppler/buildlink3.mk
--- a/print/poppler/buildlink3.mk       Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler/buildlink3.mk       Thu Feb 12 20:55:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/01/13 10:18:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/02/12 20:55:07 drochner Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 POPPLER_BUILDLINK3_MK:=        ${POPPLER_BUILDLINK3_MK}+
@@ -21,6 +21,12 @@
                                { print "@comment in poppler: " $$0; next; }
 .endif # POPPLER_BUILDLINK3_MK
 
+pkgbase := poppler
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
+.include "../../graphics/lcms/buildlink3.mk"
+.endif
+
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 
diff -r 62255436a236 -r 37816adfcf7f print/poppler/distinfo
--- a/print/poppler/distinfo    Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler/distinfo    Thu Feb 12 20:55:07 2009 +0000
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.38 2009/01/13 10:18:56 wiz Exp $
+$NetBSD: distinfo,v 1.39 2009/02/12 20:55:07 drochner Exp $
 
-SHA1 (poppler-0.10.3.tar.gz) = 04e4d132fedf7f4633ed3438f9da9a580d985811
-RMD160 (poppler-0.10.3.tar.gz) = f3c70686d130c784543719aefbe600e85fda2e33
-Size (poppler-0.10.3.tar.gz) = 1530394 bytes
+SHA1 (poppler-0.10.4.tar.gz) = e8a5a1090394a2cfab3c9aa67d188f3628c60165
+RMD160 (poppler-0.10.4.tar.gz) = 62815f486a4f1eaa226e84aa953134be6a209ed6
+Size (poppler-0.10.4.tar.gz) = 1513213 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = 5a2785bccd71990e20cd81a3cd2697804e31788d
 SHA1 (patch-ag) = 0bf1bc080cad55792fe6cc761bf22ecccba7d13a
-SHA1 (patch-ai) = d3d4411092b5c6dd61d3f197c01c3bcdad88cc0e
+SHA1 (patch-ai) = 852332490394756c496d06eb109f3d1d637f8717
+SHA1 (patch-aj) = 8bb1fe169bddb76ecc72129cc1dbd32030073dfd
+SHA1 (patch-ak) = ab4d0c91a6f2806b405954f8dab6e3d61a03b054
+SHA1 (patch-ca) = ba4190663bc0c0e9a7d9477922665e0ed5d4c0e4
+SHA1 (patch-cb) = e8cfb16a0641788759b13cf5fcf97d82f9485adc
diff -r 62255436a236 -r 37816adfcf7f print/poppler/patches/patch-ai
--- a/print/poppler/patches/patch-ai    Thu Feb 12 19:51:08 2009 +0000
+++ b/print/poppler/patches/patch-ai    Thu Feb 12 20:55:07 2009 +0000
@@ -1,8 +1,66 @@
-$NetBSD: patch-ai,v 1.5 2008/07/15 10:34:21 drochner Exp $
+$NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $
 
---- configure.orig     2008-07-02 16:30:43.000000000 +0200
+--- configure.orig     2009-02-10 20:06:59.000000000 +0100
 +++ configure
-@@ -27984,7 +27984,7 @@ fi
+@@ -945,6 +945,8 @@ BUILD_ABIWORD_OUTPUT_TRUE
+ BUILD_ABIWORD_OUTPUT_FALSE
+ BUILD_UTILS_TRUE
+ BUILD_UTILS_FALSE
++USE_CMS_TRUE
++USE_CMS_FALSE
+ PC_REQUIRES
+ PC_REQUIRES_PRIVATE
+ LIBOBJS
+@@ -1594,6 +1596,7 @@ Optional Features:
+   --enable-compile-warnings=[no/yes/kde]
+                              Turn on compiler warnings.
+ 
++  --disable-cms           Don't use color management system.
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+@@ -19915,13 +19918,11 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <sys/types.h> /* for off_t */
+-     #include <stdio.h>
++#include <stdio.h>
+ int
+ main ()
+ {
+-int (*fp) (FILE *, off_t, int) = fseeko;
+-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
++return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+   ;
+   return 0;
+ }
+@@ -19961,13 +19962,11 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #define _LARGEFILE_SOURCE 1
+-#include <sys/types.h> /* for off_t */
+-     #include <stdio.h>
++#include <stdio.h>
+ int
+ main ()
+ {
+-int (*fp) (FILE *, off_t, int) = fseeko;
+-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
++return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+   ;
+   return 0;
+ }
+@@ -21325,7 +21324,7 @@ for i in $jpeg_incdirs;
+ do
+   for j in jpeglib.h;
+   do
+-    echo "configure: 21328: $i/$j" >&5
++    echo "configure: 21327: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       jpeg_incdir=$i
+@@ -23687,7 +23686,7 @@ fi
  if test x$enable_poppler_qt4 = xyes; then
    { echo "$as_me:$LINENO: checking for Qt4 moc" >&5
  echo $ECHO_N "checking for Qt4 moc... $ECHO_C" >&6; }
@@ -11,3 +69,292 @@
    mocversion=`$MOCQT4 -v 2>&1`
    mocversiongrep=`echo $mocversion | grep "Qt 4"`
    if test x"$mocversiongrep" != x"$mocversion"; then
+@@ -24142,6 +24141,249 @@ else
+ fi
+ 
+ 
++
++# Check whether --enable-cms was given.
++if test "${enable_cms+set}" = set; then
++  enableval=$enable_cms; enable_cms=$enableval
++else
++  enable_cms="yes"
++fi
++
++if test x$enable_cms = xyes; then
++
++{ echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5
++echo $ECHO_N "checking for cmsOpenProfileFromFile in -llcms... $ECHO_C" >&6; }
++if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-llcms  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char cmsOpenProfileFromFile ();
++int
++main ()
++{
++return cmsOpenProfileFromFile ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++       test -z "$ac_c_werror_flag" ||
++       test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  ac_cv_lib_lcms_cmsOpenProfileFromFile=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
Prev by Date: [pkgsrc/trunk]: pkgsrc/audio/libmp3splt Update to 0.5.4. From the changelog:
Next by Date: [pkgsrc/trunk]: pkgsrc/security/policykit-gnome Supports DESTDIR.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/audio/libmp3splt Update to 0.5.4. From the changelog:
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/policykit-gnome Supports DESTDIR.
Indexes:
Home | Main Index | Thread Index | Old Index