diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 05_glib-2.54-ftbfs.patch | 16 | ||||
-rw-r--r-- | PKGBUILD | 10 |
3 files changed, 26 insertions, 4 deletions
@@ -1,6 +1,6 @@ pkgbase = libgnome pkgver = 2.32.1 - pkgrel = 6 + pkgrel = 7 url = http://www.gnome.org arch = i686 arch = x86_64 @@ -14,8 +14,10 @@ pkgbase = libgnome options = !emptydirs source = https://download.gnome.org/sources/libgnome/2.32/libgnome-2.32.1.tar.bz2 source = 0001-Don-t-use-G_DISABLE_DEPRECATED.patch + source = 05_glib-2.54-ftbfs.patch sha256sums = b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4 sha256sums = c2521ed5985159b33a0a5bf53b89012abd9521391fc8ce4c9c73289ca18eb147 + sha256sums = b86a3a1ef9df2314029a418ea26cadeadb1cf2da30536b850f7c98a6d8ce2220 pkgname = libgnome pkgdesc = Common libraries for GNOME diff --git a/05_glib-2.54-ftbfs.patch b/05_glib-2.54-ftbfs.patch new file mode 100644 index 000000000000..68301f145ac4 --- /dev/null +++ b/05_glib-2.54-ftbfs.patch @@ -0,0 +1,16 @@ +Description: Fix FTBFS with glib 2.54 + glib-mkenums now expects input files to be UTF-8, + fix the encoding of libgnome/gnome-config.h +Author: Adrian Bunk <bunk@debian.org> + +--- libgnome-2.32.1.orig/libgnome/gnome-config.h ++++ libgnome-2.32.1/libgnome/gnome-config.h +@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char + #define gnome_config_private_clean_key(path) \ + (gnome_config_clean_key_((path),TRUE)) + +-/* returns the true filename of the config file */ ++/* returns the true filename of the config file */ + #define gnome_config_get_real_path(path) \ + (g_build_filename (gnome_user_dir_get(),(path),NULL)) + #define gnome_config_private_get_real_path(path) \ @@ -5,19 +5,23 @@ pkgbase=libgnome pkgname=('libgnome' 'libgnome-data') pkgver=2.32.1 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') license=('LGPL') makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra') options=('!emptydirs') url="http://www.gnome.org" source=(https://download.gnome.org/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2 - 0001-Don-t-use-G_DISABLE_DEPRECATED.patch) + 0001-Don-t-use-G_DISABLE_DEPRECATED.patch + 05_glib-2.54-ftbfs.patch) sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4' - 'c2521ed5985159b33a0a5bf53b89012abd9521391fc8ce4c9c73289ca18eb147') + 'c2521ed5985159b33a0a5bf53b89012abd9521391fc8ce4c9c73289ca18eb147' + 'b86a3a1ef9df2314029a418ea26cadeadb1cf2da30536b850f7c98a6d8ce2220') prepare() { cd $pkgbase-$pkgver + #patch "$pkgbase/gnome-config.h" < "$srcdir/05_glib-2.54-ftbfs.patch" + patch -Np1 -i ../05_glib-2.54-ftbfs.patch patch -Np1 -i ../0001-Don-t-use-G_DISABLE_DEPRECATED.patch } |