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

[Jan de Groot]

    Date: Thursday, October 18, 2007 @ 16:21:23
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/dasher

   Added: bgo479524.patch (1.1)
Modified: PKGBUILD (1.21 -> 1.22) dasher.install (1.7 -> 1.8)

upgpkg: dasher 4.6.1-1


-----------------+
 PKGBUILD        |   15 +++++++++------
 bgo479524.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 dasher.install  |    2 --
 3 files changed, 54 insertions(+), 8 deletions(-)


Index: extra/gnome/dasher/PKGBUILD
diff -u extra/gnome/dasher/PKGBUILD:1.21 extra/gnome/dasher/PKGBUILD:1.22
--- extra/gnome/dasher/PKGBUILD:1.21	Fri Jun  1 05:50:32 2007
+++ extra/gnome/dasher/PKGBUILD	Thu Oct 18 16:21:23 2007
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD,v 1.21 2007/06/01 09:50:32 jgc Exp $
+# $Id: PKGBUILD,v 1.22 2007/10/18 20:21:23 jgc Exp $
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=dasher
-pkgver=4.4.2
+pkgver=4.6.1
 pkgrel=1
 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('at-spi>=1.18.1-2' 'libgnomeui>=2.18.1-2' 'gnome-speech>=0.4.11-2' 'scrollkeeper')
-makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.10.3')
+depends=('at-spi>=1.20.1' 'libgnomeui>=2.20.1' 'gnome-speech>=0.4.16')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.12.0')
 url="http://www.gnome.org"
 groups=('gnome-extra')
+options=(!emptydirs)
 install=dasher.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.4/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ca50a357d5043e4e5f114ecda7cd1c73')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2
+	bgo479524.patch)
+md5sums=('1457df5075477d757f7df5693947464d')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/bgo479524.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var \
 	      --disable-scrollkeeper --enable-speech
Index: extra/gnome/dasher/bgo479524.patch
diff -u /dev/null extra/gnome/dasher/bgo479524.patch:1.1
--- /dev/null	Thu Oct 18 16:21:23 2007
+++ extra/gnome/dasher/bgo479524.patch	Thu Oct 18 16:21:23 2007
@@ -0,0 +1,45 @@
+--- Src/Gtk2/dasher_action_speech.cpp	2007/09/25 22:31:10	1.1
++++ Src/Gtk2/dasher_action_speech.cpp	2007/09/25 22:33:16
+@@ -28,8 +28,8 @@ typedef struct _DasherActionSpeechPrivat
+ 
+ G_DEFINE_TYPE(DasherActionSpeech, dasher_action_speech, TYPE_DASHER_ACTION);
+ 
+-static gboolean dasher_action_speech_execute(DasherAction *pSelf, DasherEditorInternal *pEditor, int iIdx);
+-static gboolean dasher_action_speech_preview(DasherAction *pSelf, DasherEditorInternal *pEditor);
++static gboolean dasher_action_speech_execute(DasherAction *pSelf, DasherEditor *pEditor, int iIdx);
++static gboolean dasher_action_speech_preview(DasherAction *pSelf, DasherEditor *pEditor);
+ static const gchar *dasher_action_speech_get_name(DasherAction *pSelf);
+ static int dasher_action_speech_get_sub_count(DasherAction *pSelf);
+ static const gchar *dasher_action_speech_get_sub_name(DasherAction *pSelf, int iIdx);
+@@ -66,17 +66,17 @@ dasher_action_speech_new() {
+ }
+ 
+ static gboolean 
+-dasher_action_speech_execute(DasherAction *pSelf, DasherEditorInternal *pEditor, int iIdx) {
++dasher_action_speech_execute(DasherAction *pSelf, DasherEditor *pEditor, int iIdx) {
+   DasherActionSpeechPrivate *pDasherActionSpeechPrivate = DASHER_ACTION_SPEECH_GET_PRIVATE(pSelf);
+ 
+   const char *szData;
+ 
+   switch(iIdx) {
+   case 0:
+-    szData = dasher_editor_internal_get_all_text(pEditor);
++    szData = dasher_editor_get_all_text(pEditor);
+     break;
+   case 1:
+-    szData = dasher_editor_internal_get_new_text(pEditor);
++    szData = dasher_editor_get_new_text(pEditor);
+     break;
+   case 2:
+     szData = pDasherActionSpeechPrivate->szLast;
+@@ -107,8 +107,8 @@ dasher_action_speech_execute(DasherActio
+ }
+ 
+ static gboolean 
+-dasher_action_speech_preview(DasherAction *pSelf, DasherEditorInternal *pEditor) {
+-  const gchar *szData = dasher_editor_internal_get_all_text(pEditor);
++dasher_action_speech_preview(DasherAction *pSelf, DasherEditor *pEditor) {
++  const gchar *szData = dasher_editor_get_all_text(pEditor);
+ 
+   if(!szData)
+     return false;
Index: extra/gnome/dasher/dasher.install
diff -u extra/gnome/dasher/dasher.install:1.7 extra/gnome/dasher/dasher.install:1.8
--- extra/gnome/dasher/dasher.install:1.7	Sun Apr 22 11:35:00 2007
+++ extra/gnome/dasher/dasher.install	Thu Oct 18 16:21:23 2007
@@ -3,7 +3,6 @@
 post_install() {
   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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -29,7 +28,6 @@
 }
 
 post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }