diff --git a/package/stefanp/gnucash/force-db41.patch b/package/stefanp/gnucash/force-db41.patch deleted file mode 100644 index ae4ab0e9e..000000000 --- a/package/stefanp/gnucash/force-db41.patch +++ /dev/null @@ -1,122 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/stefanp/gnucash/force-db41.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./configure.orig 2004-09-07 03:16:09.662088768 +0200 -+++ ./configure 2004-09-07 03:24:43.796928392 +0200 -@@ -12265,14 +12265,14 @@ - DB_LIBS="-ldb" - else - echo "$ac_t""no" 1>&6 --echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6 --echo "configure:12270: checking for __db185_open in -ldb-3" >&5 --ac_lib_var=`echo db-3'_'__db185_open | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for __db185_open in -ldb-4.1""... $ac_c" 1>&6 -+echo "configure:12270: checking for __db185_open in -ldb-4.1" >&5 -+ac_lib_var=`echo db-4.1'_'__db185_open | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ldb-3 $LIBS" -+LIBS="-ldb-4.1 $LIBS" - cat > conftest.$ac_ext <&6 -- DB_LIBS="-ldb-3" -+ DB_LIBS="-ldb-4.1" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for __db185_open in -ldb-4.0""... $ac_c" 1>&6 -@@ -12478,14 +12478,14 @@ - fi - - else -- echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 --echo "configure:12483: checking for dbopen in -ldb" >&5 --ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for dbopen in -ldb-4.1""... $ac_c" 1>&6 -+echo "configure:12483: checking for dbopen in -ldb-4.1" >&5 -+ac_lib_var=`echo db-4.1'_'dbopen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ldb $LIBS" -+LIBS="-ldb-4.1 $LIBS" - cat > conftest.$ac_ext <&6 -- DB_LIBS="-ldb" -+ DB_LIBS="-ldb-4.1" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6 ---- ./configure.in.orig 2004-09-07 03:16:19.715560408 +0200 -+++ ./configure.in 2004-09-07 03:26:30.021779760 +0200 -@@ -700,7 +700,7 @@ - if test "$prefer_db1" = "yes"; then - AC_CHECK_LIB(db1, dbopen, DB_LIBS="-ldb1", - AC_CHECK_LIB(db, dbopen, DB_LIBS="-ldb", -- AC_CHECK_LIB(db-3, __db185_open, DB_LIBS="-ldb-3", -+ AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1", - AC_CHECK_LIB(db-4.0, __db185_open, DB_LIBS="-ldb-4.0", - AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1", - AC_CHECK_LIB(db-4.2, __db185_open, DB_LIBS="-ldb-4.2", -@@ -716,7 +716,7 @@ - else - AC_CHECK_LIB(db, dbopen, DB_LIBS="-ldb", - AC_CHECK_LIB(db1, dbopen, DB_LIBS="-ldb1", -- AC_CHECK_LIB(db-3, __db185_open, DB_LIBS="-ldb-3", -+ AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1", - AC_CHECK_LIB(db-4.0, __db185_open, DB_LIBS="-ldb-4.0", - AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1", - AC_CHECK_LIB(db-4.2, __db185_open, DB_LIBS="-ldb-4.2", ---- ./src/gnome-utils/window-help.c 2003-01-04 09:11:01.000000000 +0100 -+++ ./src/gnome-utils/window-help.c 2003-09-21 15:40:20.792771792 +0200 -@@ -53,13 +53,17 @@ - # endif - #endif - #else --#ifdef HAVE_DB_185_H --# include -+#ifdef HAVE_DB4_DB_185_H -+#include - #else --# ifdef HAVE_DB_H --# include -+# ifdef HAVE_DB_185_H -+# include - # else --# include -+# ifdef HAVE_DB_H -+# include -+# else -+# include -+# endif - # endif - #endif - #endif diff --git a/package/stefanp/gnucash/gnucash.conf b/package/stefanp/gnucash/gnucash.conf index 7caa967f4..c28e72841 100644 --- a/package/stefanp/gnucash/gnucash.conf +++ b/package/stefanp/gnucash/gnucash.conf @@ -20,10 +20,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/gnome14/gnome-14.conf +. $base/package/gnome2/gnome-2.conf -var_append confopt ' ' '--disable-prefer-db1' -[ -f $root/var/adm/packages/openhbci ] && var_append confopt ' ' '--enable-hbci' +pkginstalled openhbci && var_append confopt ' ' '--enable-hbci' # when building with -O1, gcc thinks that a variable # might be used uninitialised, which triggers a warning diff --git a/package/stefanp/gnucash/gnucash.desc b/package/stefanp/gnucash/gnucash.desc index 080549982..b48b27f51 100644 --- a/package/stefanp/gnucash/gnucash.desc +++ b/package/stefanp/gnucash/gnucash.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 1.8.9 +[V] 2.0.0 [P] X -?---5---9 176.600 -[D] 1122745960 gnucash-1.8.9.tar.gz http://www.gnucash.org/pub/gnucash/sources/stable/ +[D] 125422317 gnucash-2.0.0.tar.gz http://www.gnucash.org/pub/gnucash/sources/stable/