[arch-commits] Commit in libqalculate/trunk (5 files)
Eric Bélanger
eric at archlinux.org
Fri Jan 8 06:49:03 UTC 2010
Date: Friday, January 8, 2010 @ 01:49:03
Author: eric
Revision: 62400
upgpkg: libqalculate 0.9.7-1
Upstream update, Removed old patches
Modified:
libqalculate/trunk/ChangeLog
libqalculate/trunk/PKGBUILD
Deleted:
libqalculate/trunk/libqalculate-0.9.6-cl_abort.patch
libqalculate/trunk/libqalculate-0.9.6-cln-config.patch
libqalculate/trunk/libqalculate-0.9.6-gcc4.3.patch
-------------------------------------+
ChangeLog | 5
PKGBUILD | 22 +---
libqalculate-0.9.6-cl_abort.patch | 20 ---
libqalculate-0.9.6-cln-config.patch | 171 ----------------------------------
libqalculate-0.9.6-gcc4.3.patch | 11 --
5 files changed, 11 insertions(+), 218 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-01-08 06:33:05 UTC (rev 62399)
+++ ChangeLog 2010-01-08 06:49:03 UTC (rev 62400)
@@ -1,3 +1,8 @@
+2010-01-07 Eric Belanger <eric at archlinux.org>
+
+ * libqalculate 0.9.7-1
+ * Upstream update
+
2009-11-07 Eric Belanger <eric at archlinux.org>
* libqalculate 0.9.6-6
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-08 06:33:05 UTC (rev 62399)
+++ PKGBUILD 2010-01-08 06:49:03 UTC (rev 62400)
@@ -4,8 +4,8 @@
# Contributor: J. Santiago Hirschfeld <jsantiagoh at yahoo.com.ar>
pkgname=libqalculate
-pkgver=0.9.6
-pkgrel=6
+pkgver=0.9.7
+pkgrel=1
pkgdesc="Multi-purpose desktop calculator"
arch=('i686' 'x86_64')
url="http://qalculate.sourceforge.net/"
@@ -14,23 +14,13 @@
makedepends=('perlxml')
optdepends=('gnuplot: for plotting support' 'wget: for retrieval of exchange rates (not needed if you use one of the GUI)' 'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)')
options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz \
- libqalculate-0.9.6-cln-config.patch libqalculate-0.9.6-cl_abort.patch \
- libqalculate-0.9.6-gcc4.3.patch)
-md5sums=('e14432fc490f9a697e23e31a74e0eb19' '24fcfc7d1ac7ebc63bc0170c77e2db20'\
- '6613b57319ca500ef65515ee7d88bf5c' 'c89e366aad6b49095ab9d966e5890f25')
-sha1sums=('0bcd42e13c23db9489ce594767d5017bdcb338ad'
- '9e8f9aef18e7c6f91a16d3bdd031ebf4d192221a'
- '69619a265d0ac75e0f81bcf0b1bd68f240412567'
- '0bcee9493e17702719db06fbac1f2d45888b54b0')
+source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz)
+md5sums=('a1507ab862f4ad9852788619aada35cd')
+sha1sums=('c15f7f3a97995decf62cc964956fc1e374ecd78c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../libqalculate-0.9.6-cln-config.patch || return 1
- patch -p1 < ../libqalculate-0.9.6-cl_abort.patch || return 1
- patch -p1 < ../libqalculate-0.9.6-gcc4.3.patch || return 1
- autoconf || return 1
- ./configure --prefix=/usr --disable-clntest || return 1
+ ./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
}
Deleted: libqalculate-0.9.6-cl_abort.patch
===================================================================
--- libqalculate-0.9.6-cl_abort.patch 2010-01-08 06:33:05 UTC (rev 62399)
+++ libqalculate-0.9.6-cl_abort.patch 2010-01-08 06:49:03 UTC (rev 62400)
@@ -1,20 +0,0 @@
-diff -Naur libqalculate-0.9.6/libqalculate/Number.cc libqalculate-0.9.6.new1/libqalculate/Number.cc
---- libqalculate-0.9.6/libqalculate/Number.cc 2007-05-18 04:03:22.000000000 -0400
-+++ libqalculate-0.9.6.new1/libqalculate/Number.cc 2008-02-02 11:06:15.000000000 -0500
-@@ -28,6 +28,7 @@
-
- using namespace cln;
-
-+/*
- void cln::cl_abort() {
- CALCULATOR->error(true, "CLN Error: see terminal output (probably too large or small floating point number)", NULL);
- if(CALCULATOR->busy()) {
-@@ -36,7 +37,7 @@
- exit(0);
- }
- }
--
-+*/
- string printCL_I(cl_I integ, int base = 10, bool display_sign = true, BaseDisplay base_display = BASE_DISPLAY_NORMAL, bool lower_case = false) {
- if(base == BASE_ROMAN_NUMERALS) {
- if(!zerop(integ) && integ < 10000 && integ > -10000) {
Deleted: libqalculate-0.9.6-cln-config.patch
===================================================================
--- libqalculate-0.9.6-cln-config.patch 2010-01-08 06:33:05 UTC (rev 62399)
+++ libqalculate-0.9.6-cln-config.patch 2010-01-08 06:49:03 UTC (rev 62400)
@@ -1,171 +0,0 @@
-diff -Naur libqalculate-0.9.6/aclocal.m4 libqalculate-0.9.6.new/aclocal.m4
---- libqalculate-0.9.6/aclocal.m4 2007-06-17 04:45:44.000000000 -0400
-+++ libqalculate-0.9.6.new/aclocal.m4 2008-02-02 11:04:21.000000000 -0500
-@@ -7836,146 +7836,27 @@
- [dnl
- dnl Get the cppflags and libraries from the cln-config script
- dnl
--AC_ARG_WITH(cln-prefix,[ --with-cln-prefix=PFX Prefix where CLN is installed (optional)],
-- cln_config_prefix="$withval", cln_config_prefix="")
--AC_ARG_WITH(cln-exec-prefix,[ --with-cln-exec-prefix=PFX Exec prefix where CLN is installed (optional)],
-- cln_config_exec_prefix="$withval", cln_config_exec_prefix="")
--AC_ARG_ENABLE(clntest, [ --disable-clntest Do not try to compile and run a test CLN program],
-- , enable_clntest=yes)
--
--if test x$cln_config_exec_prefix != x ; then
-- cln_config_args="$cln_config_args --exec-prefix=$cln_config_exec_prefix"
-- if test x${CLN_CONFIG+set} != xset ; then
-- CLN_CONFIG=$cln_config_exec_prefix/bin/cln-config
-- fi
--fi
--if test x$cln_config_prefix != x ; then
-- cln_config_args="$cln_config_args --prefix=$cln_config_prefix"
-- if test x${CLN_CONFIG+set} != xset ; then
-- CLN_CONFIG=$cln_config_prefix/bin/cln-config
-- fi
--fi
-
--AC_PATH_PROG(CLN_CONFIG, cln-config, no)
-+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- cln_min_version=ifelse([$1], ,1.1.0,$1)
- AC_MSG_CHECKING(for CLN - version >= $cln_min_version)
--if test "$CLN_CONFIG" = "no" ; then
-+if test "$PKG_CONFIG" = "no" ; then
- AC_MSG_RESULT(no)
-- echo "*** The cln-config script installed by CLN could not be found"
-- echo "*** If CLN was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the CLN_CONFIG environment variable to the"
-- echo "*** full path to cln-config."
-+ echo "*** could not find pkg-config"
- ifelse([$3], , :, [$3])
- else
- dnl Parse required version and the result of cln-config.
-- cln_min_major_version=`echo $cln_min_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- cln_min_minor_version=`echo $cln_min_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- cln_min_micro_version=`echo $cln_min_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
-- CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
-- cln_config_version=`$CLN_CONFIG $cln_config_args --version`
-- cln_config_major_version=`echo $cln_config_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- cln_config_minor_version=`echo $cln_config_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- cln_config_micro_version=`echo $cln_config_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--dnl Check if the installed CLN is sufficiently new according to cln-config.
-- if test \( $cln_config_major_version -lt $cln_min_major_version \) -o \
-- \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -lt $cln_min_minor_version \) -o \
-- \( $cln_config_major_version -eq $cln_min_major_version -a $cln_config_minor_version -eq $cln_min_minor_version -a $cln_config_micro_version -lt $cln_min_micro_version \); then
-- echo -e "\n*** 'cln-config --version' returned $cln_config_major_version.$cln_config_minor_version.$cln_config_micro_version, but the minimum version"
-- echo "*** of CLN required is $cln_min_major_version.$cln_min_minor_version.$cln_min_micro_version. If cln-config is correct, then it is"
-- echo "*** best to upgrade to the required version."
-- echo "*** If cln-config was wrong, set the environment variable CLN_CONFIG"
-- echo "*** to point to the correct copy of cln-config, and remove the file"
-- echo "*** config.cache before re-running configure."
-- ifelse([$3], , :, [$3])
-+ if $PKG_CONFIG cln --atleast-version=${cln_min_version}; then
-+ echo "Found cln >= ${cln_min_version}"
-+ CLN_CPPFLAGS=`$PKG_CONFIG cln --cflags`
-+ CLN_LIBS=`$PKG_CONFIG cln --libs`
- else
--dnl The versions match so far. Now do a sanity check: Does the result of cln-config
--dnl match the version of the headers and the version built into the library, too?
-- no_cln=""
-- if test "x$enable_clntest" = "xyes" ; then
-- ac_save_CPPFLAGS="$CPPFLAGS"
-- ac_save_LIBS="$LIBS"
-- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
-- LIBS="$LIBS $CLN_LIBS"
-- rm -f conf.clntest
-- AC_TRY_RUN([
--#include <stdio.h>
--#include <string.h>
--#include <cln/version.h>
--
--/* we do not #include <stdlib.h> because autoconf in C++ mode inserts a
-- prototype for exit() that conflicts with the one in stdlib.h */
--extern "C" int system(const char *);
--
--int main(void)
--{
-- system("touch conf.clntest");
--
-- if ((CL_VERSION_MAJOR != $cln_config_major_version) ||
-- (CL_VERSION_MINOR != $cln_config_minor_version) ||
-- (CL_VERSION_PATCHLEVEL != $cln_config_micro_version)) {
-- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the header file I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version);
-- printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", CL_VERSION_MAJOR, CL_VERSION_MINOR, CL_VERSION_PATCHLEVEL);
-- printf("*** is corrupted or you have specified some wrong -I compiler flags.\n");
-- printf("*** Please inquire and consider reinstalling CLN.\n");
-- return 1;
-- }
-- if ((cln::version_major != $cln_config_major_version) ||
-- (cln::version_minor != $cln_config_minor_version) ||
-- (cln::version_patchlevel != $cln_config_micro_version)) {
-- printf("\n*** 'cln-config --version' returned %d.%d.%d, but the library I found\n", $cln_config_major_version, $cln_config_minor_version, $cln_config_micro_version);
-- printf("*** corresponds to %d.%d.%d. This mismatch suggests your installation of CLN\n", cln::version_major, cln::version_minor, cln::version_patchlevel);
-- printf("*** is corrupted or you have specified some wrong -L compiler flags.\n");
-- printf("*** Please inquire and consider reinstalling CLN.\n");
-- return 1;
-- }
-- return 0;
--}
--],, no_cln=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-- CPPFLAGS="$ac_save_CPPFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- if test "x$no_cln" = x ; then
-- AC_MSG_RESULT([yes, $cln_config_version])
-- ifelse([$2], , :, [$2])
-- else
-- AC_MSG_RESULT(no)
-- if test ! -f conf.clntest ; then
-- echo "*** Could not run CLN test program, checking why..."
-- CPPFLAGS="$CFLAGS $CLN_CPPFLAGS"
-- LIBS="$LIBS $CLN_LIBS"
-- AC_TRY_LINK([
--#include <stdio.h>
--#include <cln/version.h>
--], [ return 0; ],
-- [ echo "*** The test program compiled, but did not run. This usually means"
-- echo "*** that the run-time linker is not finding CLN or finding the wrong"
-- echo "*** version of CLN. If it is not finding CLN, you'll need to set your"
-- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-- echo "*** to the installed location. Also, make sure you have run ldconfig if that"
-- echo "*** is required on your system."],
-- [ echo "*** The test program failed to compile or link. See the file config.log for the"
-- echo "*** exact error that occured. This usually means CLN was incorrectly installed"
-- echo "*** or that you have moved CLN since it was installed. In the latter case, you"
-- echo "*** may want to edit the cln-config script: $CLN_CONFIG." ])
-- CPPFLAGS="$ac_save_CPPFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- CLN_CPPFLAGS=""
-- CLN_LIBS=""
-- ifelse([$3], , :, [$3])
-- fi
-+ echo "ERROR: cln >= ${cln_min_version} not found"
-+ ifelse([$3], , :, [$3])
- fi
- fi
- AC_SUBST(CLN_CPPFLAGS)
- AC_SUBST(CLN_LIBS)
--rm -f conf.clntest
- ])
-
- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-diff -Naur libqalculate-0.9.6/src/Makefile.in libqalculate-0.9.6.new/src/Makefile.in
---- libqalculate-0.9.6/src/Makefile.in 2007-06-17 04:45:49.000000000 -0400
-+++ libqalculate-0.9.6.new/src/Makefile.in 2008-02-02 11:37:48.000000000 -0500
-@@ -117,7 +117,7 @@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ @CLN_LIBS@
- LIBTOOL = @LIBTOOL@
- LN_QALCULATE = @LN_QALCULATE@
- LN_S = @LN_S@
Deleted: libqalculate-0.9.6-gcc4.3.patch
===================================================================
--- libqalculate-0.9.6-gcc4.3.patch 2010-01-08 06:33:05 UTC (rev 62399)
+++ libqalculate-0.9.6-gcc4.3.patch 2010-01-08 06:49:03 UTC (rev 62400)
@@ -1,11 +0,0 @@
-diff -Naur libqalculate-0.9.6/libqalculate/Number.cc libqalculate-0.9.6.new/libqalculate/Number.cc
---- libqalculate-0.9.6/libqalculate/Number.cc 2007-05-18 04:03:22.000000000 -0400
-+++ libqalculate-0.9.6.new/libqalculate/Number.cc 2008-04-01 10:46:53.000000000 -0400
-@@ -15,6 +15,7 @@
- #include "Calculator.h"
-
- #include <sstream>
-+#include <climits>
- #include "util.h"
-
- #define REAL_PRECISION_FLOAT_RE(x) cln::cl_float(cln::realpart(x), cln::float_format(PRECISION + 1))
More information about the arch-commits
mailing list