[arch-commits] Commit in gpointing-device-settings/trunk (PKGBUILD fix-build.patch)

[Balló György]

    Date: Tuesday, December 17, 2013 @ 15:10:46
  Author: bgyorgy
Revision: 102692

upgpkg: gpointing-device-settings 1.5.1-5

Fix build, update upstream URL

Added:
  gpointing-device-settings/trunk/fix-build.patch
Modified:
  gpointing-device-settings/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   19 ++++++++++++-------
 fix-build.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-17 13:25:28 UTC (rev 102691)
+++ PKGBUILD	2013-12-17 14:10:46 UTC (rev 102692)
@@ -4,25 +4,30 @@
 
 pkgname=gpointing-device-settings
 pkgver=1.5.1
-pkgrel=4
+pkgrel=5
 pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://live.gnome.org/GPointingDeviceSettings"
+url="https://wiki.gnome.org/Attic/GPointingDeviceSettings"
 depends=('gtk2' 'gconf')
 makedepends=('gnome-settings-daemon' 'intltool')
-source=("http://keihanna.dl.sourceforge.jp/gsynaptics/45812/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1d1491473df8eabca3c15c997a975d7f')
+source=("http://sourceforge.jp/frs/redir.php?m=iij&f=/gsynaptics/45812/$pkgname-$pkgver.tar.gz"
+        "fix-build.patch")
+md5sums=('1d1491473df8eabca3c15c997a975d7f'
+         'cc42b7bcd69fb43ae5bfbe6e1d540713')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Enable deprecations
-  sed -i -e '/DISABLE_DEPRECATED/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+  # Fix build
+  patch -Np1 -i "${srcdir}/fix-build.patch"
 
   # Disable GSD plugin (won't build with GSD 3.8)
   sed -i 's/ gnome-settings-daemon-plugins//' modules/Makefile.am
+}
 
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   autoreconf -fi
   ./configure  --prefix=/usr --sysconfdir=/etc \
                --disable-static --disable-schemas-install \

Added: fix-build.patch
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2013-12-17 14:10:46 UTC (rev 102692)
@@ -0,0 +1,26 @@
+diff -Naur gpointing-device-settings-1.5.1.orig/configure.ac gpointing-device-settings-1.5.1/configure.ac
+--- gpointing-device-settings-1.5.1.orig/configure.ac	2010-02-05 00:38:20.000000000 +0100
++++ gpointing-device-settings-1.5.1/configure.ac	2013-12-17 15:00:08.394574115 +0100
+@@ -3,10 +3,9 @@
+ 
+ AC_INIT(gpointing-device-settings, 1.5.1,
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=GPointingDeviceSettings])
+-AM_INIT_AUTOMAKE([1.9 tar-pax])
+-AM_INIT_AUTOMAKE([foreign])
++AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_PROG_LIBTOOL
+@@ -146,9 +145,6 @@
+ 
+ GPDS_CFLAGS="$XINPUT_CFLAGS $GTK_CFLAGS"
+ GPDS_CFLAGS="$GPDS_CFLAGS $GCONF2_CFLAGS"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED"
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\""