[arch-commits] CVS update of extra/gnome/gok (3 files)

Jan de Groot jgc at archlinux.org
Sun Apr 22 12:12:12 EDT 2007


    Date: Sunday, April 22, 2007 @ 12:12:12
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gok

Modified: PKGBUILD (1.23 -> 1.24) gok.install (1.5 -> 1.6)
 Removed: gok_spy_accessible_is_not_okay.patch (1.1)

upgpkg: gok 1.2.3-2
Move to /usr, kill dead patch


--------------------------------------+
 PKGBUILD                             |   26 +++++++++---------
 gok.install                          |   14 ++++-----
 gok_spy_accessible_is_not_okay.patch |   47 ---------------------------------
 3 files changed, 20 insertions(+), 67 deletions(-)


Index: extra/gnome/gok/PKGBUILD
diff -u extra/gnome/gok/PKGBUILD:1.23 extra/gnome/gok/PKGBUILD:1.24
--- extra/gnome/gok/PKGBUILD:1.23	Sat Mar  3 08:01:17 2007
+++ extra/gnome/gok/PKGBUILD	Sun Apr 22 12:12:12 2007
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD,v 1.23 2007/03/03 13:01:17 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.24 2007/04/22 16:12:12 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gok
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Onscreen Keyboard"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.gnome.org"
-depends=('gnome-speech>=0.4.8' 'libgnomeui>=2.16.0' 'at-spi>=1.7.16' 'libwnck>=2.16.3' 'gail>=1.10')
+depends=('gnome-speech>=0.4.11-2' 'libgnomeui>=2.18.1-2' 'at-spi>=1.18.1-2' 'libwnck>=2.18.0-2' 'gail>=1.18.0-2' 'scrollkeeper')
 makedepends=('perlxml' 'pkgconfig')
-groups=(gnome-extra)
+groups=('gnome-extra')
 install=gok.install
-license=(GPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('1ef0a71467936c5a2e08963b51a4e75c')
 
 build() {
-  export MAKEFLAGS="-j1"
   cd ${startdir}/src/${pkgname}-${pkgver}
-  find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   if [ -f omf.make ]; then
+    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$startdir/pkg install
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-}
 
+  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+}
Index: extra/gnome/gok/gok.install
diff -u extra/gnome/gok/gok.install:1.5 extra/gnome/gok/gok.install:1.6
--- extra/gnome/gok/gok.install:1.5	Sun Mar 19 07:30:19 2006
+++ extra/gnome/gok/gok.install	Sun Apr 22 12:12:12 2007
@@ -1,10 +1,9 @@
 pkgname=gok
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
   scrollkeeper-update -q -p var/lib/scrollkeeper
-  update-desktop-database -q
 }
 
 pre_upgrade() {
@@ -16,18 +15,19 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
     schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
   else
     schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
   fi
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {
-  update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
 }
 
Index: extra/gnome/gok/gok_spy_accessible_is_not_okay.patch
diff -u extra/gnome/gok/gok_spy_accessible_is_not_okay.patch:1.1 extra/gnome/gok/gok_spy_accessible_is_not_okay.patch:removed
--- extra/gnome/gok/gok_spy_accessible_is_not_okay.patch:1.1	Tue Apr 25 18:11:25 2006
+++ extra/gnome/gok/gok_spy_accessible_is_not_okay.patch	Sun Apr 22 12:12:12 2007
@@ -1,47 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gok/gok/gok-spy.c,v
-retrieving revision 1.170
-retrieving revision 1.171
-diff -u -r1.170 -r1.171
---- gok/gok-spy.c	2006/03/31 20:32:58	1.170
-+++ gok/gok-spy.c	2006/04/03 13:59:05	1.171
-@@ -264,39 +264,6 @@
- 	gok_log_leave ();
- }
- 
--extern SPIBoolean cspi_accessible_is_a (Accessible *accessible, const char *interface_name);
--
--gboolean gok_spy_accessible_is_okay(Accessible* accessible)
--{
--	gboolean returncode = FALSE;
--	gok_log_enter();
--	if (accessible != NULL) 
--	{
--		/* FIXME: we should have a better way of doing this! */
--		returncode = cspi_accessible_is_a (accessible, "IDL:Accessibility/Accessible:1.0");
--		/*
--		if (Accessible_isApplication(accessible) ||
--		    Accessible_isComponent(accessible))
--		{
--			returncode = TRUE;
--		}
--		*/
--			/*
--	    	if (gok_spy_accessible_is_desktopChild(accessible) == FALSE)
--	    	{
--				accessible = NULL;
--			}
--			else
--			{
--				returncode = TRUE;
--			}
--			*/
--	}
--	gok_log("returning: %d",returncode);
--	gok_log_leave();
--	return returncode;
--}
--
- static gboolean
- gok_spy_idle_handler (gpointer data)
- {




More information about the arch-commits mailing list