[arch-commits] Commit in gok/repos (3 files)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 16:56:27
  Author: jgc
Revision: 54990

Merged revisions 54988 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gok/trunk

........
  r54988 | jgc | 2009-10-11 22:54:05 +0200 (Sun, 11 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Added:
  gok/repos/extra-i686/lm.patch
    (from rev 54988, gok/trunk/lm.patch)
Modified:
  gok/repos/extra-i686/	(properties)
  gok/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++------
 lm.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)


Property changes on: gok/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gok/trunk:1-32077
   + /gok/trunk:1-54989

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-11 20:56:09 UTC (rev 54989)
+++ extra-i686/PKGBUILD	2009-10-11 20:56:27 UTC (rev 54990)
@@ -2,24 +2,27 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gok
-pkgver=2.26.0
+pkgver=2.28.0
 pkgrel=1
 pkgdesc="Gnome Onscreen Keyboard"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnome.org"
-depends=('gnome-speech>=0.4.25' 'libgnomeui>=2.24.1' 'at-spi>=1.26.0' 'libwnck>=2.26.0')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.16.0')
+depends=('gnome-speech>=0.4.25' 'at-spi>=1.27.92' 'libwnck>=2.28.0' 'hicolor-icon-theme' 'libcanberra>=0.14' 'libglade>=2.6.4' 'gconf>=2.27.0')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.17.5')
 options=('!emptydirs')
 groups=('gnome-extra')
 install=gok.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8cc28ad6010a977c9ccbe8d5b690f636')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
+        lm.patch)
+sha256sums=('2862f59f31a2961bfad1057e2899c995885a057810d522b0a67b2eab8a56e6cb'
+            '2da4a8e5f1f3726c31fe8fd465f33b42959da68692cddf01e79430afec898b90')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/lm.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var || return 1
+      --localstatedir=/var || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 

Copied: gok/repos/extra-i686/lm.patch (from rev 54988, gok/trunk/lm.patch)
===================================================================
--- extra-i686/lm.patch	                        (rev 0)
+++ extra-i686/lm.patch	2009-10-11 20:56:27 UTC (rev 54990)
@@ -0,0 +1,12 @@
+diff -up gok-2.27.2/gok/Makefile.in.lm gok-2.27.2/gok/Makefile.in
+--- gok-2.27.2/gok/Makefile.in.lm	2009-06-13 00:59:29.162580117 -0400
++++ gok-2.27.2/gok/Makefile.in	2009-06-13 00:59:11.583583888 -0400
+@@ -374,7 +374,7 @@ INCLUDES = -DGOK_LOCALEDIR=\""$(datadir)
+ 	-DDATADIR=\""$(datadir)"\" -DLIBDIR=\""$(libdir)"\" \
+ 	-I$(top_srcdir) -I$(top_builddir) $(GOK_CFLAGS) \
+ 	$(am__append_1)
+-LDADD = $(GOK_LIBS) $(X_LIBS) @LT_VERSION_INFO@ $(am__append_2)
++LDADD = $(GOK_LIBS) $(X_LIBS) -lm @LT_VERSION_INFO@ $(am__append_2)
+ gok_LDFLAGS = -export-dynamic
+ gok_SOURCES = callbacks.c callbacks.h gok-branchback-stack.c \
+ 	gok-branchback-stack.h gok-button.c gok-button.h gok-chunker.c \