[arch-commits] Commit in gnome-vfs/trunk (PKGBUILD enable-deprecated.patch)
Jan de Groot
jgc at nymeria.archlinux.org
Tue Jul 23 15:14:48 UTC 2013
Date: Tuesday, July 23, 2013 @ 17:14:48
Author: jgc
Revision: 191320
upgpkg: gnome-vfs 2.24.4-7
Make it compile again
Added:
gnome-vfs/trunk/enable-deprecated.patch
Modified:
gnome-vfs/trunk/PKGBUILD
-------------------------+
PKGBUILD | 34 +++++++++++++++++----------
enable-deprecated.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-23 15:07:42 UTC (rev 191319)
+++ PKGBUILD 2013-07-23 15:14:48 UTC (rev 191320)
@@ -3,7 +3,7 @@
pkgname=gnome-vfs
pkgver=2.24.4
-pkgrel=6
+pkgrel=7
pkgdesc="The GNOME Virtual File System"
arch=(i686 x86_64)
license=('LGPL')
@@ -14,33 +14,43 @@
install=gnome-vfs.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
gnutls-config.patch
- gcrypt-config.patch)
+ gcrypt-config.patch
+ enable-deprecated.patch)
sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
'66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d'
- 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114')
+ 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114'
+ 'ca2b9dffb1fa202c0d1f0d3648ef37cd8e84657a22d4c6746bb46e9a6cf1ee47')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+ cd ${pkgname}-${pkgver}
#Fix build with new gnutls
- patch -Np1 -i "${srcdir}/gnutls-config.patch"
+ patch -Np1 -i ../gnutls-config.patch
#fix build with new libgcrypt >= 1.5.0
- patch -Np1 -i "${srcdir}/gcrypt-config.patch"
+ patch -Np1 -i ../gcrypt-config.patch
+ # remove -DG_DISABLE_DEPRECATED
+ patch -Np1 -i ../enable-deprecated.patch
+
+ sed -i -s 's|$(srcdir)/auto-test|auto-test|' test/Makefile.am
+}
+build() {
+ cd ${pkgname}-${pkgver}
libtoolize --force
gtkdocize
aclocal
autoconf
- automake
- ./configure --prefix=/usr --sysconfdir=/etc \
+ automake --add-missing
+ CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure \
+ --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/gnome-vfs-2.0 \
- --enable-samba --disable-hal \
- --enable-avahi --disable-howl \
+ --enable-samba --with-samba-includes=/usr/include/samba-4.0 \
+ --disable-hal --enable-avahi --disable-howl \
--disable-openssl --enable-gnutls
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
Added: enable-deprecated.patch
===================================================================
--- enable-deprecated.patch (rev 0)
+++ enable-deprecated.patch 2013-07-23 15:14:48 UTC (rev 191320)
@@ -0,0 +1,57 @@
+diff -up gnome-vfs-2.24.4/daemon/Makefile.am.bak gnome-vfs-2.24.4/daemon/Makefile.am
+--- gnome-vfs-2.24.4/daemon/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-03-27 17:01:25.000000000 +0100
+@@ -8,7 +8,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 -up gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak gnome-vfs-2.24.4/libgnomevfs/Makefile.am
+--- gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-03-27 17:01:37.000000000 +0100
+@@ -19,7 +19,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 -up gnome-vfs-2.24.4/modules/Makefile.am.bak gnome-vfs-2.24.4/modules/Makefile.am
+--- gnome-vfs-2.24.4/modules/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/modules/Makefile.am 2013-03-27 17:01:45.000000000 +0100
+@@ -18,7 +18,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 -up gnome-vfs-2.24.4/programs/Makefile.am.bak gnome-vfs-2.24.4/programs/Makefile.am
+--- gnome-vfs-2.24.4/programs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100
++++ gnome-vfs-2.24.4/programs/Makefile.am 2013-03-27 17:01:56.000000000 +0100
+@@ -4,8 +4,7 @@ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(TEST_CFLAGS) \
+- $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED
++ $(VFS_CFLAGS)
+
+ libraries = \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
+diff -up gnome-vfs-2.24.4/test/Makefile.am.bak gnome-vfs-2.24.4/test/Makefile.am
+--- gnome-vfs-2.24.4/test/Makefile.am.bak 2013-03-27 17:01:11.000000000 +0100
++++ gnome-vfs-2.24.4/test/Makefile.am 2013-03-27 17:02:08.000000000 +0100
+@@ -6,7 +6,6 @@ INCLUDES = \
+ -I$(top_builddir)/libgnomevfs \
+ $(TEST_CFLAGS) \
+ $(VFS_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+ -DMODULES_PATH=\"$(libdir)/vfs/modules\"
+
+ if OS_WIN32
More information about the arch-commits
mailing list