gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 3 13:55:42 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/87ed53b3 (commit)
via https://github.com/Gnucash/gnucash/commit/cd8182fc (commit)
via https://github.com/Gnucash/gnucash/commit/c605e441 (commit)
via https://github.com/Gnucash/gnucash/commit/127adb4a (commit)
via https://github.com/Gnucash/gnucash/commit/c599bf3c (commit)
via https://github.com/Gnucash/gnucash/commit/b905c4a2 (commit)
via https://github.com/Gnucash/gnucash/commit/2d5056db (commit)
from https://github.com/Gnucash/gnucash/commit/921b5a9f (commit)
commit 87ed53b34783a5305efb7c9dd6f41fb89715aba9
Merge: 921b5a9 cd8182f
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 3 19:55:07 2016 +0200
Merge branch 'maint'
diff --cc configure.ac
index e5cd675,3ee4e69..9fd4af5
--- a/configure.ac
+++ b/configure.ac
@@@ -1354,15 -1079,10 +1351,14 @@@ the
then
enable_compile_warnings="yes"
fi
+#Save CFLAGS so that we can put the warnings in AM_CFLAGS
+ __cflags="$CFLAGS"
+ CFLAGS=
COMPILE_WARNINGS
-
+ AM_CFLAGS="$CFLAGS"
+ CFLAGS="$__cflags"
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
- AS_SCRUB_INCLUDE(GTK_CFLAGS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
commit cd8182fc6ffba120bcaeec3669328234f69e3cde
Author: Ralf Habacker <ralf.habacker at freenet.de>
Date: Wed Sep 28 23:55:13 2016 +0200
Fix broken german account template 'Kontenrahmen für Wohnungswirtschaft'.
The root node was not used as parent in any other account.
This issue has been detected on updating account templates
into kmymoney sources.
diff --git a/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea b/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
index 0aa93e7..feb7cf1 100644
--- a/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
+++ b/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
@@ -64,6 +64,7 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
+ <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>00 Grundstücke mit Wohnbauten</act:name>
commit c605e4415ff7bf0493bc1f3b0c4af1d67436ea42
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Mon Oct 3 17:41:11 2016 +0200
Bug 771617 - Build fails because test test-report-utilities is sensitive to time of day/timezone
This commit makes the test work in all timezones from -11 to +10. Timezone +11 still fails, but that's the compromise we have made in the rest of gnucash as well.
diff --git a/src/report/report-system/test/test-report-utilities.scm b/src/report/report-system/test/test-report-utilities.scm
index d130e45..959c8b9 100644
--- a/src/report/report-system/test/test-report-utilities.scm
+++ b/src/report/report-system/test/test-report-utilities.scm
@@ -18,19 +18,31 @@
(define (test-account-get-trans-type-splits-interval)
(let ((env (create-test-env))
- (end-date (gnc:date->timepair (localtime (current-time)))))
+ (end-date-tp (gnc:date->timepair (localtime (current-time)))))
(let* ((accounts (env-create-account-structure-alist env (list "Assets"
(list (cons 'type ACCT-TYPE-ASSET))
(list "Bank Account")
(list "Wallet"))))
(bank-account (cdr (assoc "Bank Account" accounts)))
- (wallet (cdr (assoc "Wallet" accounts))))
-
- (env-create-daily-transactions env (decdate end-date (NDayDelta 10)) end-date bank-account wallet)
+ (wallet (cdr (assoc "Wallet" accounts)))
+ (start-date-tp (decdate end-date-tp (NDayDelta 10)))
+ (q-start-date-tp (decdate end-date-tp (NDayDelta 5)))
+ (q-start-date (gnc:timepair->date q-start-date-tp))
+ (q-end-date (gnc:timepair->date end-date-tp)))
+
+ (env-create-daily-transactions env start-date-tp end-date-tp bank-account wallet)
+
+ ; Ensure the query interval is as inclusive as possible to deal with timezone differences
+ (set-tm:hour q-end-date 23)
+ (set-tm:min q-end-date 59)
+ (set-tm:sec q-end-date 59)
+ (set-tm:hour q-start-date 00)
+ (set-tm:min q-start-date 00)
+ (set-tm:sec q-start-date 01)
(let ((splits (gnc:account-get-trans-type-splits-interval (list bank-account wallet)
ACCT-TYPE-ASSET
- (decdate end-date (NDayDelta 5))
- end-date)))
- ;; 8 is the right number (4 days, two splits per tx)
- (and (equal? 8 (length splits)))))))
+ (gnc:date->timepair q-start-date)
+ (gnc:date->timepair q-end-date))))
+ ;; 10 is the right number (5 days, two splits per tx)
+ (and (equal? 10 (length splits)))))))
commit 127adb4a7c706784f588d45e42d468cb40428e74
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Oct 2 12:08:34 2016 +0200
Bug 772313 - Invalid DOCTYPE in report generation
diff --git a/src/report/report-system/html-document.scm b/src/report/report-system/html-document.scm
index 4bfcb89..cb05a1a 100644
--- a/src/report/report-system/html-document.scm
+++ b/src/report/report-system/html-document.scm
@@ -159,7 +159,7 @@
;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm:<html>
;; Validate against HTML4 Transitional:
- (push "<!DOCTYPE!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN\" \n\"http://www.w3.org/TR/html4/loose.dtd\">")
+ (push "<!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN\" \n\"http://www.w3.org/TR/html4/loose.dtd\">")
(push "<head>\n")
(push "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n")
(if css?
commit c599bf3c0b50185b07e2b1d565c8fe11d3dfb862
Author: Rob Gowin <robgowin at gmail.com>
Date: Tue Sep 27 11:24:36 2016 -0500
Use default PKG_CHECK_MODULES for CMake version > 3.4
diff --git a/src/cmake_modules/GncFindPkgConfig.cmake b/src/cmake_modules/GncFindPkgConfig.cmake
index 46a55b7..96c85c8 100644
--- a/src/cmake_modules/GncFindPkgConfig.cmake
+++ b/src/cmake_modules/GncFindPkgConfig.cmake
@@ -1,4 +1,4 @@
-if(${CMAKE_VERSION} VERSION_GREATER 3.1)
+if((${CMAKE_VERSION} VERSION_GREATER 3.1) AND (${CMAKE_VERSION} VERSION_LESS 3.5))
function (pkg_get_variable result pkg variable)
_pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
@@ -247,12 +247,10 @@ endmacro()
else()
+include(FindPkgConfig)
+
macro(gnc_pkg_check_modules _prefix _module0)
- if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
- _pkgconfig_parse_options (_pkg_modules _pkg_is_required _pkg_is_silent "${_module0}" ${ARGN})
- _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" "${_prefix}" ${_pkg_modules})
- _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
- endif()
+ PKG_CHECK_MODULES(${_prefix} ${_module0} ${ARGN})
endmacro()
endif()
commit b905c4a26d57a7b2878db92050e97ec9f3d5a9b9
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 25 23:07:14 2016 +0200
Remove obsolete AS_SCRUB_INCLUDES macro.
This was an ugly work-around for a bogus warning from gcc-3, a
long-superceded compiler. The way the macro was written caused
portablility issues (see PR 102) and other projects (gstreamer
in particular) removed it several years ago.
Thanks to Julian Ospald for bringing it to our attention.
diff --git a/configure.ac b/configure.ac
index ff05a9c..3ee4e69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,7 +555,6 @@ fi
LIBXML2_REQUIRED=2.5.10
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
-AS_SCRUB_INCLUDE(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
@@ -572,7 +571,6 @@ LIBS="$oLIBS"
### LIBXSLT
PKG_CHECK_MODULES(LIBXSLT, libxslt)
-AS_SCRUB_INCLUDE(LIBXLT_CFLAGS)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
@@ -870,7 +868,6 @@ then
AQBANKING_LIBS="${AQBANKING_LIBS} -lktoblzcheck"
fi
- AS_SCRUB_INCLUDE(AQBANKING_CFLAGS)
AC_SUBST(AQBANKING_LIBS)
AC_SUBST(AQBANKING_CFLAGS)
_COMPONENTS="$_COMPONENTS aqbanking"
@@ -1086,23 +1083,19 @@ then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
- AS_SCRUB_INCLUDE(GTK_CFLAGS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0)
- AS_SCRUB_INCLUDE(GNOMECANVAS_CFLAGS)
AC_SUBST(GNOMECANVAS_CFLAGS)
AC_SUBST(GNOMECANVAS_LIBS)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
- AS_SCRUB_INCLUDE(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
# checks for goffice
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.8 >= 0.7.0 libgoffice-0.8 < 0.9.0, [goffice=1], [AC_MSG_ERROR([Cannot find libgoffice >= 0.7.0 and < 0.9.0])])
- AS_SCRUB_INCLUDE(GOFFICE_CFLAGS)
AC_SUBST(GOFFICE_CFLAGS)
AC_SUBST(GOFFICE_LIBS)
diff --git a/macros/as-scrub-include.m4 b/macros/as-scrub-include.m4
deleted file mode 100644
index dcca985..0000000
--- a/macros/as-scrub-include.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl as-scrub-include.m4 0.0.1
-dnl autostars m4 macro for scrubbing CFLAGS of system include dirs
-dnl because gcc 3.x complains about including system including dirs
-dnl
-dnl thomas at apestaart.org
-dnl
-dnl This macro uses output of cpp -v and expects it to contain text that
-dnl looks a little bit like this:
-dnl #include <...> search starts here:
-dnl /usr/local/include
-dnl /usr/lib/gcc-lib/i386-redhat-linux/3.2/include
-dnl /usr/include
-dnl End of search list.
-
-dnl AS_SCRUB_INCLUDE(VAR)
-dnl example
-dnl AS_SCRUB_INCLUDE(CFLAGS)
-dnl will remove all system include dirs from the given CFLAGS
-
-AC_DEFUN([AS_SCRUB_INCLUDE],
-[
- GIVEN_CFLAGS=$[$1]
- INCLUDE_DIRS=`echo | cpp -v 2>&1`
-
- dnl remove everything from this output between the "starts here" and "End of"
- dnl line
- INCLUDE_DIRS=`echo $INCLUDE_DIRS | sed -e 's/.*<...> search starts here://' | sed -e 's/End of search list.*//'`
- for dir in $INCLUDE_DIRS; do
- GIVEN_CFLAGS=`echo $GIVEN_CFLAGS | sed -e "s;-I$dir ;;" | sed -e "s;-I$dir$;;"`
- done
- [$1]=$GIVEN_CFLAGS
-])
commit 2d5056db6c1b62626d14a96eb41db4bbbdac04aa
Author: Mike Evans <mikee at saxicola.co.uk>
Date: Sun Sep 25 09:12:19 2016 +0100
Bug 771246 - Set Invoice/Bill items date correctly from imported CSV.
Set Date Entered to date in the csv file, or today if absent.
diff --git a/src/plugins/bi_import/dialog-bi-import.c b/src/plugins/bi_import/dialog-bi-import.c
index 12b8588..5f39c37 100644
--- a/src/plugins/bi_import/dialog-bi-import.c
+++ b/src/plugins/bi_import/dialog-bi-import.c
@@ -714,9 +714,11 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
{
qof_scan_date (date_opened, &day, &month, &year); // FIXME: Must check for the return value of qof_scan_date!
gncEntrySetDate(entry, gnc_dmy2timespec (day, month, year));
+ gncEntrySetDateEntered(entry, gnc_dmy2timespec (day, month, year));
}
else
{
+ gncEntrySetDate(entry, today);
gncEntrySetDateEntered(entry, today);
}
// Remove escaped quotes
Summary of changes:
accounts/de_DE/acctchrt_wohnungsw.gnucash-xea | 1 +
configure.ac | 7 -----
macros/as-scrub-include.m4 | 32 ----------------------
src/cmake_modules/GncFindPkgConfig.cmake | 10 +++----
src/plugins/bi_import/dialog-bi-import.c | 2 ++
src/report/report-system/html-document.scm | 2 +-
.../report-system/test/test-report-utilities.scm | 28 +++++++++++++------
7 files changed, 28 insertions(+), 54 deletions(-)
delete mode 100644 macros/as-scrub-include.m4
More information about the gnucash-changes
mailing list