X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=gpointing-device-settings%2FPKGBUILD;h=98a94a02f166d7041b231c186ebb5719a1940a2f;hb=4e8fedba9ce9d6a7d82c18ef158b7c937808ac27;hp=61987e3242f7074734232c74bf58dc5591192787;hpb=209feeb06bdedad25e0193c53b3660c2b641ad50;p=mirrors%2FArchLinux-Packages.git

diff --git a/gpointing-device-settings/PKGBUILD b/gpointing-device-settings/PKGBUILD
index 61987e3..98a94a0 100644
--- a/gpointing-device-settings/PKGBUILD
+++ b/gpointing-device-settings/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=gpointing-device-settings
 pkgver=1.5.1
-pkgrel=2
+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."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/GPointingDeviceSettings"
 depends=(
-	'gtk2' 'gconf' 'gnome-settings-daemon'
+	'gtk2' 'gconf' 'gnome-settings-daemon' 'xorg-xinput'
 )
 makedepends=(
 	'intltool' 'pkgconfig'
@@ -25,6 +25,40 @@ 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'"
+ 
+ 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
+
+#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  || return 1
 	#./configure || return 1
 	make || return 1