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

[Jan de Groot]

    Date: Thursday, April 24, 2008 @ 14:40:39
  Author: jgc
Revision: 888

Merged revisions 2-887 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gcalctool/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r887 | jgc | 2008-04-24 18:40:26 +0000 (Thu, 24 Apr 2008) | 2 lines
  
  upgpkg: gcalctool 5.22.1-1
      Update to new version. Add upstream patch that was forgotten for 5.22.1. This version fixes segfaults with polish locale
........

Added:
  gcalctool/repos/extra-x86_64/power-parser-precedence.patch
    (from rev 887, gcalctool/trunk/power-parser-precedence.patch)
Modified:
  gcalctool/repos/extra-x86_64/	(properties)
  gcalctool/repos/extra-x86_64/PKGBUILD

-------------------------------+
 PKGBUILD                      |    8 +++++---
 power-parser-precedence.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)


Property changes on: gcalctool/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gcalctool/trunk:1
   + /gcalctool/trunk:1-887

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-04-24 18:40:26 UTC (rev 887)
+++ extra-x86_64/PKGBUILD	2008-04-24 18:40:39 UTC (rev 888)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gcalctool
-pkgver=5.22.0
+pkgver=5.22.1
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=(i686 x86_64)
@@ -13,11 +13,13 @@
 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)
-md5sums=('037ef812fe5562b4dda55b9eea82b77b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/5.22/${pkgname}-${pkgver}.tar.bz2
+	power-parser-precedence.patch)
+md5sums=('a4103972f07e85cf242b9a5e4efcfa91')
 	
 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

Copied: gcalctool/repos/extra-x86_64/power-parser-precedence.patch (from rev 887, gcalctool/trunk/power-parser-precedence.patch)
===================================================================
--- extra-x86_64/power-parser-precedence.patch	                        (rev 0)
+++ extra-x86_64/power-parser-precedence.patch	2008-04-24 18:40:39 UTC (rev 888)
@@ -0,0 +1,32 @@
+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, $$);}