[arch-commits] Commit in dasher/trunk (3 files)

[Jan de Groot]

    Date: Friday, December 28, 2012 @ 06:59:21
  Author: jgc
Revision: 173934

upgpkg: dasher 4.11-1

Change dependencies, add patches to make it compile (downloaded from Debian).
Remove from gnome-extra group, as this software is not part of GNOME anymore.

Added:
  dasher/trunk/error-format-security.patch
  dasher/trunk/fix-binutils-gold.patch
Modified:
  dasher/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   22 +++++++++++++---------
 error-format-security.patch |   12 ++++++++++++
 fix-binutils-gold.patch     |   28 ++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-28 08:37:29 UTC (rev 173933)
+++ PKGBUILD	2012-12-28 11:59:21 UTC (rev 173934)
@@ -2,25 +2,29 @@
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=dasher
-pkgver=4.10.1
-pkgrel=3
+pkgver=4.11
+pkgrel=1
 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
+depends=('at-spi' 'gnome-speech' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils' 'libgnomeui')
 url="http://www.gnome.org"
-groups=('gnome-extra')
 options=('!emptydirs')
 install=dasher.install
-source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('83e556690ac54c4bb8c49c050510259e')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.11/${pkgname}-${pkgver}.tar.bz2
+        error-format-security.patch
+        fix-binutils-gold.patch)
+sha256sums=('fb21cc4ef606e10a8e5deffebe8695a376eabb0766d7d1bdf80abc5f03f4fed2'
+            '7aeba2667972e408f38b8337f972ff589f05cdf244dec5674f138fc5110405df'
+            'f9e2a661e6d0b873e9a5d491b1b70f3a05ea4edda693e078e2e206451c265daf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/error-format-security.patch"
+  patch -Np1 -i "${srcdir}/fix-binutils-gold.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper --enable-speech
+      --localstatedir=/var --disable-scrollkeeper --enable-speech
   make
 }
 

Added: error-format-security.patch
===================================================================
--- error-format-security.patch	                        (rev 0)
+++ error-format-security.patch	2012-12-28 11:59:21 UTC (rev 173934)
@@ -0,0 +1,12 @@
+Index: dasher-4.11/Src/Gtk2/game_mode_helper.cpp
+===================================================================
+--- dasher-4.11.orig/Src/Gtk2/game_mode_helper.cpp	2009-12-18 13:40:29.000000000 -0500
++++ dasher-4.11/Src/Gtk2/game_mode_helper.cpp	2011-11-11 12:33:12.349741593 -0500
+@@ -324,6 +324,7 @@
+ 				   GTK_DIALOG_MODAL,
+ 				   GTK_MESSAGE_INFO,
+ 				   GTK_BUTTONS_OK,
++                                   "%s",
+ 				   message);
+   gtk_dialog_run (GTK_DIALOG (pDialog));
+   gtk_widget_destroy (pDialog);

Added: fix-binutils-gold.patch
===================================================================
--- fix-binutils-gold.patch	                        (rev 0)
+++ fix-binutils-gold.patch	2012-12-28 11:59:21 UTC (rev 173934)
@@ -0,0 +1,28 @@
+Description: Fix build failures with binutils-gold.
+Author: Mònica Ramírez Arceda <monica at probeta.net>
+Las-Update: 2011-07-17
+
+--- a/Src/Makefile.am
++++ b/Src/Makefile.am
+@@ -34,7 +34,8 @@
+ 	$(GTK2BUILD_LIBS) \
+ 	-lexpat \
+ 	$(POPT_LIBS) \
+-	$(GPELIB)
++	$(GPELIB) \
++        -lX11
+ #endif
+ 
+ #if DOQTE
+--- a/Src/Makefile.in
++++ b/Src/Makefile.in
+@@ -295,7 +295,8 @@
+ 	$(GTK2BUILD_LIBS) \
+ 	-lexpat \
+ 	$(POPT_LIBS) \
+-	$(GPELIB)
++	$(GPELIB) \
++        -lX11
+ 
+ all: all-recursive
+