Sun Sep 11 23:14:33 UTC 2011

2 files changed, 68 insertions, 5 deletions

diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index 107b62f24..08f0a1dac 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123180 2011-05-09 03:18:04Z eric $
+# $Id: PKGBUILD 137618 2011-09-10 07:13:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libstroke
 pkgver=0.5.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A stroke (mouse gesture) translation library"
 arch=('i686' 'x86_64')
 url="http://etla.net/libstroke/"
@@ -11,18 +11,23 @@ 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)
+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')
+         '96413a77e1d39d1a3223e8eb6be8ef01'
+         '93c47eef46a0cc4011a246485c5a6620')
 sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b'
           'a0c3bd9e894650475ba3049b0ef3d7f9580c203d'
-          'ee5a3635c31dba00b070a942c512cc0d53056188')
+          'ee5a3635c31dba00b070a942c512cc0d53056188'
+          'c9240937776b0572e3927e1c56d78309413c5209')
 
 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
diff --git a/extra/libstroke/libstroke-0.5.1-m4_syntax.patch b/extra/libstroke/libstroke-0.5.1-m4_syntax.patch
new file mode 100644
index 000000000..70bb720ee
--- /dev/null
+++ b/extra/libstroke/libstroke-0.5.1-m4_syntax.patch
@@ -0,0 +1,58 @@
+--- libstroke-0.5.1/libstroke.m4	{cset 02bc4a5e-e9e6-4055-a406-5007a0ac3e55}
++++ libstroke-0.5.1/libstroke.m4	{local clone}
+@@ -26,7 +26,7 @@
+ dnl                     if different from name
+ dnl description         (optional) used to construct help string
+ dnl
+-AC_DEFUN(smr_ARG_WITHLIB, [
++AC_DEFUN([smr_ARG_WITHLIB], [
+ 
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ 
+@@ -74,7 +74,7 @@
+ dnl extra-flags         (optional) flags required when compiling the
+ dnl                     header, typically more includes; for ex. X_CFLAGS
+ dnl
+-AC_DEFUN(smr_ARG_WITHINCLUDES, [
++AC_DEFUN([smr_ARG_WITHINCLUDES], [
+ 
+ AC_ARG_WITH([$1]-includes,
+ [  --with-$1-includes=DIR  set directory for $1 headers],
+@@ -116,7 +116,7 @@
+ dnl x-libs      (optional) extra libraries, if needed to link with lib
+ dnl x-flags     (optional) extra flags, if needed to include header files
+ dnl
+-AC_DEFUN(smr_CHECK_LIB,
++AC_DEFUN([smr_CHECK_LIB],
+ [
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ ifelse($5, , , smr_header=[$5])
+--- libstroke-0.5.1/libgstroke.m4	2011-09-10 02:59:55.000000000 -0400
++++ libstroke-0.5.1/libgstroke.m4	2011-09-10 03:01:14.000000000 -0400
+@@ -26,7 +26,7 @@
+ dnl                     if different from name
+ dnl description         (optional) used to construct help string
+ dnl
+-AC_DEFUN(smr_ARG_WITHLIB, [
++AC_DEFUN([smr_ARG_WITHLIB], [
+ 
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ 
+@@ -74,7 +74,7 @@
+ dnl extra-flags         (optional) flags required when compiling the
+ dnl                     header, typically more includes; for ex. X_CFLAGS
+ dnl
+-AC_DEFUN(smr_ARG_WITHINCLUDES, [
++AC_DEFUN([smr_ARG_WITHINCLUDES], [
+ 
+ AC_ARG_WITH([$1]-includes,
+ [  --with-$1-includes=DIR  set directory for $1 headers],
+@@ -116,7 +116,7 @@
+ dnl x-libs      (optional) extra libraries, if needed to link with lib
+ dnl x-flags     (optional) extra flags, if needed to include header files
+ dnl
+-AC_DEFUN(smr_CHECK_LIB,
++AC_DEFUN([smr_CHECK_LIB],
+ [
+ ifelse($2, , smr_lib=[$1], smr_lib=[$2])
+ ifelse($5, , , smr_header=[$5])