diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-30 13:31:07 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-30 13:31:07 +0000 |
| commit | 17bfcb62747dbbf095f1e5818b6b5139b004da40 (patch) | |
| tree | 7fb2a6d96be95722bef7d225fde913e8a6712b1d | |
| parent | da3a4f66a44394505fd93565d1c9d8392157105a (diff) | |
| download | aports-17bfcb62747dbbf095f1e5818b6b5139b004da40.tar.bz2 aports-17bfcb62747dbbf095f1e5818b6b5139b004da40.tar.xz | |
main/librsvg: fix musl build
| -rw-r--r-- | main/librsvg/APKBUILD | 20 | ||||
| -rw-r--r-- | main/librsvg/use-realpath.patch | 22 |
2 files changed, 37 insertions, 5 deletions
diff --git a/main/librsvg/APKBUILD b/main/librsvg/APKBUILD index 76f74ec2db..f6a5fa995d 100644 --- a/main/librsvg/APKBUILD +++ b/main/librsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=librsvg pkgver=2.39.0 -pkgrel=0 +pkgrel=1 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="http://librsvg.sourceforge.net/" arch="all" @@ -11,7 +11,9 @@ depends= makedepends="gtk+-dev libcroco-dev libgsf-dev bzip2-dev gobject-introspection-dev" install= -source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" +source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + use-realpath.patch + " depends_dev="glib-dev gtk+-dev cairo-dev libcroco-dev libgsf-dev" @@ -20,6 +22,11 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" update_config_sub || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -44,6 +51,9 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="c64de5ecaa40a6ae37656eebbe6c9e08 librsvg-2.39.0.tar.xz" -sha256sums="aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f librsvg-2.39.0.tar.xz" -sha512sums="14e3224c2fad8c92beabce9b486d8cc94e288db5d7d0bda9016fa953ad31456f3934ad847dc7288185fcba840731c25c2eca75288cb2518d2d501abea9ecd98d librsvg-2.39.0.tar.xz" +md5sums="c64de5ecaa40a6ae37656eebbe6c9e08 librsvg-2.39.0.tar.xz +2f27fcd4f65e3008fe768d7e804302e6 use-realpath.patch" +sha256sums="aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f librsvg-2.39.0.tar.xz +aea02613f4d24e580535314a5df01d08a178d6083b38217ec7bcac3613a1ea34 use-realpath.patch" +sha512sums="14e3224c2fad8c92beabce9b486d8cc94e288db5d7d0bda9016fa953ad31456f3934ad847dc7288185fcba840731c25c2eca75288cb2518d2d501abea9ecd98d librsvg-2.39.0.tar.xz +478179932e8b71b1495530b1cb9a89ff1f1fbb1c3109440021667ee101e7059cf60cd84328aa4bcc826938ecbbae79585e42feea646103c8ff9bd951b0d9bb89 use-realpath.patch" diff --git a/main/librsvg/use-realpath.patch b/main/librsvg/use-realpath.patch new file mode 100644 index 0000000000..5e2588a9e2 --- /dev/null +++ b/main/librsvg/use-realpath.patch @@ -0,0 +1,22 @@ +--- librsvg-2.39.0.orig/rsvg-base.c ++++ librsvg-2.39.0/rsvg-base.c +@@ -2190,8 +2190,7 @@ + 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 +2199,7 @@ + if (path == NULL) + goto deny; + +- /* FIXME portability */ +- cpath = canonicalize_file_name (path); ++ cpath = realpath (path, NULL); + g_free (path); + + if (cpath == NULL) |