[arch-commits] Commit in qalculate-gtk/repos (5 files)
Eric Bélanger
eric at archlinux.org
Fri Jan 8 07:09:35 UTC 2010
Date: Friday, January 8, 2010 @ 02:09:35
Author: eric
Revision: 62404
Merged revisions 38526,62403 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/qalculate-gtk/trunk
........
r38526 | jgc | 2009-05-08 17:25:21 -0400 (Fri, 08 May 2009) | 1 line
remove install scriptlet, it is not needed
........
r62403 | eric | 2010-01-08 02:09:14 -0500 (Fri, 08 Jan 2010) | 2 lines
upgpkg: qalculate-gtk 0.9.7-1
Upstream update, Removed old patch
........
Modified:
qalculate-gtk/repos/extra-i686/ (properties)
qalculate-gtk/repos/extra-i686/ChangeLog
qalculate-gtk/repos/extra-i686/PKGBUILD
Deleted:
qalculate-gtk/repos/extra-i686/qalculate-gtk-0.9.6-cln-config.patch
qalculate-gtk/repos/extra-i686/qalculate-gtk.install
--------------------------------------+
ChangeLog | 5 +
PKGBUILD | 20 +---
qalculate-gtk-0.9.6-cln-config.patch | 159 ---------------------------------
qalculate-gtk.install | 11 --
4 files changed, 13 insertions(+), 182 deletions(-)
Property changes on: qalculate-gtk/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /qalculate-gtk/trunk:1-6050
+ /qalculate-gtk/trunk:1-62403
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2010-01-08 07:09:14 UTC (rev 62403)
+++ extra-i686/ChangeLog 2010-01-08 07:09:35 UTC (rev 62404)
@@ -1,3 +1,8 @@
+2010-01-07 Eric Belanger <eric at archlinux.org>
+
+ * qalculate-gtk 0.9.7-1
+ * Upstream update
+
2008-07-21 Eric Belanger <eric at archlinux.org>
* qalculate-gtk 0.9.6-3
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-01-08 07:09:14 UTC (rev 62403)
+++ extra-i686/PKGBUILD 2010-01-08 07:09:35 UTC (rev 62404)
@@ -4,27 +4,23 @@
# Contributor: J. Santiago Hirschfeld <jsantiagoh at yahoo.com.ar>
pkgname=qalculate-gtk
-pkgver=0.9.6
-pkgrel=3
+pkgver=0.9.7
+pkgrel=1
pkgdesc="GNOME frontend for libqalculate"
arch=('i686' 'x86_64')
url="http://qalculate.sourceforge.net/"
license=('GPL')
-depends=('libqalculate' 'libgnome' 'libglade' 'cln>=1.2.0' 'desktop-file-utils')
+depends=('libqalculate>=0.9.7' 'libgnome' 'libglade' 'cln>=1.2.0')
makedepends=('perlxml' 'gnome-doc-utils>=0.12.0')
optdepends=('yelp: for displaying the help')
replaces=('qalculate')
-install=qalculate-gtk.install
-source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz \
- qalculate-gtk-0.9.6-cln-config.patch)
-md5sums=('1f787bc8c2ac7410a878a0e895a127d8' 'c04c35f94adfa4ba206a72b06b195acc')
-sha1sums=('1f69097457f6e28b67d1d767670dc519548876b5' '48bd34a19c6272654616ba4bc086a22b33cefea6')
+source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz)
+md5sums=('7a7ab4680e285690ca3625992f477f0f')
+sha1sums=('c714c91224045fa49f261686e985df0aefa1d678')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 < ../qalculate-gtk-0.9.6-cln-config.patch || return 1
- autoconf || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr || return 1
make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR="${pkgdir}" install || return 1
}
Deleted: extra-i686/qalculate-gtk-0.9.6-cln-config.patch
===================================================================
--- extra-i686/qalculate-gtk-0.9.6-cln-config.patch 2010-01-08 07:09:14 UTC (rev 62403)
+++ extra-i686/qalculate-gtk-0.9.6-cln-config.patch 2010-01-08 07:09:35 UTC (rev 62404)
@@ -1,159 +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 -*-
Deleted: extra-i686/qalculate-gtk.install
===================================================================
--- extra-i686/qalculate-gtk.install 2010-01-08 07:09:14 UTC (rev 62403)
+++ extra-i686/qalculate-gtk.install 2010-01-08 07:09:35 UTC (rev 62404)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
More information about the arch-commits
mailing list