[arch-commits] Commit in dasher/trunk (PKGBUILD gcc-4.3.patch)

[Jan de Groot]

    Date: Saturday, September 27, 2008 @ 15:13:27
  Author: jgc
Revision: 13597

upgpkg: dasher 4.9.0-1

Modified:
  dasher/trunk/PKGBUILD
Deleted:
  dasher/trunk/gcc-4.3.patch

---------------+
 PKGBUILD      |   23 ++++++++++-------------
 gcc-4.3.patch |   10 ----------
 2 files changed, 10 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-27 19:11:53 UTC (rev 13596)
+++ PKGBUILD	2008-09-27 19:13:27 UTC (rev 13597)
@@ -2,32 +2,29 @@
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=dasher
-pkgver=4.7.3
+pkgver=4.9.0
 pkgrel=1
 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('at-spi>=1.22.1' 'libgnomeui>=2.22.1' 'gnome-speech>=0.4.20')
-makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils>=0.12.2')
+depends=('at-spi>=1.24.0' 'libgnomeui>=2.24.0' 'gnome-speech>=0.4.21')
+makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils>=0.14')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 options=(!emptydirs)
 install=dasher.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.7/${pkgname}-${pkgver}.tar.bz2
-	gcc-4.3.patch)
-md5sums=('f97dfd3c54f6d6c5f2873d4f82cb33c4'
-         '2ef2dc940df24ca9796bbb628967ea56')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.9/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('f6f024878f258a9506e62cf717446437')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/gcc-4.3.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var \
 	      --disable-scrollkeeper --enable-speech || return 1
   make LDFLAGS+=-Wl,--export-dynamic || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
-  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Deleted: gcc-4.3.patch
===================================================================
--- gcc-4.3.patch	2008-09-27 19:11:53 UTC (rev 13596)
+++ gcc-4.3.patch	2008-09-27 19:13:27 UTC (rev 13597)
@@ -1,10 +0,0 @@
---- Src/Gtk2/dasher_action_speech.cpp.orig	2008-03-12 22:54:47.000000000 +0000
-+++ Src/Gtk2/dasher_action_speech.cpp	2008-03-12 22:55:12.000000000 +0000
-@@ -8,6 +8,7 @@
- #include <glib/gi18n.h>
- #include <gnome-speech/gnome-speech.h>
- #include <libbonobo.h>
-+#include <cstring>
- //#include <libintl.h>
- //#include <string.h>
-