Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Don Johnson (45268cccd3436a6dabcd788f2153a0fb3291fe67)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Don Johnson <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Don Johnson (45268cccd3436a6dabcd788f2153a0fb3291fe67)
  • Date: Wed, 12 Aug 2009 22:54:30 -0500

GIT changes to master grimoire by Don Johnson <minozake@felix-desktop.(none)>:

kde4-apps/ktorrent4/DETAILS | 4
kde4-apps/ktorrent4/HISTORY | 3
science-libs/cln/DETAILS | 9
science-libs/cln/HISTORY | 5
science/qalculate/BUILD | 8
science/qalculate/DETAILS | 4
science/qalculate/HISTORY | 8
science/qalculate/PRE_BUILD | 8
science/qalculate/libqalculate-0.9.6-cl_abort.patch | 21 ++
science/qalculate/libqalculate-0.9.6-cln-config.patch | 172
++++++++++++++++++
science/qalculate/libqalculate-0.9.6-gcc4.3.patch | 12 +
11 files changed, 246 insertions(+), 8 deletions(-)

New commits:
commit 45268cccd3436a6dabcd788f2153a0fb3291fe67
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

cln => 1.30.0

commit 2ce3ab3904df839a683d21daeb48892c6d026794
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

qalculate => 0.9.6

commit 9a1ff46363b678f2457707294f5a2a280f96a781
Author: Don Johnson <minozake@felix-desktop.(none)>
Commit: Don Johnson <minozake@felix-desktop.(none)>

ktorrent4 => 3.2.3

diff --git a/kde4-apps/ktorrent4/DETAILS b/kde4-apps/ktorrent4/DETAILS
index 886ea5d..f658981 100755
--- a/kde4-apps/ktorrent4/DETAILS
+++ b/kde4-apps/ktorrent4/DETAILS
@@ -1,6 +1,6 @@
SPELL=ktorrent4
- VERSION=3.2.2
-
SOURCE_HASH=sha512:1c8fe2b907c7ccc2903f0782cb59cf4fd19c7bbb13394b663d6fb5836fa60b6168aeaca312a31c57ef9d20c8f00b805e382c05775036ee61ef801902bb58527f
+ VERSION=3.2.3
+
SOURCE_HASH=sha512:eb216dd0d8588bfa6be54d487a9f5b84ccafa84fb0f763a1e225c058a152b7838c8ce8479499b3d5164a10ca9d68c88125c8bec4711a7ee6f894119684bbe204
SOURCE=${SPELL//4}-${VERSION}.tar.bz2
# SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
SOURCE_URL=http://ktorrent.org/downloads/$VERSION/$SOURCE
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index 088aded..8949d97 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,6 @@
+2009-08-12 Bor Kraljic <pyrobor AT ver.si>
+ * DETAILS: updated spell to 3.2.3
+
2009-06-02 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 3.2.2

diff --git a/science-libs/cln/DETAILS b/science-libs/cln/DETAILS
index abed2cf..e498297 100755
--- a/science-libs/cln/DETAILS
+++ b/science-libs/cln/DETAILS
@@ -1,15 +1,16 @@
SPELL=cln
- VERSION=1.1.11
+ VERSION=1.3.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.ginac.de/$SOURCE
+ SOURCE_URL[0]=http://www.ginac.de/CLN/$SOURCE
SOURCE_URL[1]=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/$SOURCE
-
SOURCE_HASH=sha512:ae5fc1d15d13281eaf8af763b22b92092123f9827ea9a6d542e0db3a0d117823dfad9930e10b1e278023248a02c5715d3b15898f1886f3ebadf6f152133d5a12
+
SOURCE_HASH=sha512:85b01f53d92558ccd3744216f34240aa696378179eee5fc45251e335ed0a17d9163ac8366cd0949ff5f0556e88a49e8801b883f3995f1452ecdf4c7ba238758b
WEB_SITE=http://www.ginac.de/CLN/
ENTERED=2004
LICENSE[0]=GPL
KEYWORDS="science libs"
SHORT="CLN is a library for efficient computations with all kinds
of numbers in arbitrary precision."
cat << EOF
-CLN is a library for efficient computations with all kinds of numbers in
arbitrary precision.
+CLN is a library for efficient computations with all kinds of numbers in
+arbitrary precision.
EOF
diff --git a/science-libs/cln/HISTORY b/science-libs/cln/HISTORY
index 1848baa..119e6a9 100644
--- a/science-libs/cln/HISTORY
+++ b/science-libs/cln/HISTORY
@@ -1,3 +1,8 @@
+2009-08-12 Bor Kraljic <pyrobor AT ver.si>
+ * DETAILS: Fixed SOURCE_URL[0]
+ fixed long description wrap
+ updated spell to 1.3.0
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/science/qalculate/BUILD b/science/qalculate/BUILD
new file mode 100755
index 0000000..f88004c
--- /dev/null
+++ b/science/qalculate/BUILD
@@ -0,0 +1,8 @@
+cd $SOURCE_DIRECTORY &&
+autoconf &&
+OPTS="${!tempopts} $OPTS" &&
+OPTS="$OPTS --build=${BUILD}" &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --disable-clntest \
+ $OPTS &&
+default_build_make
diff --git a/science/qalculate/DETAILS b/science/qalculate/DETAILS
index 7c50a48..39af820 100755
--- a/science/qalculate/DETAILS
+++ b/science/qalculate/DETAILS
@@ -1,9 +1,9 @@
SPELL=qalculate
- VERSION=0.9.4
+ VERSION=0.9.6
SOURCE=libqalculate-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libqalculate-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/qalculate/$SOURCE
-
SOURCE_HASH=sha512:b87e89b8135c48c67d6c0de9fbcfd9bb354009b363fdba600dee037c56e42bafd019588fcb21b5ae28338cf06b1f2b8a16212c7dfcca60f421b92667cfe866c5
+
SOURCE_HASH=sha512:cca08c1f38c05fa8cdf59f76d561808fc902961499bec952062c4c01b0bac12e9e19ded4f938179e74105f103b472a7457eeccb306be8dc4f5dadff90cf1266c
WEB_SITE=http://qalculate.sourceforge.net/
ENTERED=20050208
LICENSE[0]=GPL
diff --git a/science/qalculate/HISTORY b/science/qalculate/HISTORY
index 5a5e259..b4eb240 100644
--- a/science/qalculate/HISTORY
+++ b/science/qalculate/HISTORY
@@ -1,3 +1,11 @@
+2009-08-12 Bor Kraljic <pyrobor AT ver.si>
+ * libqalculate-0.9.6-gcc4.3.patch: added from arch liux to compile
+ * libqalculate-0.9.6-cl_abort.patch: added from arch liux to compile
+ * libqalculate-0.9.6-cln-config.patch: added from arch liux to compile
+ * BUILD: added autoconf and --disable-clntest
+ * PRE_BUILD: changed apply the pathes
+ * DETAILS: updated spell to 0.9.6
+
2007-03-24 Jeremy Blosser <jblosser-smgl AT firinn.org>
* DEPENDS: Add xml-parser-expat, bug 11727.

diff --git a/science/qalculate/PRE_BUILD b/science/qalculate/PRE_BUILD
new file mode 100755
index 0000000..2ee55a5
--- /dev/null
+++ b/science/qalculate/PRE_BUILD
@@ -0,0 +1,8 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack_file &&
+cd $SOURCE_DIRECTORY &&
+echo "PATCHING" &&
+patch -p1 < $SPELL_DIRECTORY/libqalculate-0.9.6-cln-config.patch &&
+patch -p1 < $SPELL_DIRECTORY/libqalculate-0.9.6-cl_abort.patch &&
+patch -p1 < $SPELL_DIRECTORY/libqalculate-0.9.6-gcc4.3.patch
+#patch -p1 < $SPELL_DIRECTORY/cln-patch1.patch
diff --git a/science/qalculate/libqalculate-0.9.6-cl_abort.patch
b/science/qalculate/libqalculate-0.9.6-cl_abort.patch
new file mode 100644
index 0000000..a9859b7
--- /dev/null
+++ b/science/qalculate/libqalculate-0.9.6-cl_abort.patch
@@ -0,0 +1,21 @@
+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) {
+
diff --git a/science/qalculate/libqalculate-0.9.6-cln-config.patch
b/science/qalculate/libqalculate-0.9.6-cln-config.patch
new file mode 100644
index 0000000..b1598d5
--- /dev/null
+++ b/science/qalculate/libqalculate-0.9.6-cln-config.patch
@@ -0,0 +1,172 @@
+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@
+
diff --git a/science/qalculate/libqalculate-0.9.6-gcc4.3.patch
b/science/qalculate/libqalculate-0.9.6-gcc4.3.patch
new file mode 100644
index 0000000..53bf5ec
--- /dev/null
+++ b/science/qalculate/libqalculate-0.9.6-gcc4.3.patch
@@ -0,0 +1,12 @@
+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))
+



  • [SM-Commit] GIT changes to master grimoire by Don Johnson (45268cccd3436a6dabcd788f2153a0fb3291fe67), Don Johnson, 08/12/2009

Archive powered by MHonArc 2.6.24.

Top of Page