[arch-commits] Commit in genius/repos (10 files)

Jan de Groot jgc at nymeria.archlinux.org
Mon Apr 28 08:33:22 UTC 2014


    Date: Monday, April 28, 2014 @ 10:33:22
  Author: jgc
Revision: 211851

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  genius/repos/extra-i686/PKGBUILD
    (from rev 211850, genius/trunk/PKGBUILD)
  genius/repos/extra-i686/genius.install
    (from rev 211850, genius/trunk/genius.install)
  genius/repos/extra-i686/readline-fix.patch
    (from rev 211850, genius/trunk/readline-fix.patch)
  genius/repos/extra-x86_64/PKGBUILD
    (from rev 211850, genius/trunk/PKGBUILD)
  genius/repos/extra-x86_64/genius.install
    (from rev 211850, genius/trunk/genius.install)
  genius/repos/extra-x86_64/readline-fix.patch
    (from rev 211850, genius/trunk/readline-fix.patch)
Deleted:
  genius/repos/extra-i686/PKGBUILD
  genius/repos/extra-i686/genius.install
  genius/repos/extra-x86_64/PKGBUILD
  genius/repos/extra-x86_64/genius.install

---------------------------------+
 /PKGBUILD                       |   78 ++++++++++++++++++++++++++++++++++++++
 /genius.install                 |   26 ++++++++++++
 extra-i686/PKGBUILD             |   32 ---------------
 extra-i686/genius.install       |   13 ------
 extra-i686/readline-fix.patch   |   35 +++++++++++++++++
 extra-x86_64/PKGBUILD           |   32 ---------------
 extra-x86_64/genius.install     |   13 ------
 extra-x86_64/readline-fix.patch |   35 +++++++++++++++++
 8 files changed, 174 insertions(+), 90 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-04-28 08:33:13 UTC (rev 211850)
+++ extra-i686/PKGBUILD	2014-04-28 08:33:22 UTC (rev 211851)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Arjan Timmerman <arjan at soulfly.nl>
-
-pkgname=genius
-pkgver=1.0.17
-pkgrel=1
-pkgdesc="Advanced calculator including a mathematical programming language"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.jirka.org/genius.html"
-depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/genius \
-      --localstatedir=/var --disable-static \
-      --enable-gtksourceview --disable-scrollkeeper \
-      --disable-update-mimedb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: genius/repos/extra-i686/PKGBUILD (from rev 211850, genius/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-04-28 08:33:22 UTC (rev 211851)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Arjan Timmerman <arjan at soulfly.nl>
+
+pkgname=genius
+pkgver=1.0.17
+pkgrel=2
+pkgdesc="Advanced calculator including a mathematical programming language"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.jirka.org/genius.html"
+depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
+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
+        readline-fix.patch)
+sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f'
+            '9f340c99b9f428bf476350f54d1f75556f630bc750c629da89ac6b8fe411b7d6')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../readline-fix.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/genius \
+      --localstatedir=/var --disable-static \
+      --enable-gtksourceview --disable-scrollkeeper \
+      --disable-update-mimedb
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/genius.install
===================================================================
--- extra-i686/genius.install	2014-04-28 08:33:13 UTC (rev 211850)
+++ extra-i686/genius.install	2014-04-28 08:33:22 UTC (rev 211851)
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: genius/repos/extra-i686/genius.install (from rev 211850, genius/trunk/genius.install)
===================================================================
--- extra-i686/genius.install	                        (rev 0)
+++ extra-i686/genius.install	2014-04-28 08:33:22 UTC (rev 211851)
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Copied: genius/repos/extra-i686/readline-fix.patch (from rev 211850, genius/trunk/readline-fix.patch)
===================================================================
--- extra-i686/readline-fix.patch	                        (rev 0)
+++ extra-i686/readline-fix.patch	2014-04-28 08:33:22 UTC (rev 211851)
@@ -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
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-04-28 08:33:13 UTC (rev 211850)
+++ extra-x86_64/PKGBUILD	2014-04-28 08:33:22 UTC (rev 211851)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Arjan Timmerman <arjan at soulfly.nl>
-
-pkgname=genius
-pkgver=1.0.17
-pkgrel=1
-pkgdesc="Advanced calculator including a mathematical programming language"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.jirka.org/genius.html"
-depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/genius \
-      --localstatedir=/var --disable-static \
-      --enable-gtksourceview --disable-scrollkeeper \
-      --disable-update-mimedb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: genius/repos/extra-x86_64/PKGBUILD (from rev 211850, genius/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-04-28 08:33:22 UTC (rev 211851)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Arjan Timmerman <arjan at soulfly.nl>
+
+pkgname=genius
+pkgver=1.0.17
+pkgrel=2
+pkgdesc="Advanced calculator including a mathematical programming language"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.jirka.org/genius.html"
+depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
+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
+        readline-fix.patch)
+sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f'
+            '9f340c99b9f428bf476350f54d1f75556f630bc750c629da89ac6b8fe411b7d6')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../readline-fix.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/genius \
+      --localstatedir=/var --disable-static \
+      --enable-gtksourceview --disable-scrollkeeper \
+      --disable-update-mimedb
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/genius.install
===================================================================
--- extra-x86_64/genius.install	2014-04-28 08:33:13 UTC (rev 211850)
+++ extra-x86_64/genius.install	2014-04-28 08:33:22 UTC (rev 211851)
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: genius/repos/extra-x86_64/genius.install (from rev 211850, genius/trunk/genius.install)
===================================================================
--- extra-x86_64/genius.install	                        (rev 0)
+++ extra-x86_64/genius.install	2014-04-28 08:33:22 UTC (rev 211851)
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Copied: genius/repos/extra-x86_64/readline-fix.patch (from rev 211850, genius/trunk/readline-fix.patch)
===================================================================
--- extra-x86_64/readline-fix.patch	                        (rev 0)
+++ extra-x86_64/readline-fix.patch	2014-04-28 08:33:22 UTC (rev 211851)
@@ -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
+




More information about the arch-commits mailing list