Date: Monday, April 29, 2013 @ 02:10:17 Author: bgyorgy Revision: 89371
upgpkg: gpointing-device-settings 1.5.1-4 General cleanup, disable GSD plugin (won't build with GSD 3.8) Modified: gpointing-device-settings/trunk/PKGBUILD ----------+ PKGBUILD | 55 ++++++++++++++++--------------------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-28 23:36:03 UTC (rev 89370) +++ PKGBUILD 2013-04-29 00:10:17 UTC (rev 89371) @@ -4,60 +4,37 @@ 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" }