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.24.3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2804e5e31bd6
branches:  trunk
changeset: 625989:2804e5e31bd6
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Oct 29 19:05:23 2013 +0000

description:
update to 0.24.3
changes: bugfixes, among them a format string problem (CVE-2013-4474)

pkgsrc change: kill the poppler-cms/lcms option, it got broken recently
and it is not useful enough to justify the complexity

diffstat:

 print/poppler-cpp/Makefile    |   8 +-------
 print/poppler-glib/Makefile   |   8 +-------
 print/poppler-qt4/Makefile    |   8 +-------
 print/poppler-utils/Makefile  |   8 +-------
 print/poppler/Makefile        |  16 ++--------------
 print/poppler/Makefile.common |   4 ++--
 print/poppler/buildlink3.mk   |   7 +------
 print/poppler/distinfo        |   8 ++++----
 8 files changed, 13 insertions(+), 54 deletions(-)

diffs (181 lines):

diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler-cpp/Makefile
--- a/print/poppler-cpp/Makefile        Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler-cpp/Makefile        Tue Oct 29 19:05:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/07/04 13:14:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/10/29 19:05:23 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -28,12 +28,6 @@
 BUILDLINK_API_DEPENDS.poppler+=        poppler-${POPPLER_VERS}{,nb*}
 .include "../../print/poppler/buildlink3.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
-CONFIGURE_ARGS+=       --enable-cms
-.else
-CONFIGURE_ARGS+=       --disable-cms
-.endif
-
 BUILD_DIRS=            cpp
 INSTALL_DIRS=          cpp
 
diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler-glib/Makefile
--- a/print/poppler-glib/Makefile       Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler-glib/Makefile       Tue Oct 29 19:05:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2013/10/04 21:15:41 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2013/10/29 19:05:23 drochner Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -28,12 +28,6 @@
 BUILDLINK_API_DEPENDS.poppler+=     poppler-${POPPLER_VERS}{,nb*}
 .include "../../print/poppler/buildlink3.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
-CONFIGURE_ARGS+=       --enable-cms
-.else
-CONFIGURE_ARGS+=       --disable-cms
-.endif
-
 BUILD_DIRS=            goo fofi poppler glib
 INSTALL_DIRS=          glib
 
diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler-qt4/Makefile
--- a/print/poppler-qt4/Makefile        Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler-qt4/Makefile        Tue Oct 29 19:05:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2013/08/22 15:06:15 prlw1 Exp $
+# $NetBSD: Makefile,v 1.41 2013/10/29 19:05:23 drochner Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -16,12 +16,6 @@
 BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
-CONFIGURE_ARGS+=       --enable-cms
-.else
-CONFIGURE_ARGS+=       --disable-cms
-.endif
-
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-qt4.pc.in
 
 INSTALLATION_DIRS+=    lib include/poppler lib/pkgconfig
diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler-utils/Makefile
--- a/print/poppler-utils/Makefile      Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler-utils/Makefile      Tue Oct 29 19:05:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/07/04 13:14:07 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2013/10/29 19:05:23 drochner Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -30,12 +30,6 @@
 BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
-CONFIGURE_ARGS+=       --enable-cms
-.else
-CONFIGURE_ARGS+=       --disable-cms
-.endif
-
 BUILD_DIRS=            utils # implies INSTALL_DIRS too
 
 .include "../../mk/bsd.prefs.mk"
diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler/Makefile
--- a/print/poppler/Makefile    Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler/Makefile    Tue Oct 29 19:05:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2013/10/25 06:53:34 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2013/10/29 19:05:23 drochner Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -28,19 +28,6 @@
 CONFIGURE_ARGS+=       --disable-utils
 CONFIGURE_ARGS+=       --disable-poppler-cpp
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.poppler
-PKG_SUPPORTED_OPTIONS= lcms
-PKG_SUGGESTED_OPTIONS= lcms
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mlcms)
-CONFIGURE_ARGS+=       --enable-cms
-.include "../../graphics/lcms2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-cms
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
 # Passing "-ansi" turns "long long" support off on FreeBSD/amd64:
@@ -54,6 +41,7 @@
        ${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
 
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler/Makefile.common     Tue Oct 29 19:05:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2013/10/04 21:15:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.59 2013/10/29 19:05:23 drochner Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=          0.24.2
+POPPLER_VERS=          0.24.3
 DISTNAME=              poppler-${POPPLER_VERS}
 CATEGORIES=            print
 MASTER_SITES=          http://poppler.freedesktop.org/
diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler/buildlink3.mk
--- a/print/poppler/buildlink3.mk       Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler/buildlink3.mk       Tue Oct 29 19:05:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.37 2013/08/22 09:11:16 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2013/10/29 19:05:23 drochner Exp $
 
 BUILDLINK_TREE+=       poppler
 
@@ -9,12 +9,7 @@
 BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=0.24.0
 BUILDLINK_PKGSRCDIR.poppler?=  ../../print/poppler
 
-pkgbase := poppler
-.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
 .include "../../graphics/lcms2/buildlink3.mk"
-.endif
-
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff -r 64e446c1286c -r 2804e5e31bd6 print/poppler/distinfo
--- a/print/poppler/distinfo    Tue Oct 29 18:18:46 2013 +0000
+++ b/print/poppler/distinfo    Tue Oct 29 19:05:23 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.84 2013/10/26 15:10:57 joerg Exp $
+$NetBSD: distinfo,v 1.85 2013/10/29 19:05:23 drochner Exp $
 
-SHA1 (poppler-0.24.2.tar.xz) = a8a08cf3fb8b35c9b9718d0c9db9f3360e033a03
-RMD160 (poppler-0.24.2.tar.xz) = 4f70a43d932f6014076015f6efa4cdba70ff4dbc
-Size (poppler-0.24.2.tar.xz) = 1505004 bytes
+SHA1 (poppler-0.24.3.tar.xz) = 9aca24a8b012587ea579f72892863d9b3245009a
+RMD160 (poppler-0.24.3.tar.xz) = 6967df43f2630ad5bbbf9082da5ffe93fc2029cc
+Size (poppler-0.24.3.tar.xz) = 1506152 bytes
 SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7
 SHA1 (patch-ab) = 758c541fa14c82cb44a247cbc37e1582b0167229
 SHA1 (patch-ag) = de9ef3e2498d5c07a8f35f1d215e377953a5dad8



Home | Main Index | Thread Index | Old Index