diff options
| author | kwm <kwm@FreeBSD.org> | 2017-09-03 06:15:02 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2017-09-03 06:15:02 +0800 |
| commit | 9129b3eacc4d199bfe08414674fe1d3ee3920eec (patch) | |
| tree | 623f3373826e2954ed94d983c63093839dc52662 /graphics | |
| parent | 567c03e09f749323860530d89e9d88bbc89b16a0 (diff) | |
| download | freebsd-ports-gnome-9129b3eacc4d199bfe08414674fe1d3ee3920eec.tar.gz freebsd-ports-gnome-9129b3eacc4d199bfe08414674fe1d3ee3920eec.tar.zst freebsd-ports-gnome-9129b3eacc4d199bfe08414674fe1d3ee3920eec.zip | |
Update gdk-pixbuf2 to 2.36.9.
* Move USES before USE_*, according to porters handbook [1]
* Add depend on shared-mime-info, due to configure checking for it now.
* Work around a bug in configure where tiff support isn't correctly
enabled, resulting in the tiff loader not being build.
* Regen patch with make makepatch
PR: 221989
Submitted by: lightside@gmx.com
Reported by: Alaksiej Carniajeu <a@carniajeu.com>, portlint [1]
MFH: 2017Q3
Security: CVE-2017-2870, CVE-2017-2862
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gdk-pixbuf2/Makefile | 18 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf2/distinfo | 6 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf2/files/patch-Makefile.in | 14 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf2/pkg-plist | 4 |
4 files changed, 27 insertions, 15 deletions
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 8ee0e7ea10c7..70c45124dfa9 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gdk-pixbuf -PORTVERSION= 2.36.6 +PORTVERSION= 2.36.9 CATEGORIES= graphics MASTER_SITES= GNOME PKGNAMESUFFIX= 2 @@ -14,8 +14,9 @@ COMMENT= Graphic library for GTK+ LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING +USES= cpe gmake gnome libtool localbase pathfix pkgconfig \ + shared-mime-info tar:xz USE_XORG= xt xi x11 -USES= cpe gmake gnome libtool localbase pathfix pkgconfig tar:xz CPE_VENDOR= gnome USE_GNOME+= glib20 introspection:build USE_LDCONFIG= yes @@ -26,18 +27,29 @@ INSTALL_TARGET= install-strip OPTIONS_SUB= yes OPTIONS_DEFINE= JASPER JPEG PNG TIFF NLS OPTIONS_DEFAULT=JASPER JPEG PNG TIFF + JASPER_CONFIGURE_WITH= libjasper JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper + JPEG_CONFIGURE_WITH= libjpeg JPEG_USES= jpeg + PNG_CONFIGURE_WITH= libpng PNG_LIB_DEPENDS= libpng.so:graphics/png + TIFF_CONFIGURE_WITH= libtiff TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff + NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +# workaround tiff enable bug in configure +post-patch: + @${REINPLACE_CMD} -e 's|$$LIBTIFF|$$TIFF_LIBS|' \ + ${WRKSRC}/configure + post-install: - @cd ${WRKSRC}/docs/reference/gdk-pixbuf && env DESTDIR=${STAGEDIR} ${GMAKE} install-man1 + @cd ${WRKSRC}/docs/reference/gdk-pixbuf && \ + ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-man1 .include <bsd.port.mk> diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo index 1a1adcbe59c0..55693012f648 100644 --- a/graphics/gdk-pixbuf2/distinfo +++ b/graphics/gdk-pixbuf2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491988486 -SHA256 (gnome2/gdk-pixbuf-2.36.6.tar.xz) = 455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c -SIZE (gnome2/gdk-pixbuf-2.36.6.tar.xz) = 5166980 +TIMESTAMP = 1504299347 +SHA256 (gnome2/gdk-pixbuf-2.36.9.tar.xz) = 8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a +SIZE (gnome2/gdk-pixbuf-2.36.9.tar.xz) = 5769124 diff --git a/graphics/gdk-pixbuf2/files/patch-Makefile.in b/graphics/gdk-pixbuf2/files/patch-Makefile.in index 3259dab4e7a9..1db315a60540 100644 --- a/graphics/gdk-pixbuf2/files/patch-Makefile.in +++ b/graphics/gdk-pixbuf2/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2017-04-12 11:14:48.226620000 +0200 -+++ Makefile.in 2017-04-12 11:15:12.061124000 +0200 -@@ -449,7 +449,7 @@ +--- Makefile.in.orig 2017-09-02 09:47:13 UTC ++++ Makefile.in +@@ -451,7 +451,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib win32 -+SUBDIRS = gdk-pixbuf po thumbnailer contrib win32 - EXTRA_DIST = \ - config.h.win32 \ - glib-tap.mk \ ++SUBDIRS = gdk-pixbuf po thumbnailer tests contrib win32 + meson_files = \ + meson.build \ + meson_options.txt \ diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist index 7ff9f26b68b1..f8106f5561fa 100644 --- a/graphics/gdk-pixbuf2/pkg-plist +++ b/graphics/gdk-pixbuf2/pkg-plist @@ -34,10 +34,10 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so lib/girepository-1.0/GdkPixbuf-2.0.typelib lib/libgdk_pixbuf-2.0.so lib/libgdk_pixbuf-2.0.so.0 -lib/libgdk_pixbuf-2.0.so.0.3600.6 +lib/libgdk_pixbuf-2.0.so.0.3609.0 lib/libgdk_pixbuf_xlib-2.0.so lib/libgdk_pixbuf_xlib-2.0.so.0 -lib/libgdk_pixbuf_xlib-2.0.so.0.3600.6 +lib/libgdk_pixbuf_xlib-2.0.so.0.3609.0 libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc man/man1/gdk-pixbuf-csource.1.gz |