gnucash-on-windows master: Remove ktoblzcheck dependency.
Christian Stimming
cstim at code.gnucash.org
Wed Feb 13 05:47:02 EST 2019
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/bf11501a (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/f83a2194 (commit)
commit bf11501af926098ff0c82fbe30baccad56ee6784
Author: Christian Stimming <christian at cstimming.de>
Date: Wed Feb 13 11:46:56 2019 +0100
Remove ktoblzcheck dependency.
diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
index d1b02f0..a85754c 100644
--- a/cmake/defaults.cmake
+++ b/cmake/defaults.cmake
@@ -355,10 +355,6 @@ SET (GWENHYWFAR_VERSION "4.15.3")
set (GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy gwenhywfar-4.15.3.tar.gz")
set (GWENHYWFAR_DIR ${GLOBAL_DIR}/gwenhywfar)
-SET (KTOBLZCHECK_VERSION "1.48")
-set (KTOBLZCHECK_URL "${SF_MIRROR}/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz")
-# ktoblzcheck is being installed into GWENHYWFAR_DIR
-
SET (AQBANKING_VERSION "5.6.10")
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
diff --git a/crossbuild_webkit.sh b/crossbuild_webkit.sh
index a1e51dc..fd51dd5 100755
--- a/crossbuild_webkit.sh
+++ b/crossbuild_webkit.sh
@@ -30,8 +30,6 @@ register_env_var HH_LDFLAGS " "
register_env_var INTLTOOL_PERL " "
register_env_var LIBDBI_CPPFLAGS " "
register_env_var LIBDBI_LDFLAGS " "
-register_env_var KTOBLZCHECK_CPPFLAGS " "
-register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
register_env_var PCRE_CPPFLAGS " "
register_env_var PCRE_LDFLAGS " "
diff --git a/defaults.sh b/defaults.sh
index 3d00fa6..1546752 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -354,10 +354,6 @@ GWENHYWFAR_VERSION="4.18.0"
set_default GWENHYWFAR_URL "https://www.aquamaniac.de/sites/download/download.php?package=01&release=206&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK_VERSION="1.49"
-set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
-# ktoblzcheck is being installed into GWENHYWFAR_DIR
-
AQBANKING_VERSION="5.7.6beta"
## NB: Dummy means dummy! The important value in the following url is
## the release number, not the file name at the end!
diff --git a/dist-impl.sh b/dist-impl.sh
index 240dafb..da18387 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -176,12 +176,6 @@ function dist_isocodes() {
cp -a $_ISOCODES_UDIR/share/{locale,xml} $_DIST_UDIR/share
}
-function dist_ktoblzcheck() {
- setup ktoblzcheck
- # dll is already copied in dist_gwenhywfar
- cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${_DIST_UDIR}/share
-}
-
function dist_libdbi() {
setup LibDBI
cp -a ${_SQLITE3_UDIR}/bin/* ${_DIST_UDIR}/bin
diff --git a/dist.sh b/dist.sh
index b4886f6..4d56fbc 100755
--- a/dist.sh
+++ b/dist.sh
@@ -34,7 +34,6 @@ add_step dist_goffice
add_step dist_libofx
add_step dist_gnutls
add_step dist_gwenhywfar
-add_step dist_ktoblzcheck
add_step dist_aqbanking
add_step dist_libdbi
add_step dist_webkit
diff --git a/gnucash.modules b/gnucash.modules
index fba91cb..648a6db 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -162,11 +162,6 @@
</dependencies>
</autotools>
- <autotools id="ktoblzcheck" autogen-sh="configure">
- <branch module="ktoblzcheck/ktoblzcheck-1.47.tar.gz" version="1.47"
- repo="sourceforge"/>
- </autotools>
-
<autotools id="xmlsec" autogenargs="--disable-x509">
<branch module="lsh123/xmlsec/archive/xmlsec-1_2_25.tar.gz"
repo="github-tar" version="1.2.25"
@@ -184,7 +179,6 @@
<dependencies>
<dep package="gwenhywfar"/>
<dep package="gmp"/>
- <dep package="ktoblzcheck"/>
<dep package="xmlsec"/>
<dep package="libchipcard"/>
</dependencies>
@@ -199,7 +193,6 @@
<dep package="libofx"/>
<dep package="gwenhywfar-svn"/>
<dep package="gmp"/>
- <dep package="ktoblzcheck"/>
<dep package="xmlsec"/>
<dep package="libchipcard"/>
</dependencies>
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index a18afaa..8548578 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -79,7 +79,6 @@ Source: "@INST_DIR@\share\@PACKAGE@\*"; DestDir: "{app}\share\@PACKAGE@"; Flags:
Source: "@INST_DIR@\share\aqbanking\*"; DestDir: "{app}\share\aqbanking"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\gwenhywfar\*"; DestDir: "{app}\share\gwenhywfar"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\chipcard\*"; DestDir: "{app}\share\chipcard"; Flags: recursesubdirs; Components: main
-Source: "@INST_DIR@\share\ktoblzcheck\*"; DestDir: "{app}\share\ktoblzcheck"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\guile\*"; DestDir: "{app}\share\guile"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\glib-2.0\*"; DestDir: "{app}\share\glib-2.0"; Flags: recursesubdirs; Components: main
Source: "@INST_DIR@\share\libofx\*"; DestDir: "{app}\share\libofx"; Flags: recursesubdirs; Components: main
diff --git a/install-impl.sh b/install-impl.sh
index f688d16..18baa4e 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -290,8 +290,8 @@ function inst_aqbanking() {
patch -p1 < $AQB_PATCH
fi
- _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
+ _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
if test x$CROSS_COMPILE = xyes; then
XMLMERGE="xmlmerge"
else
@@ -704,33 +704,6 @@ function inst_isocodes() {
fi
}
-function inst_ktoblzcheck() {
- setup Ktoblzcheck
- # Out of convenience ktoblzcheck is being installed into
- # GWENHYWFAR_DIR
- add_to_env "-I${_GWENHYWFAR_UDIR}/include" KTOBLZCHECK_CPPFLAGS
- add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
- if quiet ${PKG_CONFIG} --exact-version=${KTOBLZCHECK_VERSION} ktoblzcheck
- then
- echo "Ktoblzcheck ${KTOBLZCHECK_VERSION} already installed in $_GWENHYWFAR_UDIR. skipping."
- else
- wget_unpacked $KTOBLZCHECK_URL $DOWNLOAD_DIR $TMP_DIR
- assert_one_dir $TMP_UDIR/ktoblzcheck-*
- qpushd $TMP_UDIR/ktoblzcheck-*
- # circumvent binreloc bug, http://trac.autopackage.org/ticket/28
- ./configure ${HOST_XCOMPILE} \
- --prefix=${_GWENHYWFAR_UDIR} \
- --disable-binreloc \
- --disable-python
- make
-# [ "$CROSS_COMPILE" != "yes" ] && make check
- make install
- qpopd
- ${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
- rm -rf ${TMP_UDIR}/ktoblzcheck-*
- fi
-}
-
function inst_libdbi() {
setup LibDBI
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
@@ -1482,8 +1455,8 @@ function inst_gnucash() {
${AQBANKING_OPTIONS} \
--enable-binreloc \
--enable-locale-specific-tax \
- CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
- LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
+ CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${HH_CPPFLAGS} ${LIBSOUP_CPPFLAGS} -D_WIN32 ${EXTRA_CFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${HH_LDFLAGS} -L${_SQLITE3_UDIR}/lib -L${_ENCHANT_UDIR}/lib -L${_LIBXSLT_UDIR}/lib" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
make
diff --git a/install.sh b/install.sh
index 883ad44..04396fd 100644
--- a/install.sh
+++ b/install.sh
@@ -42,8 +42,6 @@ register_env_var INTLTOOL_PERL " "
register_env_var LIBDBI_CPPFLAGS " "
register_env_var LIBDBI_LDFLAGS " "
register_env_var LIBXSLT_LDFLAGS " "
-register_env_var KTOBLZCHECK_CPPFLAGS " "
-register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
register_env_var PCRE_CPPFLAGS " "
register_env_var PCRE_LDFLAGS " "
@@ -91,7 +89,6 @@ add_step inst_opensp
add_step inst_libofx
## Online banking:
add_step inst_gwenhywfar
-add_step inst_ktoblzcheck
add_step inst_aqbanking
add_step inst_libdbi
Summary of changes:
cmake/defaults.cmake | 4 ----
crossbuild_webkit.sh | 2 --
defaults.sh | 4 ----
dist-impl.sh | 6 ------
dist.sh | 1 -
gnucash.modules | 7 -------
inno_setup/gnucash-mingw64.iss | 1 -
install-impl.sh | 35 ++++-------------------------------
install.sh | 3 ---
9 files changed, 4 insertions(+), 59 deletions(-)
More information about the gnucash-changes
mailing list