[arch-commits] Commit in scim/trunk (2 files)

[Gaetan Bisson]

    Date: Friday, December 11, 2015 @ 04:53:40
  Author: bisson
Revision: 255780

fix FS#47313

Added:
  scim/trunk/undefined-gdk_x11_drawable_get_xdisplay.patch
Modified:
  scim/trunk/PKGBUILD

-----------------------------------------------+
 PKGBUILD                                      |   15 +++++++++++----
 undefined-gdk_x11_drawable_get_xdisplay.patch |   19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-11 03:43:18 UTC (rev 255779)
+++ PKGBUILD	2015-12-11 03:53:40 UTC (rev 255780)
@@ -5,7 +5,7 @@
 
 pkgname=scim
 pkgver=1.4.15
-pkgrel=2
+pkgrel=3
 pkgdesc='Input method user interface and development platform'
 url='http://sourceforge.net/projects/scim/'
 license=('LGPL')
@@ -14,16 +14,23 @@
 optdepends=('qt4: qt4 immodule'
             'gtk3: gtk3 immodule')
 makedepends=('intltool' 'qt4' 'gtk3' 'optipng')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('771d81b5c81164840f7d45c39165c2990cc809bd')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'undefined-gdk_x11_drawable_get_xdisplay.patch')
+sha1sums=('771d81b5c81164840f7d45c39165c2990cc809bd'
+          'd6f9b832533eff199ee5cb5ae8f94f57f7677aac')
 
 backup=('etc/scim/config' 'etc/scim/global')
 install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../undefined-gdk_x11_drawable_get_xdisplay.patch
 	find -name '*.png' -exec optipng -quiet -force -fix {} +
 	./bootstrap
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \

Added: undefined-gdk_x11_drawable_get_xdisplay.patch
===================================================================
--- undefined-gdk_x11_drawable_get_xdisplay.patch	                        (rev 0)
+++ undefined-gdk_x11_drawable_get_xdisplay.patch	2015-12-11 03:53:40 UTC (rev 255780)
@@ -0,0 +1,19 @@
+commit 88fbabed7dc236642021f8263f1b25bf67c6806e
+Author: Tz-Huan Huang <tzhuan at gmail.com>
+Date:   Fri Oct 24 13:12:32 2014 +0800
+
+    Disable subdir-objects
+
+diff --git a/configure.ac b/configure.ac
+index 3d89eb1..f3901ba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain])
+ ###########################################################
+ 
+ # Init automake stuff
+-AM_INIT_AUTOMAKE([subdir-objects])
++AM_INIT_AUTOMAKE([])
+ AM_CONFIG_HEADER([config.h])
+ 
+ # Init libtool