summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhoton892017-10-07 07:35:05 +0200
committerPhoton892017-10-07 07:35:05 +0200
commitae8d8ceb6e085e7fe45ee6016839a67e5ecfa262 (patch)
tree533a97d2c0487298b8f1e0fdd4e5e4ab1ef192c0
parent9bf71cda895719088a5e0e058aa1bf61e18dd82b (diff)
downloadaur-ae8d8ceb6e085e7fe45ee6016839a67e5ecfa262.tar.gz
Added patch from Debian people fixing UTF8 issue leading to compilation error
-rw-r--r--.SRCINFO4
-rw-r--r--03_glib-2.54-ftbfs.patch16
-rw-r--r--PKGBUILD7
3 files changed, 23 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6311f0aa9d0d..4599acb53f04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libgnomeui
pkgdesc = User Interface library for GNOME
pkgver = 2.24.5
- pkgrel = 2
+ pkgrel = 3
url = http://www.gnome.org
arch = i686
arch = x86_64
@@ -12,7 +12,9 @@ pkgbase = libgnomeui
depends = libgnome-keyring
depends = libsm
source = https://download.gnome.org/sources/libgnomeui/2.24/libgnomeui-2.24.5.tar.bz2
+ source = 03_glib-2.54-ftbfs.patch
sha256sums = ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f
+ sha256sums = a298358c38db97c569efedd7b446fdaaffa3f087cd1a049087043eeca53c7391
pkgname = libgnomeui
diff --git a/03_glib-2.54-ftbfs.patch b/03_glib-2.54-ftbfs.patch
new file mode 100644
index 000000000000..ba5595f46e7f
--- /dev/null
+++ b/03_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 libgnomeui/gnome-scores.h
+Author: Adrian Bunk <bunk@debian.org>
+
+--- libgnomeui-2.24.5.orig/libgnomeui/gnome-scores.h
++++ libgnomeui-2.24.5/libgnomeui/gnome-scores.h
+@@ -27,7 +27,7 @@
+ * "High Scores" Widget
+ *
+ * AUTHOR:
+- * Horacio J. Peña <horape@compendium.com.ar>
++ * Horacio J. Peña <horape@compendium.com.ar>
+ *
+ * This is free software (under the terms of the GNU LGPL)
+ *
diff --git a/PKGBUILD b/PKGBUILD
index 54a58a98f89d..470744af2883 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,19 @@
pkgname=libgnomeui
pkgver=2.24.5
-pkgrel=2
+pkgrel=3
pkgdesc="User Interface library for GNOME"
arch=('i686' 'x86_64')
license=('LGPL')
depends=('libbonoboui' 'libgnome-keyring' 'libsm')
makedepends=('intltool' 'pkg-config')
url="http://www.gnome.org"
-source=(https://download.gnome.org/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2)
-sha256sums=('ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f')
+source=(https://download.gnome.org/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2 03_glib-2.54-ftbfs.patch)
+sha256sums=('ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f' 'a298358c38db97c569efedd7b446fdaaffa3f087cd1a049087043eeca53c7391')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch "libgnomeui/gnome-scores.h" < "$srcdir/03_glib-2.54-ftbfs.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/libgnomeui