diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 09:53:51 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 09:56:20 +0000 |
commit | e0bcf63051bb3bd1aec6b3a7bd16019e77bfb46d (patch) | |
tree | cf8116653f481c6ab0ed7d06f46fa71c288f6781 /main | |
parent | 69551ca0b3b4d619e8c531ce3140c157c7e4fe1b (diff) | |
download | aports-e0bcf63051bb3bd1aec6b3a7bd16019e77bfb46d.tar.bz2 aports-e0bcf63051bb3bd1aec6b3a7bd16019e77bfb46d.tar.xz |
Revert "main/gnome-vfs: move to community"
We still have things in main that depends on gnome-vfs so we cannot move
it.
This reverts commit 4107dfd63c4af4544bce97991949572437645924.
Diffstat (limited to 'main')
-rw-r--r-- | main/gnome-vfs/APKBUILD | 57 | ||||
-rw-r--r-- | main/gnome-vfs/disable-deprecated.patch | 60 | ||||
-rw-r--r-- | main/gnome-vfs/fix-resolv-no-address.patch | 11 | ||||
-rw-r--r-- | main/gnome-vfs/gnome-vfs.post-install | 10 | ||||
-rw-r--r-- | main/gnome-vfs/gnome-vfs.post-upgrade | 10 | ||||
-rw-r--r-- | main/gnome-vfs/gnome-vfs.pre-deinstall | 10 |
6 files changed, 158 insertions, 0 deletions
diff --git a/main/gnome-vfs/APKBUILD b/main/gnome-vfs/APKBUILD new file mode 100644 index 0000000000..ffd955da80 --- /dev/null +++ b/main/gnome-vfs/APKBUILD @@ -0,0 +1,57 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gnome-vfs +pkgver=2.24.4 +pkgrel=6 +pkgdesc="GNOME virtual filesystem subsystem" +url="http://projects.gnome.org/gnome-vfs" +arch="all" +license="LGPL" +depends="gnome-mime-data" +depends_dev="gconf-dev libxml2-dev dbus-glib-dev gamin-dev" +makedepends="$depends_dev intltool linux-headers" +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 + 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;; + esac + done +} + +build() { + cd "$_builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + + export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="a05fab03eeef10a47dd156b758982f2e gnome-vfs-2.24.4.tar.bz2 +d3a82207004680d4543c6136d046f05f disable-deprecated.patch +d4b382c899793cfab72e8b6745b95cb3 fix-resolv-no-address.patch" +sha256sums="62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa gnome-vfs-2.24.4.tar.bz2 +1f4fa69a4f52be71cdbdb7319ec44089d989f5254e4edfff992c30b572d146fb disable-deprecated.patch +4535a7f3747fa28b184639dc13a712d20db626f60ced097496c808c8d3992919 fix-resolv-no-address.patch" +sha512sums="db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581 gnome-vfs-2.24.4.tar.bz2 +aeee9b12f4aa2bea3a8cecf3309a5715341dd8632695b74b191a12ea3d1c6841da8c214245018020b356710bed6b628e031aa5a51959fea2c45891f35ef078f3 disable-deprecated.patch +2a12fbee53c9b1bb713a868f845dee9591eaf9cfa1fa0ba504966b0cdfaf9d6be7c77936c25d2a698f637fac8fe4a35c34d4350beaed53262ed92b3e85f47613 fix-resolv-no-address.patch" diff --git a/main/gnome-vfs/disable-deprecated.patch b/main/gnome-vfs/disable-deprecated.patch new file mode 100644 index 0000000000..33b255bd78 --- /dev/null +++ b/main/gnome-vfs/disable-deprecated.patch @@ -0,0 +1,60 @@ +diff --git a/daemon/Makefile.in b/daemon/Makefile.in +index ce88e8d..d82b3e7 100644 +--- a/daemon/Makefile.in ++++ b/daemon/Makefile.in +@@ -337,7 +337,6 @@ INCLUDES = \ + -D_LARGEFILE64_SOURCE \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ +diff --git a/libgnomevfs/Makefile.in b/libgnomevfs/Makefile.in +index 5f96b43..0908007 100644 +--- a/libgnomevfs/Makefile.in ++++ b/libgnomevfs/Makefile.in +@@ -430,7 +430,6 @@ INCLUDES = \ + -D_LARGEFILE64_SOURCE \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_BINDIR=\"$(bindir)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ +diff --git a/modules/Makefile.in b/modules/Makefile.in +index 5482f1d..fcf80de 100644 +--- a/modules/Makefile.in ++++ b/modules/Makefile.in +@@ -468,7 +468,6 @@ INCLUDES = \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ + -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ +diff --git a/programs/Makefile.in b/programs/Makefile.in +index a7a84f1..be5f238 100644 +--- a/programs/Makefile.in ++++ b/programs/Makefile.in +@@ -345,7 +345,6 @@ INCLUDES = \ + -I$(top_builddir) \ + $(TEST_CFLAGS) \ + $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED + + libraries = \ + $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ +diff --git a/test/Makefile.in b/test/Makefile.in +index 9a3b4b0..6d8e337 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -471,7 +471,6 @@ INCLUDES = \ + -I$(top_builddir)/libgnomevfs \ + $(TEST_CFLAGS) \ + $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ + -DMODULES_PATH=\"$(libdir)/vfs/modules\" + + @OS_WIN32_FALSE@platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga 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: diff --git a/main/gnome-vfs/gnome-vfs.post-install b/main/gnome-vfs/gnome-vfs.post-install new file mode 100644 index 0000000000..a636ef758f --- /dev/null +++ b/main/gnome-vfs/gnome-vfs.post-install @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in desktop_default_applications.schemas system_http_proxy.schemas desktop_gnome_url_handlers.schemas system_smb.schemas system_dns_sd.schemas; do + SCHEMAS="$SCHEMAS /etc/gconf/schemas/$i" +done + +echo "Installing gnome-vfs GConf2 schemas" + +GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \ + /usr/bin/gconftool-2 --makefile-install-rule $SCHEMAS > /dev/null diff --git a/main/gnome-vfs/gnome-vfs.post-upgrade b/main/gnome-vfs/gnome-vfs.post-upgrade new file mode 100644 index 0000000000..a636ef758f --- /dev/null +++ b/main/gnome-vfs/gnome-vfs.post-upgrade @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in desktop_default_applications.schemas system_http_proxy.schemas desktop_gnome_url_handlers.schemas system_smb.schemas system_dns_sd.schemas; do + SCHEMAS="$SCHEMAS /etc/gconf/schemas/$i" +done + +echo "Installing gnome-vfs GConf2 schemas" + +GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \ + /usr/bin/gconftool-2 --makefile-install-rule $SCHEMAS > /dev/null diff --git a/main/gnome-vfs/gnome-vfs.pre-deinstall b/main/gnome-vfs/gnome-vfs.pre-deinstall new file mode 100644 index 0000000000..0e5f3c7874 --- /dev/null +++ b/main/gnome-vfs/gnome-vfs.pre-deinstall @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in desktop_default_applications.schemas system_http_proxy.schemas desktop_gnome_url_handlers.schemas system_smb.schemas system_dns_sd.schemas; do + SCHEMAS="$SCHEMAS /etc/gconf/schemas/$i" +done + +echo "Uninstalling gnome-vfs GConf2 schemas" + +GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \ + /usr/bin/gconftool-2 --makefile-uninstall-rule $SCHEMAS > /dev/null |