[arch-commits] Commit in gcalctool/repos (3 files)
Jan de Groot
jgc at archlinux.org
Sun Jun 1 19:21:51 UTC 2008
Date: Sunday, June 1, 2008 @ 15:21:51
Author: jgc
Revision: 2387
Merged revisions 888-2386 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/gcalctool/trunk
........
r907 | jgc | 2008-04-24 20:58:36 +0000 (Thu, 24 Apr 2008) | 1 line
upgpkg: gcalctool 5.22.1-1
........
r2386 | jgc | 2008-06-01 19:21:37 +0000 (Sun, 01 Jun 2008) | 1 line
upgpkg: gcalctool 5.22.2-1
........
Modified:
gcalctool/repos/extra-x86_64/ (properties)
gcalctool/repos/extra-x86_64/PKGBUILD
Deleted:
gcalctool/repos/extra-x86_64/power-parser-precedence.patch
-------------------------------+
PKGBUILD | 8 +++-----
power-parser-precedence.patch | 32 --------------------------------
2 files changed, 3 insertions(+), 37 deletions(-)
Property changes on: gcalctool/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /gcalctool/trunk:1-887
+ /gcalctool/trunk:1-2386
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-06-01 19:21:37 UTC (rev 2386)
+++ extra-x86_64/PKGBUILD 2008-06-01 19:21:51 UTC (rev 2387)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gcalctool
-pkgver=5.22.1
+pkgver=5.22.2
pkgrel=1
pkgdesc="GNOME Scientific calculator"
arch=(i686 x86_64)
@@ -13,13 +13,11 @@
options=(!emptydirs)
url="http://www.gnome.org"
install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.22/${pkgname}-${pkgver}.tar.bz2
- power-parser-precedence.patch)
-md5sums=('a4103972f07e85cf242b9a5e4efcfa91')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('8389a1dd158110e6d0a44ccb772322f2')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np0 -i ${startdir}/src/power-parser-precedence.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-scrollkeeper || return 1
make || return 1
Deleted: extra-x86_64/power-parser-precedence.patch
===================================================================
--- extra-x86_64/power-parser-precedence.patch 2008-06-01 19:21:37 UTC (rev 2386)
+++ extra-x86_64/power-parser-precedence.patch 2008-06-01 19:21:51 UTC (rev 2387)
@@ -1,32 +0,0 @@
-Index: ce_parser.y
-===================================================================
---- gcalctool/ce_parser.y (revision 2044)
-+++ gcalctool/ce_parser.y (working copy)
-@@ -97,10 +97,12 @@
- %start statement
- %left '+' '-'
- %left '*' '/'
--%right '^'
- %left MED
- %left NEG
- %left POS
-+%right '^'
-+%right '!'
-+%right '%'
- %left HIGH
-
- %%
-@@ -200,12 +202,12 @@
- | rcl {cp($1, $$);}
- | term '/' term {mpdiv($1, $3, $$);}
- | term '*' term {mpmul($1, $3, $$);}
--| term '^' term {calc_xpowy($1, $3, $$);}
- | 'e' '^' term {calc_epowy($3, $$);}
- | term '!' {do_factorial($1 ,$$);}
- | term '%' {calc_percent($1, $$);}
- | '-' term %prec NEG {mpneg($2, $$);}
- | '+' term %prec POS {cp($2, $$);}
-+| term '^' term {calc_xpowy($1, $3, $$);}
-
- | func {cp($1, $$);}
- | reg {cp($1, $$);}
More information about the arch-commits
mailing list