Fri Oct 25 02:07:10 PDT 2013

2 files changed, 52 insertions, 23 deletions

diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index 08f0a1dac..8f2697ba2 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -1,44 +1,40 @@
-# $Id: PKGBUILD 137618 2011-09-10 07:13:27Z eric $
+# $Id: PKGBUILD 197273 2013-10-24 21:52:00Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libstroke
 pkgver=0.5.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A stroke (mouse gesture) translation library"
 arch=('i686' 'x86_64')
 url="http://etla.net/libstroke/"
 license=('GPL2')
 depends=('glibc')
-makedepends=('libx11' 'gtk')
-options=('!libtool')
-source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz \
-        libgstroke-Makefile.am.patch libstroke-Makefile.am.patch \
-        libstroke-0.5.1-m4_syntax.patch)
-md5sums=('51b9a4e309ac15cfcab96191eed03cb2'
-         '60bbaf355355c3c66c8015b0f7feca85'
-         '96413a77e1d39d1a3223e8eb6be8ef01'
-         '93c47eef46a0cc4011a246485c5a6620')
+makedepends=('libx11')
+source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz
+        libgstroke-Makefile.am.patch libstroke-Makefile.am.patch
+        libstroke-0.5.1-m4_syntax.patch libstroke-0.5.1-no_gtk1.patch)
 sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b'
           'a0c3bd9e894650475ba3049b0ef3d7f9580c203d'
           'ee5a3635c31dba00b070a942c512cc0d53056188'
-          'c9240937776b0572e3927e1c56d78309413c5209')
+          'c9240937776b0572e3927e1c56d78309413c5209'
+          'c79acd9712fa5c6b9a9ac21621c6858ec10d84dd')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../libgstroke-Makefile.am.patch
-  patch -p1 < ../libstroke-Makefile.am.patch
-  patch -p1 < ../libstroke-0.5.1-m4_syntax.patch
-
-  libtoolize --force --copy
-  aclocal
-  autoconf
-  automake --add-missing --force --copy
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/libgstroke-Makefile.am.patch"
+  patch -p1 -i "${srcdir}/libstroke-Makefile.am.patch"
+  patch -p1 -i "${srcdir}/libstroke-0.5.1-m4_syntax.patch"
+  patch -p1 -i "${srcdir}/libstroke-0.5.1-no_gtk1.patch"
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
+  autoreconf --force --install
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libstroke/libstroke-0.5.1-no_gtk1.patch b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch
new file mode 100644
index 000000000..a099fb991
--- /dev/null
+++ b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch
@@ -0,0 +1,33 @@
+--- libstroke-0.5.1/configure.in	2001-08-07 07:08:05.000000000 +0100
++++ libstroke-0.5.1b/configure.in	2006-11-28 01:49:26.000000000 +0000
+@@ -81,16 +81,9 @@
+ [  --with-mouse-footprints  Draw mouse footprints in X],
+ [AC_DEFINE(STROKE_MOUSE_FOOTPRINTS)])
+ 
+-dnl check for GTK
+-dnl we won't build libgstroke if it's not found
+-AC_MSG_CHECKING(gtk+ library)
+-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
+-  AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
+-  AC_MSG_WARN(
+-***** NOTE: The GNOME stroke support won't be built
+-)
+-  HAVE_LIBGTK=no,
+-)
++GTK_CFLAGS=""
++AC_SUBST(GTK_CFLAGS)
++HAVE_LIBGTK=no
+ AM_CONDITIONAL(HAVE_LIBGTK,        test "x$HAVE_LIBGTK" = "xyes")
+ 
+ 
+--- libstroke-0.5.1/Makefile.am	2001-08-07 07:03:12.000000000 +0100
++++ libstroke-0.5.1b/Makefile.am	2006-11-28 02:00:55.000000000 +0000
+@@ -10,7 +10,7 @@
+ EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke
+ 
+ m4datadir=$(datadir)/aclocal
+-m4data_DATA=libstroke.m4 libgstroke.m4
++m4data_DATA=libstroke.m4
+ 
+ MOSTLYCLEANFILES = core *~
+ CLEANFILES = core *~