Date: Monday, April 28, 2014 @ 10:25:48 Author: jgc Revision: 211848 upgpkg: libgnome 2.32.1-5
Fix build (FS#40042) Added: libgnome/trunk/0001-Don-t-use-G_DISABLE_DEPRECATED.patch Modified: libgnome/trunk/PKGBUILD -------------------------------------------+ 0001-Don-t-use-G_DISABLE_DEPRECATED.patch | 26 ++++++++++++++++++++++++++ PKGBUILD | 23 +++++++++++++++-------- 2 files changed, 41 insertions(+), 8 deletions(-) Added: 0001-Don-t-use-G_DISABLE_DEPRECATED.patch =================================================================== --- 0001-Don-t-use-G_DISABLE_DEPRECATED.patch (rev 0) +++ 0001-Don-t-use-G_DISABLE_DEPRECATED.patch 2014-04-28 08:25:48 UTC (rev 211848) @@ -0,0 +1,26 @@ +From 64a0443e26a50745c8fdc02eddf60985a977275f Mon Sep 17 00:00:00 2001 +From: Colin Walters <[email protected]> +Date: Thu, 2 May 2013 17:58:00 -0400 +Subject: [PATCH] Don't use G_DISABLE_DEPRECATED + +Because really, no one cares about this code, we're not going to +stay on the GLib treadmill. +--- + libgnome/Makefile.am | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am +index 9c8cd3e..aa01f6c 100644 +--- a/libgnome/Makefile.am ++++ b/libgnome/Makefile.am +@@ -17,7 +17,6 @@ INCLUDES = \ + -I$(srcdir)/.. \ + $(WARN_CFLAGS) \ + $(LIBGNOME_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ + -DLIBGNOME_PREFIX=\""$(prefix)"\" \ + -DLIBGNOME_LIBDIR=\""$(libdir)"\" \ + -DLIBGNOME_DATADIR=\""$(datadir)"\" \ +-- +1.7.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-28 08:17:57 UTC (rev 211847) +++ PKGBUILD 2014-04-28 08:25:48 UTC (rev 211848) @@ -4,18 +4,25 @@ pkgbase=libgnome pkgname=('libgnome' 'libgnome-data') pkgver=2.32.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('LGPL') makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra') options=('!emptydirs') url="http://www.gnome.org"; -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2 + 0001-Don-t-use-G_DISABLE_DEPRECATED.patch) +sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4' + 'c2521ed5985159b33a0a5bf53b89012abd9521391fc8ce4c9c73289ca18eb147') +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../0001-Don-t-use-G_DISABLE_DEPRECATED.patch +} + build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - + cd $pkgbase-$pkgver + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static --disable-esd make @@ -25,7 +32,7 @@ pkgdesc="Common libraries for GNOME" depends=("libgnome-data=${pkgver}" 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver make -C libgnome DESTDIR="${pkgdir}" install make -C monikers DESTDIR="${pkgdir}" install @@ -36,7 +43,7 @@ depends=('gconf') install=libgnome.install - cd "${srcdir}/${pkgbase}-${pkgver}" + cd $pkgbase-$pkgver for dir in doc gnome-data po schemas do @@ -45,5 +52,5 @@ install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas }
