[arch-commits] Commit in genius/trunk (PKGBUILD readline-fix.patch)

[Jan de Groot]

    Date: Monday, April 28, 2014 @ 10:33:13
  Author: jgc
Revision: 211850

upgpkg: genius 1.0.17-2

Fix build (FS#39100)

Added:
  genius/trunk/readline-fix.patch
Modified:
  genius/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   17 ++++++++++++-----
 readline-fix.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 08:26:09 UTC (rev 211849)
+++ PKGBUILD	2014-04-28 08:33:13 UTC (rev 211850)
@@ -4,7 +4,7 @@
 
 pkgname=genius
 pkgver=1.0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced calculator including a mathematical programming language"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,11 +13,18 @@
 makedepends=('intltool' 'gnome-doc-utils')
 options=('!makeflags')
 install=genius.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f')
+source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz
+        readline-fix.patch)
+sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f'
+            '9f340c99b9f428bf476350f54d1f75556f630bc750c629da89ac6b8fe411b7d6')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../readline-fix.patch
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/genius \
       --localstatedir=/var --disable-static \
@@ -27,6 +34,6 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }

Added: readline-fix.patch
===================================================================
--- readline-fix.patch	                        (rev 0)
+++ readline-fix.patch	2014-04-28 08:33:13 UTC (rev 211850)
@@ -0,0 +1,35 @@
+From 5292545265af6ae4e8140b1af89369f7ae9be554 Mon Sep 17 00:00:00 2001
+From: "Jiri (George) Lebl" <jiri.lebl at gmail.com>
+Date: Thu, 3 Apr 2014 08:02:02 -0500
+Subject: Thu Apr 03 08:01:49 2014  Jiri (George) Lebl <jirka at 5z.com>
+
+	* src/inter.c, src/genius-readline-helper.c: apply patch from Felipe
+	  Sateler of debian to fix build with new readline.
+
+diff --git a/src/genius-readline-helper.c b/src/genius-readline-helper.c
+index 7e9e84b..dbf8fd2 100644
+--- a/src/genius-readline-helper.c
++++ b/src/genius-readline-helper.c
+@@ -183,7 +183,7 @@ main(int argc, char *argv[])
+ 	rl_terminal_name = "xterm";
+ 	rl_readline_name = "Genius";
+ 	rl_attempted_completion_function =
+-		(CPPFunction *)tab_completion;
++		(rl_completion_func_t *)tab_completion;
+ 
+ 	while(fgets(buf,4096,infp)) {
+ 		int count;
+diff --git a/src/inter.c b/src/inter.c
+index 915f115..f0d2558 100644
+--- a/src/inter.c
++++ b/src/inter.c
+@@ -367,5 +367,5 @@ init_inter(void)
+ {
+ 	rl_readline_name = "Genius";
+ 	rl_attempted_completion_function =
+-		(CPPFunction *)tab_completion;
++		(rl_completion_func_t *)tab_completion;
+ }
+-- 
+cgit v0.10.1
+