main/gnome-vfs: build fix for glib-2.36

2 files changed, 70 insertions, 4 deletions

diff --git a/main/gnome-vfs/APKBUILD b/main/gnome-vfs/APKBUILD
index e83a6b651..70d2e4ca1 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=3
+pkgrel=4
 pkgdesc="GNOME virtual filesystem subsystem"
 url="http://projects.gnome.org/gnome-vfs"
 arch="all"
@@ -12,7 +12,8 @@ depends_dev="gconf-dev libxml2-dev dbus-glib-dev gamin-dev"
 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"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+	disable-deprecated.patch"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
@@ -29,7 +30,7 @@ build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		|| return 1
 	make || return 1
 }
 
@@ -42,4 +43,9 @@ package() {
 		"$pkgdir"/usr/lib/gnome-vfs*/modules/*.la
 }
 
-md5sums="a05fab03eeef10a47dd156b758982f2e  gnome-vfs-2.24.4.tar.bz2"
+md5sums="a05fab03eeef10a47dd156b758982f2e  gnome-vfs-2.24.4.tar.bz2
+d3a82207004680d4543c6136d046f05f  disable-deprecated.patch"
+sha256sums="62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa  gnome-vfs-2.24.4.tar.bz2
+1f4fa69a4f52be71cdbdb7319ec44089d989f5254e4edfff992c30b572d146fb  disable-deprecated.patch"
+sha512sums="db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581  gnome-vfs-2.24.4.tar.bz2
+aeee9b12f4aa2bea3a8cecf3309a5715341dd8632695b74b191a12ea3d1c6841da8c214245018020b356710bed6b628e031aa5a51959fea2c45891f35ef078f3  disable-deprecated.patch"
diff --git a/main/gnome-vfs/disable-deprecated.patch b/main/gnome-vfs/disable-deprecated.patch
new file mode 100644
index 000000000..33b255bd7
--- /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