aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-09-27 14:09:16 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-09-27 14:22:24 +0000
commit672b5f205c4118b1e0b68bc6e90e7b1cb84157b7 (patch)
tree9285bd883cba4db4f2a7c824f1b78200a2c57862
parenta1a836b089573752c1b0da7d144c0948b04e8ea8 (diff)
downloadaports-672b5f205c4118b1e0b68bc6e90e7b1cb84157b7.tar.bz2
aports-672b5f205c4118b1e0b68bc6e90e7b1cb84157b7.tar.xz
main/gnome-vfs: fix musl build (use NO_DATA, not NO_ADDRESS)
-rw-r--r--main/gnome-vfs/APKBUILD15
-rw-r--r--main/gnome-vfs/fix-resolv-no-address.patch11
2 files changed, 21 insertions, 5 deletions
diff --git a/main/gnome-vfs/APKBUILD b/main/gnome-vfs/APKBUILD
index 0854692d1a..20aec0d0c7 100644
--- a/main/gnome-vfs/APKBUILD
+++ b/main/gnome-vfs/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnome-vfs
pkgver=2.24.4
-pkgrel=4
+pkgrel=5
pkgdesc="GNOME virtual filesystem subsystem"
url="http://projects.gnome.org/gnome-vfs"
arch="all"
@@ -13,12 +13,14 @@ makedepends="$depends_dev intltool"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
- disable-deprecated.patch"
+ disable-deprecated.patch
+ fix-resolv-no-address.patch"
_builddir="${srcdir}/${pkgname}-${pkgver}"
prepare() {
local i
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;;
@@ -47,8 +49,11 @@ package() {
}
md5sums="a05fab03eeef10a47dd156b758982f2e gnome-vfs-2.24.4.tar.bz2
-d3a82207004680d4543c6136d046f05f disable-deprecated.patch"
+d3a82207004680d4543c6136d046f05f disable-deprecated.patch
+d4b382c899793cfab72e8b6745b95cb3 fix-resolv-no-address.patch"
sha256sums="62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa gnome-vfs-2.24.4.tar.bz2
-1f4fa69a4f52be71cdbdb7319ec44089d989f5254e4edfff992c30b572d146fb disable-deprecated.patch"
+1f4fa69a4f52be71cdbdb7319ec44089d989f5254e4edfff992c30b572d146fb disable-deprecated.patch
+4535a7f3747fa28b184639dc13a712d20db626f60ced097496c808c8d3992919 fix-resolv-no-address.patch"
sha512sums="db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581 gnome-vfs-2.24.4.tar.bz2
-aeee9b12f4aa2bea3a8cecf3309a5715341dd8632695b74b191a12ea3d1c6841da8c214245018020b356710bed6b628e031aa5a51959fea2c45891f35ef078f3 disable-deprecated.patch"
+aeee9b12f4aa2bea3a8cecf3309a5715341dd8632695b74b191a12ea3d1c6841da8c214245018020b356710bed6b628e031aa5a51959fea2c45891f35ef078f3 disable-deprecated.patch
+2a12fbee53c9b1bb713a868f845dee9591eaf9cfa1fa0ba504966b0cdfaf9d6be7c77936c25d2a698f637fac8fe4a35c34d4350beaed53262ed92b3e85f47613 fix-resolv-no-address.patch"
diff --git a/main/gnome-vfs/fix-resolv-no-address.patch b/main/gnome-vfs/fix-resolv-no-address.patch
new file mode 100644
index 0000000000..17fec7e32e
--- /dev/null
+++ b/main/gnome-vfs/fix-resolv-no-address.patch
@@ -0,0 +1,11 @@
+--- gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-result.c.orig
++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-result.c
+@@ -199,7 +199,7 @@
+ {
+ switch (h_errno_code) {
+ case HOST_NOT_FOUND: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
+- case NO_ADDRESS: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
++ case NO_DATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
+ case TRY_AGAIN: return GNOME_VFS_ERROR_NAMESERVER;
+ case NO_RECOVERY: return GNOME_VFS_ERROR_NAMESERVER;
+ default: