From d3b0384eec8dc705480669bbbe5c08e0fb68f850 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 27 Mar 2013 17:50:18 +0000 Subject: [PATCH] Update to gdk-pixbuf-2.28.0. --- graphics/gdk-pixbuf2/Makefile | 24 ++++------ graphics/gdk-pixbuf2/distinfo | 4 +- .../patches/patch-gdk-pixbuf_io-jpeg_c | 44 ------------------- graphics/gdk-pixbuf2/pkg/PLIST | 14 +++--- 4 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-jpeg_c diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 7edaf6cc93f..9ff65f8195f 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -1,15 +1,14 @@ -# $OpenBSD: Makefile,v 1.27 2013/03/11 11:10:52 espie Exp $ +# $OpenBSD: Makefile,v 1.28 2013/03/27 17:50:18 ajacoutot Exp $ COMMENT= graphic library for gtk+2 GNOME_PROJECT= gdk-pixbuf -GNOME_VERSION= 2.26.5 -REVISION= 1 +GNOME_VERSION= 2.28.0 CATEGORIES= graphics -SHARED_LIBS += gdk_pixbuf-2.0 2600.0 # 2600.0 -SHARED_LIBS += gdk_pixbuf_xlib-2.0 2600.0 # 2600.0 +SHARED_LIBS += gdk_pixbuf-2.0 2800.0 # 2800.0 +SHARED_LIBS += gdk_pixbuf_xlib-2.0 2800.0 # 2800.0 HOMEPAGE= http://www.gtk.org/ @@ -18,13 +17,13 @@ MAINTAINER= Antoine Jacoutot # LGPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += X11 c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 -WANTLIB += jasper jpeg m pcre png pthread tiff xcb z ffi +WANTLIB += X11 c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += jasper jpeg m pcre png pthread tiff xcb z MODULES= devel/gettext \ x11/gnome -LIB_DEPENDS= devel/glib2 \ +LIB_DEPENDS= devel/glib2>=2.36.0 \ graphics/jasper \ graphics/png \ graphics/tiff @@ -36,16 +35,9 @@ RUN_DEPENDS += misc/shared-mime-info MODGNOME_TOOLS= goi CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --disable-gtk-doc \ - --with-libjasper \ +CONFIGURE_ARGS= --with-libjasper \ --with-x11 -# If one of these tools is found at configure stage, it might be used, -# no matter whether we use --disable-gtk-doc or not. -CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \ - ac_cv_path_GTKDOC_REBASE="" \ - ac_cv_path_GTKDOC_MKPDF="" - post-install: rm ${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.{a,la} diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo index e389072bef8..fbd91820a92 100644 --- a/graphics/gdk-pixbuf2/distinfo +++ b/graphics/gdk-pixbuf2/distinfo @@ -1,2 +1,2 @@ -SHA256 (gdk-pixbuf-2.26.5.tar.xz) = d2lv0WO8qVoTChiD29eNCuTXgt4vyFqaOFVtE2gfXIQ= -SIZE (gdk-pixbuf-2.26.5.tar.xz) = 1181336 +SHA256 (gdk-pixbuf-2.28.0.tar.xz) = Vh43aVv7GwdUlYiz/KLm8FsjIO7nWxN0i7fcXhJX00c= +SIZE (gdk-pixbuf-2.28.0.tar.xz) = 1191004 diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-jpeg_c b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-jpeg_c deleted file mode 100644 index 108198cf8e7..00000000000 --- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-jpeg_c +++ /dev/null @@ -1,44 +0,0 @@ -$OpenBSD: patch-gdk-pixbuf_io-jpeg_c,v 1.1 2013/02/02 09:24:08 ajacoutot Exp $ - -From ff9d69d5328abd846b2c66e3ed5ad0e90de8f5d8 Mon Sep 17 00:00:00 2001 -From: Tormod Volden -Date: Thu, 15 Nov 2012 20:17:29 +0000 -Subject: Fix parsing of JPEG orientation tag - ---- gdk-pixbuf/io-jpeg.c.orig Mon Sep 3 18:16:55 2012 -+++ gdk-pixbuf/io-jpeg.c Sat Feb 2 10:20:08 2013 -@@ -393,9 +393,6 @@ jpeg_parse_exif_app1 (JpegExifContext *context, jpeg_s - guint ret = FALSE; - guint offset; - guint tags; /* number of tags in current ifd */ -- guint tag; -- guint type; -- guint count; - guint endian = 0; /* detected endian of data */ - const char leth[] = {0x49, 0x49, 0x2a, 0x00}; // Little endian TIFF header - const char beth[] = {0x4d, 0x4d, 0x00, 0x2a}; // Big endian TIFF header -@@ -472,10 +469,11 @@ jpeg_parse_exif_app1 (JpegExifContext *context, jpeg_s - - /* check through IFD0 for tags */ - while (tags--){ -- tag = de_get16(&marker->data[i + 0], endian); -- type = de_get16(&marker->data[i + 2], endian); -- count = de_get32(&marker->data[i + 4], endian); -- offset = de_get32(&marker->data[i + 8], endian); -+ guint tag = de_get16(&marker->data[i + 0], endian); -+ guint type = de_get16(&marker->data[i + 2], endian); -+ guint count = de_get32(&marker->data[i + 4], endian); -+ /* values of types small enough to fit are stored directly in the (first) bytes of the Value Offset field */ -+ guint short_value = de_get16(&marker->data[i + 8], endian); - - /* orientation tag? */ - if (tag == 0x112){ -@@ -485,7 +483,7 @@ jpeg_parse_exif_app1 (JpegExifContext *context, jpeg_s - continue; - - /* get the orientation value */ -- context->orientation = offset <= 8 ? offset : 0; -+ context->orientation = short_value <= 8 ? short_value : 0; - } - /* move the pointer to the next 12-byte tag field. */ - i = i + 12; diff --git a/graphics/gdk-pixbuf2/pkg/PLIST b/graphics/gdk-pixbuf2/pkg/PLIST index 857a31ac40c..3a3393f6dc9 100644 --- a/graphics/gdk-pixbuf2/pkg/PLIST +++ b/graphics/gdk-pixbuf2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2013/02/02 09:24:08 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.14 2013/03/27 17:50:18 ajacoutot Exp $ @conflict gtk+2-<2.22 @conflict gtk+2-docs-<2.22 @unexec-delete rm -f %D/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache @@ -49,6 +49,7 @@ share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html share/gtk-doc/html/gdk-pixbuf/api-index-2-26.html +share/gtk-doc/html/gdk-pixbuf/api-index-2-28.html share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html @@ -139,8 +140,6 @@ share/locale/eo/LC_MESSAGES/gdk-pixbuf.mo share/locale/es/LC_MESSAGES/gdk-pixbuf.mo share/locale/et/LC_MESSAGES/gdk-pixbuf.mo share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo -share/locale/fa/ -share/locale/fa/LC_MESSAGES/ share/locale/fa/LC_MESSAGES/gdk-pixbuf.mo share/locale/fi/LC_MESSAGES/gdk-pixbuf.mo share/locale/fr/LC_MESSAGES/gdk-pixbuf.mo @@ -156,8 +155,6 @@ share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo share/locale/hy/ share/locale/hy/LC_MESSAGES/ share/locale/hy/LC_MESSAGES/gdk-pixbuf.mo -share/locale/ia/ -share/locale/ia/LC_MESSAGES/ share/locale/ia/LC_MESSAGES/gdk-pixbuf.mo share/locale/id/LC_MESSAGES/gdk-pixbuf.mo share/locale/io/ @@ -168,8 +165,6 @@ share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/gdk-pixbuf.mo share/locale/it/LC_MESSAGES/gdk-pixbuf.mo share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo -share/locale/ka/ -share/locale/ka/LC_MESSAGES/ share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo share/locale/km/ share/locale/km/LC_MESSAGES/ @@ -250,9 +245,10 @@ share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo share/locale/ta/ share/locale/ta/LC_MESSAGES/ share/locale/ta/LC_MESSAGES/gdk-pixbuf.mo -share/locale/te/ -share/locale/te/LC_MESSAGES/ share/locale/te/LC_MESSAGES/gdk-pixbuf.mo +share/locale/tg/ +share/locale/tg/LC_MESSAGES/ +share/locale/tg/LC_MESSAGES/gdk-pixbuf.mo share/locale/th/ share/locale/th/LC_MESSAGES/ share/locale/th/LC_MESSAGES/gdk-pixbuf.mo