From 7ac3aa9883585f91134aea041ea09e65267480da Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Apr 24 2013 19:37:17 +0000 Subject: Merge branch 'f18' into f17 --- diff --git a/.gitignore b/.gitignore index a912761..a5aa2d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/gnucash-2.4.11.tar.bz2 +/gnucash-2.4.13.tar.bz2 diff --git a/engine-common.i b/engine-common.i deleted file mode 100644 index 73caa34..0000000 --- a/engine-common.i +++ /dev/null @@ -1,31 +0,0 @@ -%inline %{ -static const GncGUID * gncSplitGetGUID(Split *x) -{ return qof_instance_get_guid(QOF_INSTANCE(x)); } -static const GncGUID * gncTransGetGUID(Transaction *x) -{ return qof_instance_get_guid(QOF_INSTANCE(x)); } -static const GncGUID * gncAccountGetGUID(Account *x) -{ return qof_instance_get_guid(QOF_INSTANCE(x)); } -%} - -%typemap(newfree) AccountList * "g_list_free($1);" -%typemap(newfree) SplitList * "g_list_free($1);" -%typemap(newfree) TransList * "g_list_free($1);" -%typemap(newfree) PriceList * "g_list_free($1);" -%typemap(newfree) LotList * "g_list_free($1);" -%typemap(newfree) CommodityList * "g_list_free($1);" - -%include - -AccountList * gnc_account_get_children (const Account *account); -AccountList * gnc_account_get_children_sorted (const Account *account); -AccountList * gnc_account_get_descendants (const Account *account); -AccountList * gnc_account_get_descendants_sorted (const Account *account); -%ignore gnc_account_get_children; -%ignore gnc_account_get_children_sorted; -%ignore gnc_account_get_descendants; -%ignore gnc_account_get_descendants_sorted; -%include - -%include - -%include diff --git a/gnucash-guile-1.patch b/gnucash-guile-1.patch deleted file mode 100644 index 431439e..0000000 --- a/gnucash-guile-1.patch +++ /dev/null @@ -1,117 +0,0 @@ -commit cab4dc5a959f150a4d0f7514d3e87e4dd3ae2e7b -Author: Geert Janssens -Date: Mon Mar 21 15:09:43 2011 +0000 - - [PATCH 1/4] Bug #615168: Remove spurious (require 'hash-table) instances - - Patch by Andy Wingo. - - There is nothing that the slib hash-table module provides that was used - in any of these files; they all used Guile's stock hash tables. - - git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20435 57a11ea4-9604-0410-9ed3-97b8803252fd - -diff --git a/src/app-utils/c-interface.scm b/src/app-utils/c-interface.scm -index 9827d21..10837a4 100644 ---- a/src/app-utils/c-interface.scm -+++ b/src/app-utils/c-interface.scm -@@ -18,8 +18,6 @@ - (use-modules (ice-9 slib)) - (use-modules (ice-9 syncase)) - --(require 'hash-table) -- - (define (gnc:error->string tag args) - (define (write-error port) - (if (and (list? args) (not (null? args))) -diff --git a/src/app-utils/prefs.scm b/src/app-utils/prefs.scm -index d460646..a0ee256 100644 ---- a/src/app-utils/prefs.scm -+++ b/src/app-utils/prefs.scm -@@ -17,8 +17,6 @@ - ;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 - ;; Boston, MA 02110-1301, USA gnu@gnu.org - --(require 'hash-table) -- - ;; (define gnc:*double-entry-restriction* - ;; (gnc:make-config-var - ;; "Determines how the splits in a transaction will be balanced. -diff --git a/src/report/business-reports/aging.scm b/src/report/business-reports/aging.scm -index aa2bfeb..60beb9e 100644 ---- a/src/report/business-reports/aging.scm -+++ b/src/report/business-reports/aging.scm -@@ -31,8 +31,6 @@ - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) - --(require 'hash-table) -- - (gnc:module-load "gnucash/report/report-system" 0) - (gnc:module-load "gnucash/business-core" 0) - -diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm -index 59101c9..13e0adb 100644 ---- a/src/report/business-reports/easy-invoice.scm -+++ b/src/report/business-reports/easy-invoice.scm -@@ -35,8 +35,6 @@ - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) - --(require 'hash-table) -- - (gnc:module-load "gnucash/report/report-system" 0) - (gnc:module-load "gnucash/business-utils" 0) - -diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm -index f568841..344c9b5 100644 ---- a/src/report/business-reports/fancy-invoice.scm -+++ b/src/report/business-reports/fancy-invoice.scm -@@ -53,8 +53,6 @@ - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) - --(require 'hash-table) -- - (gnc:module-load "gnucash/report/report-system" 0) - (gnc:module-load "gnucash/business-utils" 0) - -diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm -index a2b1fd8..32cf062 100644 ---- a/src/report/business-reports/invoice.scm -+++ b/src/report/business-reports/invoice.scm -@@ -29,8 +29,6 @@ - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) - --(require 'hash-table) -- - (gnc:module-load "gnucash/report/report-system" 0) - (gnc:module-load "gnucash/business-utils" 0) - -diff --git a/src/report/report-system/report-system.scm b/src/report/report-system/report-system.scm -index 3043314..aaa1a3e 100644 ---- a/src/report/report-system/report-system.scm -+++ b/src/report/report-system/report-system.scm -@@ -13,8 +13,6 @@ - (use-modules (srfi srfi-19)) - (use-modules (gnucash gnc-module)) - --(require 'hash-table) -- - (gnc:module-load "gnucash/engine" 0) - (gnc:module-load "gnucash/app-utils" 0) - (gnc:module-load "gnucash/html" 0) -diff --git a/src/report/standard-reports/standard-reports.scm b/src/report/standard-reports/standard-reports.scm -index 272225c..d30b9a3 100644 ---- a/src/report/standard-reports/standard-reports.scm -+++ b/src/report/standard-reports/standard-reports.scm -@@ -14,8 +14,6 @@ - (export gnc:register-report-create) - (export gnc:register-report-hook) - --(require 'hash-table) -- - (define gnc:*register-report-hash* (make-hash-table 23)) - - ;; Keep a hash-table of records, keyed off the account type. Each diff --git a/gnucash-guile-2.patch b/gnucash-guile-2.patch deleted file mode 100644 index 6d9eba5..0000000 --- a/gnucash-guile-2.patch +++ /dev/null @@ -1,97 +0,0 @@ -commit 42600d30188a4ee11c815b72066399496ed9854c -Author: Geert Janssens -Date: Mon Mar 21 15:09:54 2011 +0000 - - [PATCH 2/4] Bug #615168: Remove instances of (use-modules (ice-9 slib)) - - There are no more instances of (require ...), so Guile's slib support is - no longer needed. - - Patch by Andy Wingo. - - git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20436 57a11ea4-9604-0410-9ed3-97b8803252fd - -diff --git a/src/app-utils/c-interface.scm b/src/app-utils/c-interface.scm -index 10837a4..548e3bb 100644 ---- a/src/app-utils/c-interface.scm -+++ b/src/app-utils/c-interface.scm -@@ -15,7 +15,6 @@ - ;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 - ;; Boston, MA 02110-1301, USA gnu@gnu.org - --(use-modules (ice-9 slib)) - (use-modules (ice-9 syncase)) - - (define (gnc:error->string tag args) -diff --git a/src/report/business-reports/aging.scm b/src/report/business-reports/aging.scm -index 60beb9e..6047baa 100644 ---- a/src/report/business-reports/aging.scm -+++ b/src/report/business-reports/aging.scm -@@ -26,7 +26,6 @@ - - (define-module (gnucash report aging)) - --(use-modules (ice-9 slib)) - (use-modules (gnucash main)) - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) -diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm -index 13e0adb..10d74e3 100644 ---- a/src/report/business-reports/easy-invoice.scm -+++ b/src/report/business-reports/easy-invoice.scm -@@ -31,7 +31,6 @@ - (define-module (gnucash report easy-invoice)) - - (use-modules (srfi srfi-1)) --(use-modules (ice-9 slib)) - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) - -diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm -index 344c9b5..f6563c1 100644 ---- a/src/report/business-reports/fancy-invoice.scm -+++ b/src/report/business-reports/fancy-invoice.scm -@@ -49,7 +49,6 @@ - (define-module (gnucash report fancy-invoice)) - - (use-modules (srfi srfi-1)) --(use-modules (ice-9 slib)) - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) - -diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm -index 32cf062..5e7ca86 100644 ---- a/src/report/business-reports/invoice.scm -+++ b/src/report/business-reports/invoice.scm -@@ -25,7 +25,6 @@ - (define-module (gnucash report invoice)) - - (use-modules (srfi srfi-1)) --(use-modules (ice-9 slib)) - (use-modules (gnucash printf)) - (use-modules (gnucash gnc-module)) - -diff --git a/src/report/report-system/report-system.scm b/src/report/report-system/report-system.scm -index aaa1a3e..ca11ae2 100644 ---- a/src/report/report-system/report-system.scm -+++ b/src/report/report-system/report-system.scm -@@ -7,7 +7,6 @@ - - (define-module (gnucash report report-system)) - (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing. --(use-modules (ice-9 slib)) - (use-modules (ice-9 regex)) - (use-modules (srfi srfi-1)) - (use-modules (srfi srfi-19)) -diff --git a/src/report/standard-reports/standard-reports.scm b/src/report/standard-reports/standard-reports.scm -index d30b9a3..c51eea7 100644 ---- a/src/report/standard-reports/standard-reports.scm -+++ b/src/report/standard-reports/standard-reports.scm -@@ -6,7 +6,6 @@ - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - (define-module (gnucash report standard-reports)) --(use-modules (ice-9 slib)) - (use-modules (srfi srfi-13)) - (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing. - (use-modules (gnucash core-utils)) diff --git a/gnucash-guile-3.patch b/gnucash-guile-3.patch deleted file mode 100644 index 02efa6a..0000000 --- a/gnucash-guile-3.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 7bb977c0e9fcd25bcfefca9e0e9e9c81df5e7153 -Author: Geert Janssens -Date: Mon Mar 21 15:10:03 2011 +0000 - - [PATCH 3/4] Bug #615168: Remove configure.in check for slib - - Gnucash no longer requires slib. - - Patch by Andy Wingo. - - git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20437 57a11ea4-9604-0410-9ed3-97b8803252fd - -diff --git a/configure.ac b/configure.ac -index b781c81..7bd9395 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -424,20 +424,6 @@ AM_GUILE_VERSION_CHECK(1.8.0, , [ - - AS_SCRUB_INCLUDE(CFLAGS) - --AC_MSG_CHECKING([for SLIB support]) --if ${GUILE} -c "(use-modules (ice-9 slib)) (require 'printf)" > /dev/null 2>&1 --then -- AC_MSG_RESULT(yes) --else -- AC_MSG_ERROR([ -- --Cannot find SLIB. Are you sure you have it installed? --See http://bugzilla.gnome.org/show_bug.cgi?id=347922 --and http://bugzilla.gnome.org/show_bug.cgi?id=483631 -- --]) --fi -- - ### Check size of long_long - some guile's are broken. - AC_MSG_CHECKING(if guile long_long is at least as big as gint64) - GNC_OLDCFLAGS="$CFLAGS" diff --git a/gnucash-guile-4.patch b/gnucash-guile-4.patch deleted file mode 100644 index 91856ba..0000000 --- a/gnucash-guile-4.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit 2515ab983f2c4cb4e7e1e9bc405cb427833148d8 -Author: Geert Janssens -Date: Mon Mar 21 15:10:12 2011 +0000 - - [PATCH 4/4] Bug #615168: N_ in the root module - - * src/app-utils/app-utils.scm: - * src/app-utils/c-interface.scm: Make N_ available to all of Gnucash. A - hack, but a correct hack that permits the Scheme code to be compiled. - - Patch by Andy Wingo. - - git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20438 57a11ea4-9604-0410-9ed3-97b8803252fd - -diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm -index 2c64b12..3b00d50 100644 ---- a/src/app-utils/app-utils.scm -+++ b/src/app-utils/app-utils.scm -@@ -273,6 +273,22 @@ - (define gnc:*kvp-option-path* (list KVP-OPTION-PATH)) - (export gnc:*kvp-option-path*) - -+;; gettext functions -+(define gnc:gettext gnc-gettext-helper) -+(define gnc:_ gnc:gettext) -+(define _ gnc:gettext) -+(define-syntax N_ -+ (syntax-rules () -+ ((_ x) x))) -+ -+;; A lot of Gnucash's code uses procedural interfaces to load modules. -+;; This normally works, for procedures -- but for values that need to be -+;; known at expand time, like macros, it doesn't work (in Guile 2.0 at -+;; least). So instead of auditing all the code, since N_ is really the -+;; only Gnucash-defined macro in use, the surgical solution is just to -+;; make N_ available everywhere. -+(module-define! the-root-module 'N_ (module-ref (current-module) 'N_)) -+ - (load-from-path "c-interface.scm") - (load-from-path "config-var.scm") - (load-from-path "options.scm") -diff --git a/src/app-utils/c-interface.scm b/src/app-utils/c-interface.scm -index 548e3bb..0f912a3 100644 ---- a/src/app-utils/c-interface.scm -+++ b/src/app-utils/c-interface.scm -@@ -37,15 +37,6 @@ - (call-with-output-string write-error))) - - --;; gettext functions --(define gnc:gettext gnc-gettext-helper) --(define gnc:_ gnc:gettext) --(define _ gnc:gettext) --(define-syntax N_ -- (syntax-rules () -- ((_ x) x))) -- -- - ;; This database can be used to store and retrieve translatable - ;; strings. Strings that are returned by the lookup function are - ;; translated with gettext. diff --git a/gnucash-guile-5.patch b/gnucash-guile-5.patch deleted file mode 100644 index 26b10cf..0000000 --- a/gnucash-guile-5.patch +++ /dev/null @@ -1,161 +0,0 @@ -commit 60eafca7cbc69651fc0f2795a1b3a20b22d54795 -Author: Geert Janssens -Date: Mon Mar 21 15:10:40 2011 +0000 - - Require guile 1.8.5 and remove all 1.6.x specific conditions - - git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20441 57a11ea4-9604-0410-9ed3-97b8803252fd - -diff --git a/configure.ac b/configure.ac -index 7bd9395..3656931 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -403,11 +403,11 @@ fi - AS_SCRUB_INCLUDE(GUILE_INCS) - AC_SUBST(GUILE_LIBS) - --AM_GUILE_VERSION_CHECK(1.6.7, , , [AC_MSG_ERROR([ -+AM_GUILE_VERSION_CHECK(1.8.5, , , [AC_MSG_ERROR([ - - guile does not appear to be installed correctly, or is not in the - correct version range. Perhaps you have not installed the guile -- development packages? Gnucash requires at least version 1.6.7 to build. -+ development packages? Gnucash requires at least version 1.8.5 to build. - ])]) - - AC_SUBST(GUILE) -@@ -418,10 +418,6 @@ AC_DEFINE_UNQUOTED(GNC_GUILE_MINOR_VERSION, ${guile_minor_version}, - AC_DEFINE_UNQUOTED(GNC_GUILE_MICRO_VERSION, ${guile_micro_version}, - [Guile Micro version number]) - --AM_GUILE_VERSION_CHECK(1.8.0, , [ -- AC_DEFINE(HAVE_GUILE18,1,[System has guile 1.8 or better]) --], ) -- - AS_SCRUB_INCLUDE(CFLAGS) - - ### Check size of long_long - some guile's are broken. -diff --git a/src/app-utils/guile-util.c b/src/app-utils/guile-util.c -index d21afc3..2fcddbc 100644 ---- a/src/app-utils/guile-util.c -+++ b/src/app-utils/guile-util.c -@@ -1327,6 +1327,6 @@ gchar *gnc_scm_to_locale_string(SCM scm_string) - /* scm_to_locale_string() returns a malloc'ed string in guile-1.8 - (but not in guile-1.6). Copy to a g_malloc'ed one. */ - s = g_strdup(x); -- gnc_free_scm_locale_string(x); -+ free(x); - return s; - } -diff --git a/src/engine/engine-helpers.c b/src/engine/engine-helpers.c -index 951a3a1..8f1bf5d 100644 ---- a/src/engine/engine-helpers.c -+++ b/src/engine/engine-helpers.c -@@ -1718,10 +1718,6 @@ gnc_query2scm (QofQuery *q) - - if (!q) return SCM_BOOL_F; - --#ifndef HAVE_GUILE18 -- ++scm_block_gc; --#endif -- - /* terms */ - pair = scm_cons (gnc_query_terms2scm (qof_query_get_terms (q)), SCM_EOL); - pair = scm_cons (scm_str2symbol ("terms"), pair); -@@ -1757,9 +1753,6 @@ gnc_query2scm (QofQuery *q) - - /* Reverse this list; tag it as 'query-v2' */ - pair = scm_reverse (query_scm); --#ifndef HAVE_GUILE18 -- --scm_block_gc; --#endif - return scm_cons (scm_str2symbol ("query-v2"), pair); - } - -@@ -2019,10 +2012,6 @@ gnc_scm2query_v2 (SCM query_scm) - gboolean si1 = TRUE, si2 = TRUE, si3 = TRUE; - int max_results = -1; - --#ifndef HAVE_GUILE18 -- ++scm_block_gc; --#endif -- - while (!scm_is_null (query_scm)) - { - const gchar *symbol; -@@ -2123,10 +2112,6 @@ gnc_scm2query_v2 (SCM query_scm) - } - } - --#ifndef HAVE_GUILE18 -- --scm_block_gc; --#endif -- - if (ok && search_for) - { - qof_query_search_for (q, search_for); -diff --git a/src/engine/engine.i b/src/engine/engine.i -index 0e8d431..b87f294 100644 ---- a/src/engine/engine.i -+++ b/src/engine/engine.i -@@ -141,7 +141,7 @@ gchar * gnc_build_book_path (const gchar *filename); - - key = scm_to_locale_string (key_scm); - gkey = g_strdup (key); -- gnc_free_scm_locale_string(key); -+ free (key); - - path = g_list_prepend (path, gkey); - -diff --git a/src/gnome-utils/gnc-menu-extensions.c b/src/gnome-utils/gnc-menu-extensions.c -index 95743f2..a7b586d 100644 ---- a/src/gnome-utils/gnc-menu-extensions.c -+++ b/src/gnome-utils/gnc-menu-extensions.c -@@ -184,7 +184,7 @@ gnc_extension_path (SCM extension, char **fullpath) - { - strings[i] = g_strdup(gettext(s)); - } -- gnc_free_scm_locale_string(s); -+ free(s); - } - else - { -diff -up gnucash-2.4.8/src/guile-mappings.h.cow gnucash-2.4.8/src/guile-mappings.h ---- gnucash-2.4.8/src/guile-mappings.h.cow 2011-10-17 12:51:50.000000000 -0400 -+++ gnucash-2.4.8/src/guile-mappings.h 2011-10-25 17:00:26.418076314 -0400 -@@ -19,33 +19,11 @@ - - #include /* for SCM_MAJOR_VERSION etc */ - --/* Give Guile 1.6 and 1.8 a 2.0-like interface */ --#if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6) --# define scm_is_bool SCM_BOOLP --# define scm_is_false SCM_FALSEP --# define scm_is_null SCM_NULLP --# define scm_is_number SCM_NUMBERP --# define scm_is_pair SCM_CONSP --# define scm_is_string SCM_STRINGP --# define scm_is_symbol SCM_SYMBOLP --# define scm_is_true SCM_NFALSEP --# define scm_is_vector SCM_VECTORP --# define scm_c_string_length SCM_STRING_LENGTH --#elif (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 8) -+/* Give Guile 1.8 a 2.0-like interface */ -+#if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 8) - # define scm_c_string_length scm_i_string_length - #endif - --/* The result of SCM_STRING_CHARS must not be free'd, but the result -- * of scm_to_locale_string must. That's bad. We define the macro -- * gnc_free_scm_locale_string to wrap around free() for that -- * reason. */ --#if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6) --# define scm_to_locale_string SCM_STRING_CHARS --# define gnc_free_scm_locale_string (void) --#else --# define gnc_free_scm_locale_string free --#endif -- - /* Convenience macros */ - - #define scm_is_equal(obj1,obj2) scm_is_true(scm_equal_p(obj1,obj2)) diff --git a/gnucash-guile-6.patch b/gnucash-guile-6.patch deleted file mode 100644 index 5fdb1e4..0000000 --- a/gnucash-guile-6.patch +++ /dev/null @@ -1,196 +0,0 @@ -commit 68999be213755c14b27b89cdca2dfd5bb569b82c -Author: Christian Stimming -Date: Fri Apr 22 19:43:39 2011 +0000 - - Replace guile configure check by PKG_CHECK_MODULE so that it also works in cross-compiling. - - git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20585 57a11ea4-9604-0410-9ed3-97b8803252fd - -diff --git a/Makefile.am b/Makefile.am -index 012ed5b..965873e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -45,7 +45,6 @@ EXTRA_DIST = \ - macros/binreloc.m4 \ - macros/compiler-flags.m4 \ - macros/ac_pkg_swig.m4 \ -- macros/gnome-guile-checks.m4 \ - macros/legacy_macros.m4 \ - po/gnucash.pot \ - po/POTFILES.in \ -diff --git a/configure.ac b/configure.ac -index 54c3fc4..8a0f501 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -368,8 +368,18 @@ if test "x$GUILE_INCS" != x; then - saved_GUILE_INCS="$GUILE_INCS" - fi - GUILE_LIBS="" --GNOME_CHECK_GUILE - -+# Look up GUILE_CFLAGS and GUILE_LIBS, and version check -+PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5], , [AC_MSG_ERROR([ -+ -+ guile does not appear to be installed correctly, or is not in the -+ correct version range. Perhaps you have not installed the guile -+ development packages? Gnucash requires at least version 1.8.5 to build. -+])]) -+# Look up GUILE executable -+AC_PATH_PROG(GUILE, guile) -+ -+GUILE_INCS="${GUILE_CFLAGS}" - if test "x$saved_GUILE_LIBS" != x; then - GUILE_LIBS="$saved_GUILE_LIBS" - fi -@@ -379,26 +389,12 @@ fi - - AS_SCRUB_INCLUDE(GUILE_INCS) - AC_SUBST(GUILE_LIBS) -- --AM_GUILE_VERSION_CHECK(1.8.5, , , [AC_MSG_ERROR([ -- -- guile does not appear to be installed correctly, or is not in the -- correct version range. Perhaps you have not installed the guile -- development packages? Gnucash requires at least version 1.8.5 to build. --])]) -- - AC_SUBST(GUILE) --AC_DEFINE_UNQUOTED(GNC_GUILE_MAJOR_VERSION, ${guile_major_version}, -- [Guile Major version number]) --AC_DEFINE_UNQUOTED(GNC_GUILE_MINOR_VERSION, ${guile_minor_version}, -- [Guile Minor version number]) --AC_DEFINE_UNQUOTED(GNC_GUILE_MICRO_VERSION, ${guile_micro_version}, -- [Guile Micro version number]) - --AS_SCRUB_INCLUDE(CFLAGS) - - ### Check size of long_long - some guile's are broken. - AC_MSG_CHECKING(if guile long_long is at least as big as gint64) -+AS_SCRUB_INCLUDE(CFLAGS) - GNC_OLDCFLAGS="$CFLAGS" - GNC_OLDLDFLAGS="$LDFLAGS" - CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}" -diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4 -deleted file mode 100644 -index da2aa93..0000000 ---- a/macros/gnome-guile-checks.m4 -+++ /dev/null -@@ -1,118 +0,0 @@ --dnl --dnl GNOME_CHECK_GUILE (failflag) --dnl --dnl if failflag is "fail" then GNOME_CHECK_GUILE will abort if guile is not found. --dnl -- --AC_DEFUN([GNOME_CHECK_GUILE], --[ -- saved_ldflags="$LDFLAGS" -- saved_cppflags="$CPPFLAGS" -- LDFLAGS="$LDFLAGS $GNOME_LIBDIR" -- -- AC_CHECK_LIB(qthreads,qt_null,[ -- QTTHREADS_LIB="-lqthreads" -- ],[ -- AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt") -- ],$LIBS) -- AC_SUBST(QTTHREADS_LIB) -- -- AC_CHECK_LIB(termcap,main,TERMCAP_LIB="-ltermcap") -- AC_CHECK_LIB(readline,main,READLINE_LIB="-lreadline",,$TERMCAP_LIB) -- -- AC_SUBST(TERMCAP_LIB) -- AC_SUBST(READLINE_LIB) -- -- if test "x$cross_compiling" = "xyes" ; then -- name_build_guile="$target_alias-guile-config" -- else -- name_build_guile="guile-config" -- fi -- -- AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no) -- -- if test "x$BUILD_GUILE" = "xyes"; then -- AC_MSG_CHECKING(whether $name_build_guile works) -- if test x`$name_build_guile --version >/dev/null 2>&1 || \ -- echo no` = xno; then -- BUILD_GUILE=no -- fi -- AC_MSG_RESULT($BUILD_GUILE) -- else -- -- if test "x$cross_compiling" = "xyes" ; then -- name_build_guile="$target_alias-build-guile" -- else -- name_build_guile="build-guile" -- fi -- -- AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no) -- -- if test "x$BUILD_GUILE" = "xyes"; then -- AC_MSG_CHECKING(whether $name_build_guile works) -- if test x`$name_build_guile --version >/dev/null 2>&1 || \ -- echo no` = xno; then -- BUILD_GUILE=no -- fi -- AC_MSG_RESULT($BUILD_GUILE) -- fi -- fi -- -- AC_CHECK_LIB(m, sin) -- -- if test "x$BUILD_GUILE" = "xyes"; then -- AC_MSG_CHECKING(for guile libraries) -- GUILE_LIBS="`$name_build_guile link`" -- AC_MSG_RESULT($GUILE_LIBS) -- AC_MSG_CHECKING(for guile headers) -- GUILE_INCS="`$name_build_guile compile`" -- AC_MSG_RESULT($GUILE_INCS) -- else -- GUILE_LIBS="$GNOME_LIBDIR" -- GUILE_INCS="$GNOME_INCLUDEDIR" -- AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS") -- AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS") -- AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS") -- AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl") -- AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket") -- GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB" -- fi -- -- AC_SUBST(GUILE_LIBS) -- AC_SUBST(GUILE_INCS) -- -- saved_LIBS="$LIBS" -- LIBS="$LIBS $GUILE_LIBS" -- CPPFLAGS="$saved_cppflags $GUILE_INCS" -- -- AC_MSG_CHECKING(whether guile works) -- AC_TRY_LINK([ -- #include -- ],[ -- scm_c_eval_string("(newline)"); -- scm_boot_guile(0,NULL,NULL,NULL); -- ],[ -- ac_cv_guile_found=yes -- AC_DEFINE(HAVE_GUILE,1,[Guile present]) -- ],[ -- ac_cv_guile_found=no -- ]) -- AC_MSG_RESULT($ac_cv_guile_found) -- -- if test x$ac_cv_guile_found = xno ; then -- if test x$1 = xfail ; then -- AC_MSG_ERROR(Can not find Guile on this system) -- else -- AC_MSG_WARN(Can not find Guile on this system) -- fi -- ac_cv_guile_found=no -- GUILE_LIBS= GUILE_INCS= -- fi -- -- LIBS="$saved_LIBS" -- LDFLAGS="$saved_ldflags" -- CPPFLAGS="$saved_cppflags" -- -- AC_SUBST(GUILE_LIBS) -- AM_CONDITIONAL(GUILE, test x$ac_cv_guile_found = xyes) --]) diff --git a/gnucash-guile-7.patch b/gnucash-guile-7.patch deleted file mode 100644 index 6071125..0000000 --- a/gnucash-guile-7.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up gnucash-2.4.5/configure.ac.foo gnucash-2.4.5/configure.ac ---- gnucash-2.4.5/configure.ac.foo 2011-05-13 14:32:12.403684951 -0400 -+++ gnucash-2.4.5/configure.ac 2011-05-13 14:33:28.397684863 -0400 -@@ -410,7 +410,7 @@ if test "x$saved_GUILE_INCS" != x; then - GUILE_INCS="$saved_GUILE_INCS" - fi - --AS_SCRUB_INCLUDE(GUILE_INCS) -+AC_SUBST(GUILE_INCS) - AC_SUBST(GUILE_LIBS) - AC_SUBST(GUILE) - -diff -up gnucash-2.4.5/src/import-export/aqbanking/Makefile.in.foo gnucash-2.4.5/src/import-export/aqbanking/Makefile.in ---- gnucash-2.4.5/src/import-export/aqbanking/Makefile.in.foo 2011-05-13 14:51:07.793685262 -0400 -+++ gnucash-2.4.5/src/import-export/aqbanking/Makefile.in 2011-05-13 14:51:57.459685276 -0400 -@@ -480,6 +480,7 @@ AM_CFLAGS = \ - ${GNOME_CFLAGS} \ - ${GLADE_CFLAGS} \ - ${GLIB_CFLAGS} \ -+ ${GUILE_CFLAGS} \ - ${AQBANKING_CFLAGS} - - uidir = $(GNC_UI_DIR) -diff -up gnucash-2.4.5/src/plugins/bi_import/Makefile.in.foo gnucash-2.4.5/src/plugins/bi_import/Makefile.in ---- gnucash-2.4.5/src/plugins/bi_import/Makefile.in.foo 2011-05-13 14:53:18.470685304 -0400 -+++ gnucash-2.4.5/src/plugins/bi_import/Makefile.in 2011-05-13 14:53:35.507685313 -0400 -@@ -459,6 +459,7 @@ AM_CFLAGS = \ - -I${top_srcdir}/lib/libc \ - ${GNOME_CFLAGS} \ - ${GLADE_CFLAGS} \ -+ ${GUILE_CFLAGS} \ - ${QOF_CFLAGS} \ - ${GLIB_CFLAGS} - -diff -up gnucash-2.4.5/src/import-export/aqbanking/Makefile.am.foo gnucash-2.4.5/src/import-export/aqbanking/Makefile.am ---- gnucash-2.4.5/src/import-export/aqbanking/Makefile.am.foo 2011-05-13 15:14:15.367685775 -0400 -+++ gnucash-2.4.5/src/import-export/aqbanking/Makefile.am 2011-05-13 15:14:24.446685776 -0400 -@@ -64,6 +64,7 @@ AM_CFLAGS = \ - ${GNOME_CFLAGS} \ - ${GLADE_CFLAGS} \ - ${GLIB_CFLAGS} \ -+ ${GUILE_CFLAGS} \ - ${AQBANKING_CFLAGS} - - uidir = $(GNC_UI_DIR) -diff -up gnucash-2.4.5/src/plugins/bi_import/Makefile.am.foo gnucash-2.4.5/src/plugins/bi_import/Makefile.am ---- gnucash-2.4.5/src/plugins/bi_import/Makefile.am.foo 2011-05-13 15:14:42.890685786 -0400 -+++ gnucash-2.4.5/src/plugins/bi_import/Makefile.am 2011-05-13 15:14:51.490685786 -0400 -@@ -51,6 +51,7 @@ AM_CFLAGS = \ - -I${top_srcdir}/lib/libc \ - ${GNOME_CFLAGS} \ - ${GLADE_CFLAGS} \ -+ ${GUILE_CFLAGS} \ - ${QOF_CFLAGS} \ - ${GLIB_CFLAGS} - diff --git a/gnucash-guile-8.patch b/gnucash-guile-8.patch deleted file mode 100644 index 459401d..0000000 --- a/gnucash-guile-8.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit c185afc1ffda00960af25c979d9e9b5359abccfc -Author: Geert Janssens -Date: Mon Mar 21 15:10:30 2011 +0000 - - Bug #615168: N_ in the root module - - Fix variable not found crasher. - - git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20440 57a11ea4-9604-0410-9ed3-97b8803252fd - -diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm -index 3b00d50..7a114ef 100644 ---- a/src/app-utils/app-utils.scm -+++ b/src/app-utils/app-utils.scm -@@ -20,6 +20,7 @@ - (use-modules (srfi srfi-1)) - (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing. - (use-modules (gnucash gnc-module)) -+(use-modules (ice-9 syncase)) - - (gnc:module-load "gnucash/engine" 0) - -diff --git a/src/app-utils/c-interface.scm b/src/app-utils/c-interface.scm -index 0f912a3..e6243d7 100644 ---- a/src/app-utils/c-interface.scm -+++ b/src/app-utils/c-interface.scm -@@ -15,8 +15,6 @@ - ;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 - ;; Boston, MA 02110-1301, USA gnu@gnu.org - --(use-modules (ice-9 syncase)) -- - (define (gnc:error->string tag args) - (define (write-error port) - (if (and (list? args) (not (null? args))) diff --git a/gnucash-guile-9.patch b/gnucash-guile-9.patch deleted file mode 100644 index 446c2f3..0000000 --- a/gnucash-guile-9.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up gnucash-2.4.5/configure.ac.foo gnucash-2.4.5/configure.ac ---- gnucash-2.4.5/configure.ac.foo 2011-05-13 15:44:58.656686463 -0400 -+++ gnucash-2.4.5/configure.ac 2011-05-13 15:46:31.353686496 -0400 -@@ -393,12 +393,13 @@ fi - GUILE_LIBS="" - - # Look up GUILE_CFLAGS and GUILE_LIBS, and version check --PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5], , [AC_MSG_ERROR([ -- -- guile does not appear to be installed correctly, or is not in the -- correct version range. Perhaps you have not installed the guile -- development packages? Gnucash requires at least version 1.8.5 to build. --])]) -+PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5], , [ -+ PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0], , [AC_MSG_ERROR([ -+ guile does not appear to be installed correctly, or is not in the -+ correct version range. Perhaps you have not installed the guile -+ development packages? Gnucash requires at least version 1.8.5 to build. -+ ])]) -+]) - # Look up GUILE executable - AC_PATH_PROG(GUILE, guile) - diff --git a/gnucash-notsvn.patch b/gnucash-notsvn.patch deleted file mode 100644 index da259ac..0000000 --- a/gnucash-notsvn.patch +++ /dev/null @@ -1,324 +0,0 @@ -diff -up gnucash-2.4.5/src/pixmaps/Makefile.in.foo gnucash-2.4.5/src/pixmaps/Makefile.in ---- gnucash-2.4.5/src/pixmaps/Makefile.in.foo 2011-05-20 16:37:58.421519215 -0400 -+++ gnucash-2.4.5/src/pixmaps/Makefile.in 2011-05-20 16:38:43.862519220 -0400 -@@ -875,51 +875,51 @@ uninstall-am: uninstall-gncextrasmallico - uninstall-gncsmalltwtwoiconDATA uninstall-hook - - --@BUILDING_FROM_SVN_TRUE@256x256/gnucash-icon.png: gnucash-icon-256x256.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 256x256 --@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@128x128/gnucash-icon.png: gnucash-icon-128x128.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 128x128 --@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-128x128.png 128x128/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@96x96/gnucash-icon.png: gnucash-icon-96x96.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 96x96 --@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-96x96.png 96x96/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@64x64/gnucash-icon.png: gnucash-icon-64x64.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 64x64 --@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-64x64.png 64x64/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@48x48/gnucash-icon.png: gnucash-icon-48x48.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 48x48 --@BUILDING_FROM_SVN_TRUE@ cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 32x32 --@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 24x24 --@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 22x22 --@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png --@BUILDING_FROM_SVN_TRUE@ -mkdir -p 16x16 --@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png -- --@BUILDING_FROM_SVN_TRUE@scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg --@BUILDING_FROM_SVN_TRUE@ -mkdir -p scalable --@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg -+#256x256/gnucash-icon.png: gnucash-icon-256x256.png -+# -mkdir -p 256x256 -+# cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png -+ -+#128x128/gnucash-icon.png: gnucash-icon-128x128.png -+# -mkdir -p 128x128 -+# cp ${srcdir}/gnucash-icon-128x128.png 128x128/gnucash-icon.png -+ -+#96x96/gnucash-icon.png: gnucash-icon-96x96.png -+# -mkdir -p 96x96 -+# cp ${srcdir}/gnucash-icon-96x96.png 96x96/gnucash-icon.png -+ -+#64x64/gnucash-icon.png: gnucash-icon-64x64.png -+# -mkdir -p 64x64 -+# cp ${srcdir}/gnucash-icon-64x64.png 64x64/gnucash-icon.png -+ -+#48x48/gnucash-icon.png: gnucash-icon-48x48.png -+# -mkdir -p 48x48 -+# cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png -+ -+#32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png -+# -mkdir -p 32x32 -+# cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png -+ -+#24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png -+# -mkdir -p 24x24 -+# cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png -+ -+#22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png -+# -mkdir -p 22x22 -+# cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png -+ -+#16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png -+# -mkdir -p 16x16 -+# cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png -+ -+#scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg -+# -mkdir -p scalable -+# cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg - --@BUILDING_FROM_SVN_TRUE@gnucash-icon-16x16.png: --@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/16x16/gnucash.png gnucash-icon-16x16.png -+#gnucash-icon-16x16.png: -+# cp ${top_srcdir}/art/tango/16x16/gnucash.png gnucash-icon-16x16.png - --@BUILDING_FROM_SVN_TRUE@gnucash-icon-32x32.png: --@BUILDING_FROM_SVN_TRUE@ cp ${top_srcdir}/art/tango/32x32/gnucash.png gnucash-icon-32x32.png -+#gnucash-icon-32x32.png: -+# cp ${top_srcdir}/art/tango/32x32/gnucash.png gnucash-icon-32x32.png - @OS_WIN32_FALSE@install-data-hook: update-icon-cache - @OS_WIN32_FALSE@uninstall-hook: update-icon-cache - @OS_WIN32_FALSE@update-icon-cache: -@@ -932,8 +932,8 @@ uninstall-am: uninstall-gncextrasmallico - @OS_WIN32_FALSE@ fi - - # Only clean up if we're building from SVN --@BUILDING_FROM_SVN_TRUE@clean-local: --@BUILDING_FROM_SVN_TRUE@ -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable -+#clean-local: -+# -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable - - # Create gnucash-icon.ico - .PHONY: ico -diff -up gnucash-2.4.5/src/pixmaps/Makefile.am.foo gnucash-2.4.5/src/pixmaps/Makefile.am ---- gnucash-2.4.5/src/pixmaps/Makefile.am.foo 2011-05-20 16:44:05.920519268 -0400 -+++ gnucash-2.4.5/src/pixmaps/Makefile.am 2011-05-20 16:44:33.625519271 -0400 -@@ -76,54 +76,6 @@ gncextrasmallicon_DATA = 16x16/gnucash-i - gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps - gncscalableicon_DATA = scalable/gnucash-icon.svg - --if BUILDING_FROM_SVN --256x256/gnucash-icon.png: gnucash-icon-256x256.png -- -mkdir -p 256x256 -- cp ${srcdir}/gnucash-icon-256x256.png 256x256/gnucash-icon.png -- --128x128/gnucash-icon.png: gnucash-icon-128x128.png -- -mkdir -p 128x128 -- cp ${srcdir}/gnucash-icon-128x128.png 128x128/gnucash-icon.png -- --96x96/gnucash-icon.png: gnucash-icon-96x96.png -- -mkdir -p 96x96 -- cp ${srcdir}/gnucash-icon-96x96.png 96x96/gnucash-icon.png -- --64x64/gnucash-icon.png: gnucash-icon-64x64.png -- -mkdir -p 64x64 -- cp ${srcdir}/gnucash-icon-64x64.png 64x64/gnucash-icon.png -- --48x48/gnucash-icon.png: gnucash-icon-48x48.png -- -mkdir -p 48x48 -- cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png -- --32x32/gnucash-icon.png: ${top_srcdir}/art/tango/32x32/gnucash.png -- -mkdir -p 32x32 -- cp ${top_srcdir}/art/tango/32x32/gnucash.png 32x32/gnucash-icon.png -- --24x24/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-24x24.png -- -mkdir -p 24x24 -- cp ${top_srcdir}/art/tango/22x22/gnucash-24x24.png 24x24/gnucash-icon.png -- --22x22/gnucash-icon.png: ${top_srcdir}/art/tango/22x22/gnucash-22x22.png -- -mkdir -p 22x22 -- cp ${top_srcdir}/art/tango/22x22/gnucash-22x22.png 22x22/gnucash-icon.png -- --16x16/gnucash-icon.png: ${top_srcdir}/art/tango/16x16/gnucash.png -- -mkdir -p 16x16 -- cp ${top_srcdir}/art/tango/16x16/gnucash.png 16x16/gnucash-icon.png -- --scalable/gnucash-icon.svg: ${top_srcdir}/art/tango/scalable/gnucash.svg -- -mkdir -p scalable -- cp ${top_srcdir}/art/tango/scalable/gnucash.svg scalable/gnucash-icon.svg -- --gnucash-icon-16x16.png: -- cp ${top_srcdir}/art/tango/16x16/gnucash.png gnucash-icon-16x16.png -- --gnucash-icon-32x32.png: -- cp ${top_srcdir}/art/tango/32x32/gnucash.png gnucash-icon-32x32.png --endif -- - # As suggested by - if !OS_WIN32 - gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -@@ -158,12 +110,6 @@ EXTRA_DIST = \ - ${ico_files_lr} \ - ${gncscalableicon_DATA} - --# Only clean up if we're building from SVN --if BUILDING_FROM_SVN --clean-local: -- -rm -rf 256x256 128x128 96x96 64x64 48x48 32x32 24x24 22x22 16x16 scalable --endif -- - # Create gnucash-icon.ico - .PHONY: ico - ico: ${ico_files_hr} ${ico_files_lr} -diff -up gnucash-2.4.11/src/optional/python-bindings/Makefile.am.orig gnucash-2.4.11/src/optional/python-bindings/Makefile.am ---- gnucash-2.4.11/src/optional/python-bindings/Makefile.am.orig 2012-07-12 15:17:26.000000000 -0400 -+++ gnucash-2.4.11/src/optional/python-bindings/Makefile.am 2012-07-13 12:07:50.646827999 -0400 -@@ -41,48 +41,6 @@ _gnucash_core_c_la_LIBADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ - ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/engine/libgncmod-engine.la --if BUILDING_FROM_SVN --_gnucash_core_c_includes= \ -- ${top_builddir}/config.h \ -- ${top_srcdir}/src/libqof/qof/qofsession.h \ -- ${top_srcdir}/src/libqof/qof/qofbook.h \ -- ${top_srcdir}/src/libqof/qof/qofbackend.h \ -- ${top_srcdir}/src/libqof/qof/qoflog.h \ -- ${top_srcdir}/src/libqof/qof/qofutil.h \ -- ${top_srcdir}/src/libqof/qof/qofid.h \ -- ${top_srcdir}/src/libqof/qof/guid.h \ -- ${top_srcdir}/src/gnc-module/gnc-module.h \ -- ${top_srcdir}/src/engine/gnc-engine.h \ -- ${top_srcdir}/src/engine/Transaction.h \ -- ${top_srcdir}/src/gnc/Transaction.hpp \ -- ${top_srcdir}/src/engine/Split.h \ -- ${top_srcdir}/src/engine/Account.h \ -- ${top_srcdir}/src/engine/gnc-commodity.h \ -- ${top_srcdir}/src/engine/gnc-lot.h \ -- ${top_srcdir}/src/libqof/qof/gnc-numeric.h \ -- ${top_srcdir}/src/engine/gncCustomer.h \ -- ${top_srcdir}/src/engine/gncEmployee.h \ -- ${top_srcdir}/src/engine/gncVendor.h \ -- ${top_srcdir}/src/engine/gncAddress.h \ -- ${top_srcdir}/src/engine/gncBillTerm.h \ -- ${top_srcdir}/src/engine/gncOwner.h \ -- ${top_srcdir}/src/engine/gncInvoice.h \ -- ${top_srcdir}/src/engine/gncJob.h \ -- ${top_srcdir}/src/engine/gncEntry.h \ -- ${top_srcdir}/src/engine/gncTaxTable.h \ -- ${top_srcdir}/src/engine/gncIDSearch.h \ -- ${top_srcdir}/src/engine/gnc-pricedb.h -- -- --gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes) -- swig -python -Wall -Werror \ -- -I$(top_srcdir)/src -I$(top_srcdir)/src/engine \ -- -I$(top_srcdir)/src/business/business-core \ -- -I${top_srcdir}/src/libqof/qof \ -- -o $@ $< -- --gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) --endif - - EXTRA_DIST = \ - $(pkgpyexec_DATA) \ -diff -up gnucash-2.4.11/src/optional/python-bindings/Makefile.in.orig gnucash-2.4.11/src/optional/python-bindings/Makefile.in ---- gnucash-2.4.11/src/optional/python-bindings/Makefile.in.orig 2012-07-12 15:51:29.000000000 -0400 -+++ gnucash-2.4.11/src/optional/python-bindings/Makefile.in 2012-07-13 12:08:40.603827528 -0400 -@@ -451,36 +451,36 @@ _gnucash_core_c_la_LIBADD = \ - ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/engine/libgncmod-engine.la - --@BUILDING_FROM_SVN_TRUE@_gnucash_core_c_includes = \ --@BUILDING_FROM_SVN_TRUE@ ${top_builddir}/config.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofsession.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofbook.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofbackend.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qoflog.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofutil.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/qofid.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/guid.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/gnc-module/gnc-module.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-engine.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/Transaction.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/gnc/Transaction.hpp \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/Split.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/Account.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-commodity.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-lot.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/libqof/qof/gnc-numeric.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncCustomer.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncEmployee.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncVendor.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncAddress.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncBillTerm.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncOwner.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncInvoice.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncJob.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncEntry.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncTaxTable.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gncIDSearch.h \ --@BUILDING_FROM_SVN_TRUE@ ${top_srcdir}/src/engine/gnc-pricedb.h -+#_gnucash_core_c_includes = \ -+# ${top_builddir}/config.h \ -+# ${top_srcdir}/src/libqof/qof/qofsession.h \ -+# ${top_srcdir}/src/libqof/qof/qofbook.h \ -+# ${top_srcdir}/src/libqof/qof/qofbackend.h \ -+# ${top_srcdir}/src/libqof/qof/qoflog.h \ -+# ${top_srcdir}/src/libqof/qof/qofutil.h \ -+# ${top_srcdir}/src/libqof/qof/qofid.h \ -+# ${top_srcdir}/src/libqof/qof/guid.h \ -+# ${top_srcdir}/src/gnc-module/gnc-module.h \ -+# ${top_srcdir}/src/engine/gnc-engine.h \ -+# ${top_srcdir}/src/engine/Transaction.h \ -+# ${top_srcdir}/src/gnc/Transaction.hpp \ -+# ${top_srcdir}/src/engine/Split.h \ -+# ${top_srcdir}/src/engine/Account.h \ -+# ${top_srcdir}/src/engine/gnc-commodity.h \ -+# ${top_srcdir}/src/engine/gnc-lot.h \ -+# ${top_srcdir}/src/libqof/qof/gnc-numeric.h \ -+# ${top_srcdir}/src/engine/gncCustomer.h \ -+# ${top_srcdir}/src/engine/gncEmployee.h \ -+# ${top_srcdir}/src/engine/gncVendor.h \ -+# ${top_srcdir}/src/engine/gncAddress.h \ -+# ${top_srcdir}/src/engine/gncBillTerm.h \ -+# ${top_srcdir}/src/engine/gncOwner.h \ -+# ${top_srcdir}/src/engine/gncInvoice.h \ -+# ${top_srcdir}/src/engine/gncJob.h \ -+# ${top_srcdir}/src/engine/gncEntry.h \ -+# ${top_srcdir}/src/engine/gncTaxTable.h \ -+# ${top_srcdir}/src/engine/gncIDSearch.h \ -+# ${top_srcdir}/src/engine/gnc-pricedb.h - - EXTRA_DIST = \ - $(pkgpyexec_DATA) \ -@@ -977,14 +977,14 @@ uninstall-am: uninstall-pkgpyexecDATA un - uninstall-pkgpyexecDATA uninstall-pkgpyexecLTLIBRARIES - - --@BUILDING_FROM_SVN_TRUE@gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes) --@BUILDING_FROM_SVN_TRUE@ swig -python -Wall -Werror \ --@BUILDING_FROM_SVN_TRUE@ -I$(top_srcdir)/src -I$(top_srcdir)/src/engine \ --@BUILDING_FROM_SVN_TRUE@ -I$(top_srcdir)/src/business/business-core \ --@BUILDING_FROM_SVN_TRUE@ -I${top_srcdir}/src/libqof/qof \ --@BUILDING_FROM_SVN_TRUE@ -o $@ $< -+#gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes) -+# swig -python -Wall -Werror \ -+# -I$(top_srcdir)/src -I$(top_srcdir)/src/engine \ -+# -I$(top_srcdir)/src/business/business-core \ -+# -I${top_srcdir}/src/libqof/qof \ -+# -o $@ $< - --@BUILDING_FROM_SVN_TRUE@gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) -+#gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gnucash.spec b/gnucash.spec index fdf9184..864d09a 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -2,40 +2,27 @@ Name: gnucash Summary: Finance management application -Version: 2.4.11 +Version: 2.4.13 URL: http://gnucash.org/ Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity Source: http://downloads.sourceforge.net/sourceforge/gnucash/gnucash-%{version}.tar.bz2 -Source2: engine-common.i BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: webkitgtk-devel, libxml2 >= 2.5.10, zlib-devel BuildRequires: libgsf-devel >= 1.12.2, goffice-devel < 0.9, swig BuildRequires: libglade2-devel >= 2.4, libgnomeui-devel >= 2.4 -BuildRequires: libofx-devel, aqbanking-devel, guile-devel +BuildRequires: libofx-devel, aqbanking-devel, guile-devel < 5:2.0 BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, libtool, intltool BuildRequires: python-devel, libdbi-devel BuildRequires: libtool-ltdl-devel, GConf2-devel BuildRequires: ktoblzcheck-devel +BuildRequires: slib >= 3a1-5 Patch0: gnucash-quiet.patch -# Guile 2.0 support -Patch101: gnucash-guile-1.patch -Patch102: gnucash-guile-2.patch -Patch103: gnucash-guile-3.patch -Patch104: gnucash-guile-4.patch -Patch105: gnucash-guile-5.patch -Patch106: gnucash-guile-6.patch -Patch107: gnucash-guile-7.patch -Patch108: gnucash-guile-8.patch -Patch109: gnucash-guile-9.patch - -# build noise -Patch150: gnucash-notsvn.patch - Requires: gnucash-docs >= 2.2.0 +Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) %if 0%{?fedora} <= 14 && 0%{?rhel} <= 6 # for HBCI setup wizard @@ -57,22 +44,9 @@ balanced books. %prep %setup -q %patch0 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch150 -p1 -cp %{SOURCE2} src/engine find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build -export BUILDING_FROM_SVN=yes -autoreconf sed -i 's|get_python_lib(0|get_python_lib(1|g' configure %configure --enable-error-on-warning=no \ --enable-ofx \ @@ -101,7 +75,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop -#echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop mv $RPM_BUILD_ROOT/%{_libdir}/lib* $RPM_BUILD_ROOT/%{_libdir}/gnucash @@ -165,6 +138,15 @@ fi %doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI %changelog +* Tue Apr 23 2013 Bill Nottingham - 2.4.13-1 +- update to 2.4.13 + +* Thu Feb 14 2013 Fedora Release Engineering - 2.4.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.4.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jul 13 2012 Bill Nottingham - 2.4.11-1 - update to 2.4.11 diff --git a/sources b/sources index 1cdac80..22b67f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e59f94a8c4cf41f47a9e74ba725bde45 gnucash-2.4.11.tar.bz2 +ee73b3fac8bac4bf1c3a39a33302a27d gnucash-2.4.13.tar.bz2