wok-next rev 20751
libgnome: up (2.32.1)
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Jun 01 15:12:30 2018 +0300 (2018-06-01) |
| parents | 5b905cdf92e6 |
| children | 087b00d7ff4b |
| files | libgnome/receipt libgnome/stuff/patches/0001-Don-t-use-G_DISABLE_DEPRECATED.patch libgnome/stuff/patches/05_glib-2.54-ftbfs.patch libgnome/stuff/patches/series |
line diff
1.1 --- a/libgnome/receipt Fri Jun 01 11:43:22 2018 +0300 1.2 +++ b/libgnome/receipt Fri Jun 01 15:12:30 2018 +0300 1.3 @@ -1,23 +1,22 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="libgnome" 1.7 -VERSION="2.30.0" 1.8 +VERSION="2.32.1" 1.9 CATEGORY="x-window" 1.10 SHORT_DESC="GNOME Library" 1.11 MAINTAINER="pankso@slitaz.org" 1.12 LICENSE="GPL2" 1.13 -WEB_SITE="http://www.gnome.org" 1.14 +WEB_SITE="http://www.gnome.org/" 1.15 1.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.17 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 1.18 1.19 -BUILD_DEPENDS="libbonobo-dev gnome-vfs-dev esound-dev audiofile-dev \ 1.20 -GConf-dev popt-dev alsa-lib-dev dbus-glib-dev intltool libffi libxml2-dev \ 1.21 -gnutls-dev libgcrypt-dev" 1.22 +BUILD_DEPENDS="automake libtool gettext GConf-dev intltool gnome-vfs-dev \ 1.23 +libbonobo-dev libcanberra-dev popt-dev libgcrypt-dev" 1.24 SPLIT="libgnome-dev" 1.25 1.26 compile_rules() { 1.27 - sed -i 's/-DG_DISABLE_DEPRECATED//' libgnome/Makefile* 1.28 + autoreconf -fi 1.29 1.30 ./configure \ 1.31 --sysconfdir=/etc/gnome \ 1.32 @@ -36,13 +35,12 @@ 1.33 case $PACKAGE in 1.34 libgnome) 1.35 copy @std 1.36 - DEPENDS="GConf audiofile esound glib gnome-vfs libbonobo orbit2 \ 1.37 - popt" 1.38 + DEPENDS="GConf glib gnome-vfs libbonobo libcanberra orbit2 popt" 1.39 ;; 1.40 *-dev) 1.41 copy @dev 1.42 - DEPENDS="libgnome GConf-dev esound-dev glib-dev gnome-vfs-dev \ 1.43 - libbonobo-dev orbit2-dev popt-dev" 1.44 + DEPENDS="libgnome GConf-dev glib-dev gnome-vfs-dev libbonobo-dev \ 1.45 + libcanberra-dev orbit2-dev popt-dev" 1.46 ;; 1.47 esac 1.48 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/libgnome/stuff/patches/0001-Don-t-use-G_DISABLE_DEPRECATED.patch Fri Jun 01 15:12:30 2018 +0300 2.3 @@ -0,0 +1,26 @@ 2.4 +From 64a0443e26a50745c8fdc02eddf60985a977275f Mon Sep 17 00:00:00 2001 2.5 +From: Colin Walters <walters@verbum.org> 2.6 +Date: Thu, 2 May 2013 17:58:00 -0400 2.7 +Subject: [PATCH] Don't use G_DISABLE_DEPRECATED 2.8 + 2.9 +Because really, no one cares about this code, we're not going to 2.10 +stay on the GLib treadmill. 2.11 +--- 2.12 + libgnome/Makefile.am | 1 - 2.13 + 1 files changed, 0 insertions(+), 1 deletions(-) 2.14 + 2.15 +diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am 2.16 +index 9c8cd3e..aa01f6c 100644 2.17 +--- a/libgnome/Makefile.am 2.18 ++++ b/libgnome/Makefile.am 2.19 +@@ -17,7 +17,6 @@ INCLUDES = \ 2.20 + -I$(srcdir)/.. \ 2.21 + $(WARN_CFLAGS) \ 2.22 + $(LIBGNOME_CFLAGS) \ 2.23 +- -DG_DISABLE_DEPRECATED \ 2.24 + -DLIBGNOME_PREFIX=\""$(prefix)"\" \ 2.25 + -DLIBGNOME_LIBDIR=\""$(libdir)"\" \ 2.26 + -DLIBGNOME_DATADIR=\""$(datadir)"\" \ 2.27 +-- 2.28 +1.7.1 2.29 +
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/libgnome/stuff/patches/05_glib-2.54-ftbfs.patch Fri Jun 01 15:12:30 2018 +0300 3.3 @@ -0,0 +1,16 @@ 3.4 +Description: Fix FTBFS with glib 2.54 3.5 + glib-mkenums now expects input files to be UTF-8, 3.6 + fix the encoding of libgnome/gnome-config.h 3.7 +Author: Adrian Bunk <bunk@debian.org> 3.8 + 3.9 +--- libgnome-2.32.1.orig/libgnome/gnome-config.h 3.10 ++++ libgnome-2.32.1/libgnome/gnome-config.h 3.11 +@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char 3.12 + #define gnome_config_private_clean_key(path) \ 3.13 + (gnome_config_clean_key_((path),TRUE)) 3.14 + 3.15 +-/* returns the true filename of the config file */ 3.16 ++/* returns the true filename of the config file */ 3.17 + #define gnome_config_get_real_path(path) \ 3.18 + (g_build_filename (gnome_user_dir_get(),(path),NULL)) 3.19 + #define gnome_config_private_get_real_path(path) \