diff --git a/x11/gnome/librsvg/Makefile b/x11/gnome/librsvg/Makefile index ede1e263414..4677e9493f9 100644 --- a/x11/gnome/librsvg/Makefile +++ b/x11/gnome/librsvg/Makefile @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.91 2013/09/28 08:51:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.92 2013/10/15 07:40:41 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= SAX-based render library for SVG files GNOME_PROJECT= librsvg -GNOME_VERSION= 2.36.4 -REVISION= 5 +GNOME_VERSION= 2.40.0 -SHARED_LIBS += rsvg-2 38.0 # 38.4 +SHARED_LIBS += rsvg-2 38.1 # 42.0 CATEGORIES= devel graphics @@ -17,10 +16,9 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += X11 Xext Xrender c cairo croco-0.6 expat ffi fontconfig WANTLIB += freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 -WANTLIB += gobject-2.0 graphite2 gthread-2.0 harfbuzz -WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render -WANTLIB += xcb-shm xml2 z +WANTLIB += gobject-2.0 graphite2 gthread-2.0 harfbuzz m pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread +WANTLIB += pthread-stubs xcb xcb-render xcb-shm xml2 z MODULES= devel/gettext \ x11/gnome @@ -32,9 +30,7 @@ LIB_DEPENDS= devel/pango \ textproc/libxml \ www/libcroco -CONFIGURE_ARGS= --disable-gtk-theme \ - --disable-tools \ - --disable-rsvg-view +CONFIGURE_ARGS= --disable-tools # error: -Bsymbolic requested but not supported by ld CONFIGURE_ARGS += --disable-Bsymbolic diff --git a/x11/gnome/librsvg/distinfo b/x11/gnome/librsvg/distinfo index 0d858305683..8a3fee90514 100644 --- a/x11/gnome/librsvg/distinfo +++ b/x11/gnome/librsvg/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/librsvg-2.36.4.tar.xz) = ECGTUgR5j08K0wBKCbWDZo6pSkhZNGGxR/3P9ooY5sI= -SIZE (gnome/librsvg-2.36.4.tar.xz) = 513028 +SHA256 (gnome/librsvg-2.40.0.tar.xz) = j32zHfI1gT29A1iIA1z4YtaC58xXBsTn7AV1DT9kovk= +SIZE (gnome/librsvg-2.40.0.tar.xz) = 505300 diff --git a/x11/gnome/librsvg/patches/patch-configure b/x11/gnome/librsvg/patches/patch-configure index 3d86cbc8957..08518bea72e 100644 --- a/x11/gnome/librsvg/patches/patch-configure +++ b/x11/gnome/librsvg/patches/patch-configure @@ -1,16 +1,15 @@ -$OpenBSD: patch-configure,v 1.15 2013/04/05 08:21:45 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.16 2013/10/15 07:40:42 ajacoutot Exp $ https://bugzilla.gnome.org/show_bug.cgi?id=653323 ---- configure.orig Fri Apr 5 09:23:01 2013 -+++ configure Fri Apr 5 09:24:04 2013 -@@ -13736,6 +13736,9 @@ fi - GTK2_BINARY_VERSION= +--- configure.orig Tue Oct 15 09:11:58 2013 ++++ configure Tue Oct 15 09:12:34 2013 +@@ -13733,6 +13733,8 @@ fi + GTK3_BINARY_VERSION= -+have_gtk_2=no +have_gtk_3=no + - if test "$have_gtk_2" = "yes"; then - GTK2_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`" + if test "$have_gtk_3" = "yes"; then + GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" fi diff --git a/x11/gnome/librsvg/patches/patch-gdk-pixbuf-loader_Makefile_in b/x11/gnome/librsvg/patches/patch-gdk-pixbuf-loader_Makefile_in deleted file mode 100644 index 92b987eb4bf..00000000000 --- a/x11/gnome/librsvg/patches/patch-gdk-pixbuf-loader_Makefile_in +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-gdk-pixbuf-loader_Makefile_in,v 1.1 2013/04/05 07:32:15 ajacoutot Exp $ - -From 9f4bd58fe6f3afdc94f327d4025425d6bb854087 Mon Sep 17 00:00:00 2001 -From: Hans Nieser -Date: Sun, 16 Dec 2012 17:47:53 +0000 -Subject: build: Fix typo - ---- gdk-pixbuf-loader/Makefile.in.orig Fri Apr 5 09:24:31 2013 -+++ gdk-pixbuf-loader/Makefile.in Fri Apr 5 09:24:46 2013 -@@ -348,7 +348,7 @@ top_srcdir = @top_srcdir@ - @ENABLE_PIXBUF_LOADER_TRUE@libpixbufloader_svg_la_CFLAGS = \ - @ENABLE_PIXBUF_LOADER_TRUE@ $(GDK_PIXBUF_CFLAGS) \ - @ENABLE_PIXBUF_LOADER_TRUE@ $(LIBRSVG_CFLAGS) \ --@ENABLE_PIXBUF_LOADER_TRUE@ $(AM_CFLASG) -+@ENABLE_PIXBUF_LOADER_TRUE@ $(AM_CFLAGS) - - @ENABLE_PIXBUF_LOADER_TRUE@libpixbufloader_svg_la_LDFLAGS = \ - @ENABLE_PIXBUF_LOADER_TRUE@ -avoid-version -module \ diff --git a/x11/gnome/librsvg/patches/patch-gdk-pixbuf-loader_io-svg_c b/x11/gnome/librsvg/patches/patch-gdk-pixbuf-loader_io-svg_c deleted file mode 100644 index ee77dd544f9..00000000000 --- a/x11/gnome/librsvg/patches/patch-gdk-pixbuf-loader_io-svg_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-gdk-pixbuf-loader_io-svg_c,v 1.1 2013/03/30 20:07:23 ajacoutot Exp $ - -From 4e1b6d2bb7779ad3c61a532905a88cf7a662df5e Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 03 Jan 2013 13:13:56 +0000 -Subject: Mark the pixbuf loader as thread-safe - ---- gdk-pixbuf-loader/io-svg.c.orig Sat Mar 30 21:02:36 2013 -+++ gdk-pixbuf-loader/io-svg.c Sat Mar 30 21:02:59 2013 -@@ -256,6 +256,6 @@ fill_info (GdkPixbufFormat *info) - info->description = _("Scalable Vector Graphics"); - info->mime_types = mime_types; - info->extensions = extensions; -- info->flags = GDK_PIXBUF_FORMAT_SCALABLE; -+ info->flags = GDK_PIXBUF_FORMAT_SCALABLE | GDK_PIXBUF_FORMAT_THREADSAFE; - info->license = "LGPL"; - } diff --git a/x11/gnome/librsvg/patches/patch-rsvg-base_c b/x11/gnome/librsvg/patches/patch-rsvg-base_c new file mode 100644 index 00000000000..9c432029a06 --- /dev/null +++ b/x11/gnome/librsvg/patches/patch-rsvg-base_c @@ -0,0 +1,35 @@ +$OpenBSD: patch-rsvg-base_c,v 1.2 2013/10/15 07:40:43 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=710163 + +--- rsvg-base.c.orig Tue Oct 15 09:23:05 2013 ++++ rsvg-base.c Tue Oct 15 09:24:30 2013 +@@ -50,6 +50,8 @@ + #include + #include + #include ++#include ++#include + + #include "rsvg-path.h" + #include "rsvg-paint-server.h" +@@ -2190,8 +2192,7 @@ _rsvg_handle_allow_load (RsvgHandle *handle, + dir = g_file_get_path (base); + g_object_unref (base); + +- /* FIXME portability */ +- cdir = canonicalize_file_name (dir); ++ cdir = realpath (dir, NULL); + g_free (dir); + if (cdir == NULL) + goto deny; +@@ -2200,8 +2201,7 @@ _rsvg_handle_allow_load (RsvgHandle *handle, + if (path == NULL) + goto deny; + +- /* FIXME portability */ +- cpath = canonicalize_file_name (path); ++ cpath = realpath (path, NULL); + g_free (path); + + if (cpath == NULL)