[116612] users/devans/dports/graphics

30 Jan 2014

Revision: 116612
          https://trac.macports.org/changeset/116612
Author:   devans@macports.org
Date:     2014-01-30 12:07:41 -0800 (Thu, 30 Jan 2014)
Log Message:
-----------
user/devans/dports: librsvg, copy from trunk and update to version 2.40.1 for testing.

Modified Paths:
--------------
    users/devans/dports/graphics/librsvg/Portfile

Added Paths:
-----------
    users/devans/dports/graphics/librsvg/
    users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff

Removed Paths:
-------------
    users/devans/dports/graphics/librsvg/files/patch-configure.diff

Modified: users/devans/dports/graphics/librsvg/Portfile
===================================================================

--- trunk/dports/graphics/librsvg/Portfile	2014-01-30 02:10:21 UTC (rev 116602)
+++ users/devans/dports/graphics/librsvg/Portfile	2014-01-30 20:07:41 UTC (rev 116612)
@@ -5,8 +5,7 @@
 PortGroup           archcheck 1.0
 
 name                librsvg
-version             2.36.4
-revision            5
+version             2.40.1
 license             {GPL-2+ LGPL-2+}
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          graphics gnome
@@ -20,42 +19,34 @@
 master_sites        gnome:sources/${name}/${branch}/
 use_xz              yes
 
-checksums           rmd160  b9765edaccd7e40997a3a141e4d21c5a13f6f2a1 \
-                    sha256  1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2
+checksums           rmd160  6e0212214c7acc6d570d1dbb196bde3678e84525 \
+                    sha256  8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7
 
 depends_build       port:pkgconfig
 
-depends_lib         port:libart_lgpl \
+depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     path:lib/pkgconfig/cairo.pc:cairo \
+                    path:lib/pkgconfig/pangocairo.pc:pango \
                     port:libcroco \
-                    port:fontconfig \
-                    port:freetype \
-                    path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                    port:libgsf \
-                    port:libpng \
                     port:libxml2 \
-                    path:lib/pkgconfig/pango.pc:pango \
-                    path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2
+                    port:gdk-pixbuf2 \
+                    port:gtk3 \
+                    port:vala
 
 
 set pyversion 2.7
 depends_run         port:python[join [split ${pyversion} "."] ""]
 
-archcheck.files     lib/libart_lgpl_2.dylib \
-                    lib/libcairo.dylib \
+archcheck.files     lib/libcairo.dylib \
                     lib/libcroco-0.6.dylib \
-                    lib/libfontconfig.dylib \
-                    lib/libfreetype.dylib \
                     lib/libglib-2.0.dylib \
-                    lib/libgsf-1.dylib \
-                    lib/libpango-1.0.dylib \
+                    lib/libpangocairo-1.0.dylib \
                     lib/libxml2.dylib
 
-patch.pre_args      -p1
-patchfiles          patch-configure.diff
+patchfiles          patch-replace-canonicalize-file-name.diff
 
-configure.args      --disable-gtk-theme \
-                    --disable-gtk-doc \
+configure.args      --enable-introspection=yes \
+                    --enable-vala=yes \
                     --disable-Bsymbolic
 
 # librsvg's build process includes the gobject-introspection Makefile, causing

Deleted: users/devans/dports/graphics/librsvg/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/librsvg/files/patch-configure.diff	2014-01-30 02:10:21 UTC (rev 116602)
+++ users/devans/dports/graphics/librsvg/files/patch-configure.diff	2014-01-30 20:07:41 UTC (rev 116612)
@@ -1,23 +0,0 @@
---- a/configure	2012-09-09 11:55:12.000000000 -0700
-+++ b/configure	2012-09-09 11:57:25.000000000 -0700
-@@ -13747,16 +13747,16 @@
- 
- 
-  if test "$have_gtk_2" = "yes"; then
--  HAVE_GTK_2_TRUE=
--  HAVE_GTK_2_FALSE='#'
-+  HAVE_GTK_2_TRUE='#'
-+  HAVE_GTK_2_FALSE=
- else
-   HAVE_GTK_2_TRUE='#'
-   HAVE_GTK_2_FALSE=
- fi
- 
-  if test "$have_gtk_3" = "yes"; then
--  HAVE_GTK_3_TRUE=
--  HAVE_GTK_3_FALSE='#'
-+  HAVE_GTK_3_TRUE='#'
-+  HAVE_GTK_3_FALSE=
- else
-   HAVE_GTK_3_TRUE='#'
-   HAVE_GTK_3_FALSE=

Added: users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff
===================================================================
--- users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff	                        (rev 0)
+++ users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff	2014-01-30 20:07:41 UTC (rev 116612)
@@ -0,0 +1,45 @@
+From 02cb19835cb52bd84b0b5eaca1b4d6338417d261 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Tue, 15 Oct 2013 07:36:30 +0000
+Subject: portability: canonicalize_file_name -> realpath
+
+canonicalize_file_name() is a GNU extension so let's use the portable
+realpath() instead.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710163
+---
+diff --git a/rsvg-base.c b/rsvg-base.c
+index cb9f64a..fb829e7 100644
+--- rsvg-base.c
++++ rsvg-base.c
+@@ -50,6 +50,8 @@
+ #include <math.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <limits.h>
++#include <stdlib.h>
+ 
+ #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)
+--
+cgit v0.9.2

    

devans＠macports.org

tags

participants (1)