gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Tue Sep 19 19:38:04 EDT 2023
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/d127e00f (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/cdfd38fa (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/db72f563 (commit)
commit d127e00f2f6bf37acaebb78ec9096a940d03c06d
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 19 16:37:46 2023 -0700
Fix typo in Postgresql lib directory name.
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 399d004..9c96e9c 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -198,7 +198,7 @@ Source: "@MINGW_DIR@\bin\gspawn-win32-helper-console.exe"; DestDir: "{app}\bin";
Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders\*.dll"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\loaders"; Components: main
Source: "@MINGW_DIR@\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: "{app}\lib\gdk-pixbuf-2.0\2.10.0\"; Components: main
-Source: "@MINGW_DIR@\lib\postgresql\*.dll"; DestDir: "{app}\lib\postgreql"; Components: main
+Source: "@MINGW_DIR@\lib\postgresql\*.dll"; DestDir: "{app}\lib\postgresql"; Components: main
Source: "@MINGW_DIR@\share\icons\*"; DestDir: "{app}\share\icons"; Flags: recursesubdirs; Components: main
Source: "@MINGW_DIR@\share\themes\*"; DestDir: "{app}\share\themes"; Flags: recursesubdirs; Components: main
commit cdfd38fa6af50b19c283b7f0906ee8ff9ecca638
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Aug 5 21:28:16 2023 -0700
Use mingw32 packages for libunistring and xmlsec instead of building them ourselves.
diff --git a/gnucash.modules b/gnucash.modules
index d6e725b..0db988a 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -3,8 +3,6 @@
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
- <repository type='tarball' name='ftp.gnu.org'
- href="ftp://ftp.gnu.org/gnu/"/>
<repository type='tarball' name='sourceforge'
href="http://downloads.sourceforge.net/"/>
<repository type="tarball" name="csail"
@@ -13,8 +11,6 @@
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="git" name="git.gnucash.org"
href="http://git.gnucash.org/"/>
- <repository type="tarball" name="xmlsec"
- href="http://www.aleksey.com/xmlsec/download/"/>
<repository type="git" name="aquamaniac"
href="https://git.aquamaniac.de/git/"/>
<repository type="tarball" name="aqbanking"
@@ -27,27 +23,27 @@
<systemmodule id="webkitgtk-3.0">
<pkg-config>webkitgtk-3.0.pc</pkg-config>
- <branch repo="system" version="2.4.11" />
+ <branch repo="system" />
</systemmodule>
<systemmodule id="shared-mime-info">
<pkg-config>shared-mime-info.pc</pkg-config>
- <branch repo="system" version="1.4" />
+ <branch repo="system" />
</systemmodule>
<systemmodule id="gnutls">
<pkg-config>gnutls.pc</pkg-config>
- <branch repo="system" version="3.5.10" />
+ <branch repo="system" />
</systemmodule>
<systemmodule id="openssl">
<pkg-config>openssl.pc</pkg-config>
- <branch repo="system" version="1.0.2k" />
+ <branch repo="system" />
</systemmodule>
<systemmodule id="libffi">
<pkg-config>libffi.pc</pkg-config>
- <branch repo="system" version="3.2.1" />
+ <branch repo="system" />
</systemmodule>
<systemmodule id="gmp">
@@ -73,12 +69,12 @@
<systemmodule id="icu">
<pkg-config>icu-i18n.pc</pkg-config>
- <branch repo="system" version="57.1" />
+ <branch repo="system" />
</systemmodule>
<systemmodule id="iso-codes">
<pkg-config>iso-codes.pc</pkg-config>
- <branch repo="system" version="3.74" />
+ <branch repo="system" />
</systemmodule>
<systemmodule id="boost">
@@ -88,11 +84,13 @@
<branch repo="system" />
</systemmodule>
- <autotools id="libunistring" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.7.tar.gz"
- version="0.9.7">
- </branch>
- </autotools>
+ <systemmodule id="libunistring" >
+ <branch repo="system" />
+ </systemmodule>
+
+ <systemmodule id="xmlsec">
+ <branch repo="system"/>
+ </systemmodule>
<autotools id="libatomic-ops"
autogen-template="/bin/bash -c 'pushd %(srcdir)s && ./%(autogen-sh)s && popd && %(srcdir)s/configure --prefix=%(prefix)s> %(autogenargs)s'"
@@ -109,21 +107,11 @@
</dependencies>
</autotools>
- <autotools id="guile" autogen-sh="configure"
- autogenargs="--disable-error-on-warning">
- <branch repo="ftp.gnu.org" module="guile/guile-1.8.8.tar.gz"
- version="1.8.8"/>
- <dependencies>
- <dep package="gmp"/>
- </dependencies>
- </autotools>
-
<autotools id="guile2" autogen-sh="autoreconf" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads=no --with-modules --disable-static">
<branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.7.3-5ef31.tar.xz"
version=" 2.2.7.3-5ef31">
</branch>
<dependencies>
- <dep package="libunistring"/>
<dep package="gmp"/>
<dep package="libffi"/>
<dep package="bdw-gc"/>
@@ -162,15 +150,6 @@
</dependencies>
</autotools>
- <autotools id="xmlsec" autogenargs="--without-gcrypt">
- <branch module="xmlsec1-1.2.32.tar.gz"
- repo="xmlsec" version="1.2.32" >
- </branch>
- <dependencies>
- <dep package="openssl"/>
- </dependencies>
- </autotools>
-
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
<branch module="499/aqbanking-6.5.4.tar.gz" repo="aqbanking" version="6.5.4">
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 2bb758e..caa0238 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -268,7 +268,7 @@ $ignorefile = ""
bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
# Install the remaining dependencies.
-$deps = "boost icu gtk3 iso-codes shared-mime-info libmariadbclient libsoup libwebp postgresql ninja pdcurses sqlite3 docbook-xsl"
+$deps = "boost icu gtk3 iso-codes shared-mime-info libmariadbclient libsoup libunistring libwebp postgresql ninja pdcurses sqlite3 docbook-xsl"
Write-Host @"
Summary of changes:
gnucash.modules | 49 ++++++++++++------------------------------
inno_setup/gnucash-mingw64.iss | 2 +-
setup-mingw64.ps1 | 2 +-
3 files changed, 16 insertions(+), 37 deletions(-)
More information about the gnucash-changes
mailing list