From 2c59ca7ba2ef715958c1515eab3656dcc03f100d Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 23 Sep 2003 10:36:46 +0000 Subject: [PATCH] "Stefan Paletta" : gnucash/openhbci updates and fixes git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1484 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/stefanp/gnucash/force-db41.patch | 128 +++++++++++++++++++++++ package/stefanp/gnucash/gnucash.conf | 4 +- package/stefanp/gnucash/gnucash.desc | 6 +- package/tibit/openhbci/openhbci.conf | 31 ++++++ package/tibit/openhbci/openhbci.desc | 7 +- 6 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 package/stefanp/gnucash/force-db41.patch create mode 100644 package/tibit/openhbci/openhbci.conf diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index d230e1961..552a28881 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -4,6 +4,7 @@ - Alejandro Mery: fixed ncurses: +x *.so and libcurses.a adde runit (sysvinit replacement) - Stefan Paletta: updated python (2.3) and other stefanp repository updates + openhbci/gnucash updates and fixes *) 2003-09-21 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/stefanp/gnucash/force-db41.patch b/package/stefanp/gnucash/force-db41.patch new file mode 100644 index 000000000..2c4b2d866 --- /dev/null +++ b/package/stefanp/gnucash/force-db41.patch @@ -0,0 +1,128 @@ +# --- 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 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it 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. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +diff -urN gnucash-1.8.7/configure gnucash-1.8.7-stefanp/configure +--- gnucash-1.8.7/configure 2003-09-15 03:32:52.000000000 +0200 ++++ gnucash-1.8.7-stefanp/configure 2003-09-21 15:41:25.182982992 +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 +@@ -12472,14 +12472,14 @@ + DB_LIBS="-ldb1" + else + echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6 +-echo "configure:12477: 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:12477: 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 +diff -urN gnucash-1.8.7/configure.in gnucash-1.8.7-stefanp/configure.in +--- gnucash-1.8.7/configure.in 2003-09-15 03:18:17.000000000 +0200 ++++ gnucash-1.8.7-stefanp/configure.in 2003-09-21 15:40:20.791771944 +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_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) +@@ -712,7 +712,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_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) +diff -urN gnucash-1.8.7/src/gnome-utils/window-help.c gnucash-1.8.7-stefanp/src/gnome-utils/window-help.c +--- gnucash-1.8.7/src/gnome-utils/window-help.c 2003-01-04 09:11:01.000000000 +0100 ++++ gnucash-1.8.7-stefanp/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 b722b3b86..4ef8067cb 100644 --- a/package/stefanp/gnucash/gnucash.conf +++ b/package/stefanp/gnucash/gnucash.conf @@ -21,5 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-2.conf +. $base/package/*/*/gnome-14.conf +var_append confopt ' ' '--disable-prefer-db1' +[ -f $root/var/adm/packages/openhbci ] && var_append confopt ' ' '--enable-hbci' diff --git a/package/stefanp/gnucash/gnucash.desc b/package/stefanp/gnucash/gnucash.desc index 9f58bf662..a284377a2 100644 --- a/package/stefanp/gnucash/gnucash.desc +++ b/package/stefanp/gnucash/gnucash.desc @@ -32,14 +32,14 @@ [U] http://www.gnucash.org/ [A] User List -[M] Miguel A. Bolanos +[M] Stefan Paletta [C] extra/office [L] GPL [S] Stable -[V] 1.8.4 +[V] 1.8.7 [P] X -----5---9 767.000 -[D] 1837998389 gnucash-1.8.4.tar.gz http://www.gnucash.org/pub/gnucash/sources/stable/ +[D] 2576346813 gnucash-1.8.7.tar.gz http://www.gnucash.org/pub/gnucash/sources/stable/ diff --git a/package/tibit/openhbci/openhbci.conf b/package/tibit/openhbci/openhbci.conf new file mode 100644 index 000000000..5f327e414 --- /dev/null +++ b/package/tibit/openhbci/openhbci.conf @@ -0,0 +1,31 @@ +# --- 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/tibit/openhbci/openhbci.conf +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it 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. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + + +set_docdir () { + if [[ $xsrctar = *plugin-ddvcard* ]] ; then + docdir=$docdir/plugin-ddvcard + mkdir $docdir || true + fi +} + +hook_add preconf 10 set_docdir diff --git a/package/tibit/openhbci/openhbci.desc b/package/tibit/openhbci/openhbci.desc index 9ccfc26d5..bc7cc06a8 100644 --- a/package/tibit/openhbci/openhbci.desc +++ b/package/tibit/openhbci/openhbci.desc @@ -42,8 +42,11 @@ [L] GPL [S] Beta -[V] 0.9.12 +[V] 0.9.13 [P] X -----5---9 692.000 -[D] 645874189 openhbci-0.9.12.tar.gz http://easynews.dl.sourceforge.net/sourceforge/openhbci/ +[SRC] openhbci + +[D] 1610228515 openhbci-0.9.13.tar.gz http://dl.sourceforge.net/sourceforge/openhbci/ +[D] 1541473561 openhbci-plugin-ddvcard-0.3.tar.gz http://dl.sourceforge.net/sourceforge/openhbci/