tags 542263 + patch
thanks
Hi,
This FTBFS bug prevents AqBanking and other dependent applications from
entering testing. Hence I've tried to create a NMU and discovered that there
were more changes needed than simply updating the build dependencies (switch
from libaqbanking20-dev to libaqbanking29-dev). This is due to the ... aged
Gnucash version 2.2.6 available in unstable.
For this patch I've taken the changes from upstream SVN, needed for making
the package build with AqBanking 4.1.2 (current unstable version) again.
All needed source changes are part of the recent stable releases (current
is: 2.2.9).
So please, with sugar on top, consider uploading a current stable release to
the archive. This would even fix some other yet minor important bugs.
The following is the diff for my gnucash 2.2.6-3.1 NMU. I intend to upload
it within the next seven days.
Regards
Micha
diff -u gnucash-2.2.6/debian/changelog gnucash-2.2.6/debian/changelog
--- gnucash-2.2.6/debian/changelog
+++ gnucash-2.2.6/debian/changelog
@@ -1,3 +1,14 @@
+gnucash (2.2.6-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply backported upstream changes needed to make package build with
+ AqBanking 4.x (revisions 17620, 17638, 17703 and 17706 from upstream SVN).
+ All changes are part of current stable release Gnucash 2.2.9.
+ * debian/control: Switch build dependency from libaqbanking20-dev to
+ libaqbanking29-dev (closes: #542263).
+
+ -- Micha Lenk <mi...@lenk.info> Tue, 01 Sep 2009 14:00:44 +0200
+
gnucash (2.2.6-3) unstable; urgency=low
* Patch from upstream:
diff -u gnucash-2.2.6/debian/control gnucash-2.2.6/debian/control
--- gnucash-2.2.6/debian/control
+++ gnucash-2.2.6/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Thomas Bushnell, BSG <t...@debian.org>
Standards-Version: 3.7.2
-Build-Depends: libfinance-quote-perl, guile-1.6-slib, guile-1.6-dev, m4,
gettext, slib (>= 3a2-5), debhelper (>= 4.2.16), zlib1g-dev,
libxml-parser-perl, x11-common, libglib2.0-dev (>= 2.4.7), libxml2-dev (>=
2.4.16), libgtk2.0-dev (>= 2.4.13), libglade2-dev (>= 2.3.6),
libgnomeprint2.2-dev (>= 2.8.0), libgconf2-dev, libgnomeui-dev (>= 2.0.0),
libgsf-gnome-1-dev (>= 1.12.2), libpango1.0-dev (>= 1.6.0), libgtkhtml3.8-dev,
gconf2, libgoffice-0-dev, dpkg-dev (>= 1.13.19), swig, libofx-dev, ofx,
libaqbanking20-dev
+Build-Depends: libfinance-quote-perl, guile-1.6-slib, guile-1.6-dev, m4,
gettext, slib (>= 3a2-5), debhelper (>= 4.2.16), zlib1g-dev,
libxml-parser-perl, x11-common, libglib2.0-dev (>= 2.4.7), libxml2-dev (>=
2.4.16), libgtk2.0-dev (>= 2.4.13), libglade2-dev (>= 2.3.6),
libgnomeprint2.2-dev (>= 2.8.0), libgconf2-dev, libgnomeui-dev (>= 2.0.0),
libgsf-gnome-1-dev (>= 1.12.2), libpango1.0-dev (>= 1.6.0), libgtkhtml3.8-dev,
gconf2, libgoffice-0-dev, dpkg-dev (>= 1.13.19), swig, libofx-dev, ofx,
libaqbanking29-dev
Build-Conflicts: guile-1.8-dev, guile-1.8
Package: gnucash
only in patch2:
unchanged:
--- gnucash-2.2.6.orig/src/import-export/aqbanking/gnc-ab-transfer.c
+++ gnucash-2.2.6/src/import-export/aqbanking/gnc-ab-transfer.c
@@ -97,7 +97,11 @@
g_warning("gnc_ab_maketrans: Couldn't get AqBanking API");
return;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_ab_maketrans: Couldn't initialize AqBanking API");
goto cleanup;
}
@@ -290,6 +294,10 @@
if (td)
gnc_ab_trans_dialog_free(td);
if (online)
- AB_Banking_OnlineFini(api);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
+ AB_Banking_OnlineFini(api);
+#endif
gnc_AB_BANKING_fini(api);
}
only in patch2:
unchanged:
--- gnucash-2.2.6.orig/src/import-export/aqbanking/gnc-ab-gettrans.c
+++ gnucash-2.2.6/src/import-export/aqbanking/gnc-ab-gettrans.c
@@ -119,7 +119,11 @@
g_warning("gnc_ab_gettrans: Couldn't get AqBanking API");
return;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_ab_gettrans: Couldn't initialize AqBanking API");
goto cleanup;
}
@@ -204,6 +208,10 @@
if (from_date)
GWEN_Time_free(from_date);
if (online)
- AB_Banking_OnlineFini(api);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
+ AB_Banking_OnlineFini(api);
+#endif
gnc_AB_BANKING_fini(api);
}
only in patch2:
unchanged:
--- gnucash-2.2.6.orig/src/import-export/aqbanking/gnc-file-aqb-import.c
+++ gnucash-2.2.6/src/import-export/aqbanking/gnc-file-aqb-import.c
@@ -100,7 +100,11 @@
g_warning("gnc_file_aqbanking_import: Couldn't get AqBanking API");
goto cleanup;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_file_aqbanking_import: "
"Couldn't initialize AqBanking API");
goto cleanup;
@@ -199,7 +203,11 @@
if (gui)
gnc_GWEN_Gui_release(gui);
if (online)
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
AB_Banking_OnlineFini(api);
+#endif
if (api)
gnc_AB_BANKING_fini(api);
if (dtaus_fd != -1)
only in patch2:
unchanged:
--- gnucash-2.2.6.orig/src/import-export/aqbanking/gnc-ab-getbalance.c
+++ gnucash-2.2.6/src/import-export/aqbanking/gnc-ab-getbalance.c
@@ -62,7 +62,11 @@
g_warning("gnc_ab_gettrans: Couldn't get AqBanking API");
return;
}
- if (AB_Banking_OnlineInit(api) != 0) {
+ if (AB_Banking_OnlineInit(api
+#ifdef AQBANKING_VERSION_4_PLUS
+ , 0
+#endif
+ ) != 0) {
g_warning("gnc_ab_gettrans: Couldn't initialize AqBanking API");
goto cleanup;
}
@@ -116,6 +120,10 @@
if (job)
AB_Job_free(job);
if (online)
- AB_Banking_OnlineFini(api);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(api, 0);
+#else
+ AB_Banking_OnlineFini(api);
+#endif
gnc_AB_BANKING_fini(api);
}
only in patch2:
unchanged:
--- gnucash-2.2.6.orig/src/import-export/aqbanking/druid-ab-initial.c
+++ gnucash-2.2.6/src/import-export/aqbanking/druid-ab-initial.c
@@ -161,7 +161,11 @@
}
if (info->gnc_hash) {
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(info->api, 0);
+#else
AB_Banking_OnlineFini(info->api);
+#endif
g_hash_table_destroy(info->gnc_hash);
info->gnc_hash = NULL;
}
@@ -323,7 +327,11 @@
info->match_page_prepared = TRUE;
/* Load aqbanking accounts */
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineInit(info->api, 0);
+#else
AB_Banking_OnlineInit(info->api);
+#endif
/* Determine current mapping */
root = gnc_book_get_root_account(gnc_get_current_book());
@@ -362,7 +370,11 @@
g_return_val_if_fail(banking, FALSE);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineInit(banking, 0);
+#else
AB_Banking_OnlineInit(banking);
+#endif
accl = AB_Banking_GetAccounts(banking);
if (accl && (AB_Account_List2_GetSize(accl) > 0))
@@ -373,7 +385,11 @@
if (accl)
AB_Account_List2_free(accl);
+#ifdef AQBANKING_VERSION_4_PLUS
+ AB_Banking_OnlineFini(banking, 0);
+#else
AB_Banking_OnlineFini(banking);
+#endif
return result;
}
only in patch2:
unchanged:
--- gnucash-2.2.6.orig/src/import-export/aqbanking/gnc-ab-utils.h
+++ gnucash-2.2.6/src/import-export/aqbanking/gnc-ab-utils.h
@@ -41,6 +41,13 @@
G_BEGIN_DECLS
+#if (AQBANKING_VERSION_MAJOR > 3) || \
+ ((AQBANKING_VERSION_MAJOR == 3) && \
+ (AQBANKING_VERSION_MINOR >= 99))
+/** Defined if libaqbanking4 as opposed to libaqbanking3 is being used */
+# define AQBANKING_VERSION_4_PLUS
+#endif
+
#define GCONF_SECTION_AQBANKING "dialogs/import/hbci"
#define KEY_FORMAT_SWIFT940 "format_swift_mt940"
#define KEY_FORMAT_SWIFT942 "format_swift_mt942"
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
