Add patch from upstream to fix compilation on non-glibc platforms

Package-Manager: portage-2.2.7-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 60 insertions, 8 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 5fb794393bb5..186bf48ff814 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.322 2013/12/08 18:39:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.323 2013/12/21 13:25:02 grobian Exp $
+
+  21 Dec 2013; Fabian Groffen <grobian@gentoo.org>
+  +files/librsvg-2.39.0-canonicalize-realpath.patch, librsvg-2.39.0.ebuild:
+  Add patch from upstream to fix compilation on non-glibc platforms
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> librsvg-2.39.0.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index c5ac0f9ccc1e..0645baf34084 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -5,17 +5,18 @@ AUX librsvg-2.36.0-rsvg-view-automagic.patch 1955 SHA256 74577e5f2d0f3de93d3e66f
 AUX librsvg-2.36.4-resource-uri-1.patch 3668 SHA256 1feffc8fc503971b87157d8d05fb957912c256eb094615f9f5c649ece991b565 SHA512 ae9b171cf0c9e76ce6d2099df90e15671e834e47d8cbcd48ac742521c1a3f68209cc275424a1aa987aff4ceb0a6c9657c148facd41d87c34bd916ea37b013ddf WHIRLPOOL 0d54e10bc06ec72121637083101b28f1c9b0479c6c7542fdec4a5f8f6d0d41f82110f5b20cd9b7d7838a50d9f8ed4e576c2e27ed1aa71a30a84d4181ea0fb941
 AUX librsvg-2.36.4-resource-uri-2.patch 2423 SHA256 00ab1759bdaef45083c30f4b1744555487819774edda4a7aec1165e6a010765a SHA512 8f81b68f92a0dd071021c231c75dc2b8397edc27c77868bce9742ad7dec2ee9f9048656b816932466a271ce499551376573fabefd6e76c42bf44c2f8ededab51 WHIRLPOOL 802477a1c112a6f7fc22dfb658369754c2799bb2730aafa8aa1af960b4f79942c9d1b3059fc7fa4bb50c582f5dd1f292c889bd8ba0575ea44c26d45ee96d6000
 AUX librsvg-2.36.4-resource-uri-3.patch 4543 SHA256 512ff5ace57cc2b40e42128cbe8c9653562c0501593c09b84ec105d56da5ca4d SHA512 60307bbdbcf8e597027b2f7cf7606afafc52855ed09d7fcff42de09cd8522d3bbe468d85a85cd915f81fdb82895565931706a7f8572fe65f31111883e7e68a60 WHIRLPOOL 4ecf3dac3b808eee0cacba6618f3fe75ba2ead09c51b961da68f4d1a4ebc915557220285466b0f31b4ad052a769215b8b1359496a79d6861ed06bed931dd9a30
+AUX librsvg-2.39.0-canonicalize-realpath.patch 1222 SHA256 2fb7b9cea505ec6ec8d42372263682d2c458a257ca78f1bd9d5dbd31e43bbf4d SHA512 bc7c747d36ad7d839afeedfb9303fd97387f14d547d4581b55691e371449e9caeff738abcecd302a3a7cc9cc1b56b6bfd1bef6e017b5aa8b2de76b232168f1de WHIRLPOOL 78546a6436deb0d0cdf137cee7f0105546fe9507e20cad7cdafdd35b572a940cbcd16a154aeda3d8aa17cdadcb9b5d0a2dc78918ea6bcabebf8bc7344aa23a91
 DIST librsvg-2.36.4.tar.xz 513028 SHA256 1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2 SHA512 447435b2fab0ca7147b68c02a622df8049d56844360e8e361bf5abfbec12c33d46393bad3c099c2819f68d1b7595616d1f35d2cea58ee94d873c1c34e9362d37 WHIRLPOOL 9d8f0f09279be182e061f6b2e0a43d89f62ba5e0aa253373f70266865125b246fd683ed42b134a55e86ebb808bba10207ecc661e1b47e50ce29456d2cdf40a1c
 DIST librsvg-2.39.0.tar.xz 519088 SHA256 aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f SHA512 14e3224c2fad8c92beabce9b486d8cc94e288db5d7d0bda9016fa953ad31456f3934ad847dc7288185fcba840731c25c2eca75288cb2518d2d501abea9ecd98d WHIRLPOOL 3348a50701b3661cb96de039f868c21a319752e2f014329b2ab77bcf6d66ebba1b553f7d10334146a4c3f96d4c0e26defbd02424b8f1deae0483d59e5a3ede50
 EBUILD librsvg-2.36.4-r1.ebuild 2492 SHA256 a050b800f666779ed1a4dd548914c7b0c70907cffd6c75aff551600f444e3587 SHA512 a847084406fb24c12a0a310fa046a91a223fc11b9e1ff4d56cffcdea422259ec9dea91aa8e0fc2799c7acb2065cce95b7575af03ecd358e2505f8b7f2c6e9472 WHIRLPOOL 30a38cb7c6c4e415ec0c6bb6b550f84604543a41b862c883c7646ff6bc0ee5387fc9b9f05ea7d0e0fc4f7fac9310028a84792236c5c915ca7da037ad4478474f
 EBUILD librsvg-2.36.4.ebuild 2303 SHA256 c07919618db34c85547406552ea3083dee4122f6ebcb93df7e09fd10ef1d400b SHA512 e92b3942f8b8cfb3a944edacc0e742c91cc06ae8caebbc98e3d7038f95a8670e1f466dbcdbc100a8893754eefeb0b609283257d5e97d8a4ae852a8889024a340 WHIRLPOOL 2872351cc1b3de3751facc8598a1cefc3adcc0cadf19921878b973747ae0ecd9c846191f24eb7e1103408e8cb78c29665ec6c15a13edf348fa7464caf4e9c899
-EBUILD librsvg-2.39.0.ebuild 2302 SHA256 2e6c7821a64575aefc3f41164a7fc1a0c3a32a0e7c9cf8c747510fcf5c7856cd SHA512 cbeae3ea282238780999fcdcf547f0fcec20d2a83f010b5419bc87389054e8eaa141221435e6e7198e3b11b998d4c9043cff49e2f0e806ed9e7605c413ae1675 WHIRLPOOL c0f45b62ef26c6080dcb0a596fb9a9ceed85bf66de9bc49326c22544320753ee134414472c4375f0cf29467f86ef4f4fd01b9bb71833130bc438f9fc701c8632
-MISC ChangeLog 42137 SHA256 72dbef934e82f440c458adc2cd28845d9ccb70f71191407192d5545ed8415d3e SHA512 20f5d3970a20013e7163fcc6dd7c31a8f301c7390ba2d6ae317f7cf9cc39ea90e4b43b15bff5d83dc8843b0d451feae8741b5fe6c27dfb4cc962a3e9cff311e6 WHIRLPOOL 261039436c44fe2621f80cf8a140253012f9e498d5b4c24b0ca656118d3fa21fc83fa6c6d4026c8711805f4d8a8f9c0c25548ec4d7548d1744d6851dff30fc1d
+EBUILD librsvg-2.39.0.ebuild 2410 SHA256 f8206566cd761ad3c869c7a808b0c8214284a330dbbe12198234db9589620087 SHA512 b83e332302e51b8698dda008dbdf1d542dc34a5e57fce8f10fd915741858cd2863d2d8479e9e14f77650d15990c3eb7202ffa07c5051cd1bdfda45ccd502ae1a WHIRLPOOL 0476bfd7eb0d8bc62155644729c9df290580f085e04190659a42b9d999332d6b5c3f5d4d68e9b8cdf01465cc84c6d65c00331d0b735ddb3261ba56d7eee93f83
+MISC ChangeLog 42335 SHA256 0e4a29d1ee3d351cd844dc01df1d38728744199f7d79c226a8dad7b4e3276df8 SHA512 3ba9d6a272cddb9034ed3b3999b85647e6b71da2e5b6dbd1a106daca7a4e3d3bd375e7009ff15fe1d8f80b6fc6b2d262806c7be19f70af92605f10eda7f8bd7b WHIRLPOOL 181d98022a8a84e89f82a34a29718f9868af3266f4a9380782a49cdf12e96a896245d4367c568d1ce4174036b8303a608e79fc827f5e7fb689e04301b494eaf0
 MISC metadata.xml 395 SHA256 7f63e0973cef8b5da30264661e4bf924bdd228b26d0301760a70474d6a9a6945 SHA512 9dba6907b92f041a26e18cad46d3080120e19231c09eca5f76d80321a59806b049e56b9fce0ea729603d590609aa92b68de98a47937780ef8e67213cf89f119e WHIRLPOOL a735011b1461245244b67939ab7415401847c4d034ac14b2784538e5143eeacd4649f3a735901e7761bd200531ccf87dcf2578a014473ec79c9b1ac258666669
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (Darwin)
 
-iEYEAREIAAYFAlKkvMwACgkQCaWpQKGI+9S/tgCdHn9ne9bf3ShCeUax2ysLoNRe
-0sEAnAogC3pUrzx5qSjnCk6HhZW+WVx7
-=XMIE
+iEYEAREIAAYFAlK1lrAACgkQX3X2B8XHToluMACglZHAqt+N7QPzeZqN5e7Lbkgy
++QgAoJU+TN+XyPfbnVkHRoYz4LKhLyoV
+=hQKX
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/files/librsvg-2.39.0-canonicalize-realpath.patch b/gnome-base/librsvg/files/librsvg-2.39.0-canonicalize-realpath.patch
new file mode 100644
index 000000000000..1fe9714b367a
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.39.0-canonicalize-realpath.patch
@@ -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
+--- a/rsvg-base.c
++++ b/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
diff --git a/gnome-base/librsvg/librsvg-2.39.0.ebuild b/gnome-base/librsvg/librsvg-2.39.0.ebuild
index 4e4a2446e78b..dc1754eecea0 100644
--- a/gnome-base/librsvg/librsvg-2.39.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.39.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.39.0.ebuild,v 1.3 2013/12/08 18:39:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.39.0.ebuild,v 1.4 2013/12/21 13:25:02 grobian Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -46,6 +46,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Make rsvg-view non-automagic, upstream bug #653323
 	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
+	# Fix compilation on non-GNU libcs, from upstream
+	epatch "${FILESDIR}"/${P}-canonicalize-realpath.patch
 
 	use vala && vala_src_prepare