Tue Apr 30 00:36:52 PDT 2013

1 files changed, 17 insertions, 40 deletions

diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD
index e901f65b6..65ef2fe48 100644
--- a/community/gpointing-device-settings/PKGBUILD
+++ b/community/gpointing-device-settings/PKGBUILD
@@ -1,63 +1,40 @@
-# $Id: PKGBUILD 88555 2013-04-19 17:24:27Z spupykin $
+# $Id: PKGBUILD 89372 2013-04-29 00:10:30Z bgyorgy $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=gpointing-device-settings
 pkgver=1.5.1
-pkgrel=3
-pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad.
-Each UI can be written as dynamic loadable module, so a third party can add its own UI. This
-will replace GSynaptics."
+pkgrel=4
+pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/GPointingDeviceSettings"
-depends=('gtk2' 'gconf' 'gnome-settings-daemon' 'xorg-xinput')
-makedepends=('intltool' 'pkgconfig')
-optdepends=('xf86-input-synaptics: Synaptics touchpads'
-	    'libsynaptics: Synaptics touchpads')
+depends=('gtk2' 'gconf')
+makedepends=('gnome-settings-daemon' 'intltool')
+options=('!libtool')
 source=("http://keihanna.dl.sourceforge.jp/gsynaptics/45812/${pkgname}-${pkgver}.tar.gz")
 md5sums=('1d1491473df8eabca3c15c997a975d7f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  #WORKAROUND!!! WE SHOULD GET RID OF THIS:###########
-  echo 'diff --git a/configure.ac b/configure.ac
-index 29215e8..728d4c0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,9 +146,9 @@ GENHTML_OPTIONS="--title 'GPointingDeviceSettings Code Coverage'"
+  # Enable deprecations
+  sed -i -e '/DISABLE_DEPRECATED/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 
- 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 -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)\"\\\""
-' | patch -p1
+  # Disable GSD plugin (won't build with GSD 3.8)
+  sed -i 's/ gnome-settings-daemon-plugins//' modules/Makefile.am
 
-  #Magic patch contributed by mattis:
-  echo '--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-@@ -158,6 +158,9 @@
-     plugin_class->activate = activate;
-     plugin_class->deactivate = deactivate;
- }
-+
-+static void
-+gsd_mouse_extension_plugin_class_finalize(GsdMouseExtensionPluginClass *klass);
-' | patch -p1
-
-  ./configure  --prefix=/usr --sysconfdir=/etc
+  autoreconf -fi
+  ./configure  --prefix=/usr --sysconfdir=/etc \
+               --disable-static --disable-schemas-install \
+               --with-gconf-schema-file-dir=/usr/share/gconf/schemas
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
+
+  # Remove GConf schema (used by GSD plugin)
+  rm -r "${pkgdir}/usr/share/gconf"
 }