gnucash-on-osx master: Provide mariadb-clang-asm.patch
John Ralls
jralls at code.gnucash.org
Mon Jun 1 00:25:48 EDT 2026
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/6da1f93e (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/42af3b28 (commit)
commit 6da1f93e7abb9a032bbe1a3c09fa5463a9b6d427
Author: John Ralls <jralls at ceridwen.us>
Date: Sun May 31 21:25:26 2026 -0700
Provide mariadb-clang-asm.patch
diff --git a/dependencies.txt b/dependencies.txt
index a00210c..c62d34b 100644
--- a/dependencies.txt
+++ b/dependencies.txt
@@ -26,10 +26,10 @@ bin/guild
bin/msgmerge
bin/msgfmt
bin/pkgconf
-bin/python3.13
+bin/python3.14
bin/python3
bin/python3-config
-bin/python3.13-config
+bin/python3.14-config
bin/swig
bin/xgettext
bin/xsltproc
@@ -46,13 +46,14 @@ lib/gwenhywfar/
lib/libaqbanking.dylib lib/libaqbanking.44.dylib
lib/libatk-1.0.dylib lib/libatk-1.0.0.dylib
lib/libboost_atomic.dylib
+lib/libboost_charconv.dylib
lib/libboost_chrono.dylib
+lib/libboost_container.dylib
lib/libboost_date_time.dylib
lib/libboost_filesystem.dylib
lib/libboost_locale.dylib
lib/libboost_program_options.dylib
lib/libboost_regex.dylib
-lib/libboost_system.dylib
lib/libboost_thread.dylib
lib/libcairo-gobject.dylib lib/libcairo-gobject.2.dylib
lib/libcairo.dylib lib/libcairo.2.dylib
@@ -64,14 +65,15 @@ lib/libepoxy.dylib lib/libepoxy.0.dylib
lib/libexslt.dylib lib/libexslt.0.dylib
lib/libffi.dylib lib/libffi.8.dylib
lib/libfontconfig.dylib lib/libfontconfig.1.dylib
-lib/libfreetype.dylib lib/libfreetype.6.dylib lib/libfreetype.6.20.2.dylib
+lib/libfreetype.dylib lib/libfreetype.6.dylib lib/libfreetype.6.20.6.dylib
lib/libfribidi.dylib lib/libfribidi.0.dylib
-lib/libgc.dylib lib/libgc.1.dylib lib/libgc.1.5.3.dylib
+lib/libgc.dylib lib/libgc.1.dylib lib/libgc.1.5.6.dylib
lib/libgcrypt.dylib lib/libgcrypt.20.dylib
lib/libgdk-3.dylib lib/libgdk-3.0.dylib
lib/libgdk_pixbuf-2.0.dylib lib/libgdk_pixbuf-2.0.0.dylib
-lib/libgettextsrc.dylib lib/libgettextsrc-0.23.1.dylib
-lib/libgettextlib.dylib lib/libgettextlib-0.23.1.dylib
+lib/libgettextsrc.dylib lib/libgettextsrc-1.0.dylib
+lib/libgettextlib.dylib lib/libgettextlib-1.0.dylib
+lib/libgettextlib.dylib lib/libgettextpo.0.dylib
lib/libgio-2.0.dylib lib/libgio-2.0.0.dylib
lib/libglib-2.0.dylib lib/libglib-2.0.0.dylib
lib/libgmodule-2.0.dylib lib/libgmodule-2.0.0.dylib
@@ -87,7 +89,7 @@ lib/libgwengui-gtk3.dylib lib/libgwengui-gtk3.79.dylib
lib/libgwenhywfar.dylib lib/libgwenhywfar.79.dylib
lib/libharfbuzz-icu.dylib lib/libharfbuzz-icu.0.dylib
lib/libharfbuzz.dylib lib/libharfbuzz.0.dylib
-lib/libhogweed.dylib lib/libhogweed.6.dylib lib/libhogweed.6.10.dylib
+lib/libhogweed.dylib lib/libhogweed.7.dylib lib/libhogweed.7.0.dylib
lib/libiconv.dylib lib/libiconv.2.dylib
lib/libicudata.dylib lib/libicudata.73.dylib lib/libicudata.73.2.dylib
lib/libicui18n.dylib lib/libicui18n.73.dylib lib/libicui18n.73.2.dylib
@@ -98,42 +100,41 @@ lib/libjavascriptcoregtk-4.0.dylib lib/libjavascriptcoregtk-4.0.18.dylib lib/lib
lib/libjpeg.dylib lib/libjpeg.62.dylib lib/libjpeg.62.4.0.dylib
lib/libltdl.dylib lib/libltdl.7.dylib
lib/liblzma.dylib lib/liblzma.5.dylib
-lib/libnettle.dylib lib/libnettle.8.dylib lib/libnettle.8.10.dylib
+lib/libnettle.dylib lib/libnettle.9.dylib lib/libnettle.9.0.dylib
lib/libofx.dylib lib/libofx.7.dylib
lib/libosp.dylib lib/libosp.5.dylib
lib/libp11-kit.dylib lib/libp11-kit.0.dylib
lib/libpango-1.0.dylib lib/libpango-1.0.0.dylib
lib/libpangocairo-1.0.dylib lib/libpangocairo-1.0.0.dylib
lib/libpangoft2-1.0.dylib lib/libpangoft2-1.0.0.dylib
-lib/libpcre.dylib lib/libpcre.1.dylib
lib/libpcre2-8.dylib lib/libpcre2-8.0.dylib
lib/libpixman-1.dylib lib/libpixman-1.0.dylib
-lib/libpkgconf.dylib lib/libpkgconf.5.dylib
+lib/libpkgconf.dylib lib/libpkgconf.7.dylib
lib/libpng16.dylib lib/libpng16.16.dylib
lib/libpq.dylib lib/libpq.5.dylib
lib/libproxy.dylib lib/libproxy.1.dylib
lib/libproxy/libpxbackend-1.0.dylib
lib/libpsl.dylib lib/libpsl.5.dylib
-lib/libpython3.13.dylib
+lib/libpython3.14.dylib
lib/librsvg-2.dylib lib/librsvg-2.2.dylib
lib/libsharpyuv.dylib lib/libsharpyuv.0.dylib
lib/libsoup-2.4.dylib lib/libsoup-2.4.1.dylib
-lib/libsqlite3.dylib lib/libsqlite3.0.dylib lib/libsqlite3.3.49.1.dylib
+lib/libsqlite3.dylib lib/libsqlite3.0.dylib lib/libsqlite3.3.53.0.dylib
lib/libssl.dylib lib/libssl.3.dylib
lib/libtasn1.dylib lib/libtasn1.6.dylib
lib/libtextstyle.dylib lib/libtextstyle.0.dylib
-lib/libtiff.dylib lib/libtiff.6.dylib lib/libtiff.6.1.0.dylib
+lib/libtiff.dylib lib/libtiff.6.dylib lib/libtiff.6.2.0.dylib
lib/libunistring.dylib lib/libunistring.5.dylib
lib/libwebkit2gtk-4.0.dylib lib/libwebkit2gtk-4.0.37.dylib lib/libwebkit2gtk-4.0.37.53.1.dylib
lib/libwebp.dylib lib/libwebp.7.dylib
lib/libwebpdemux.dylib lib/libwebpdemux.2.dylib
-lib/libxml2.dylib lib/libxml2.2.dylib
+lib/libxml2.dylib lib/libxml2.16.dylib
lib/libxslt.dylib lib/libxslt.1.dylib
lib/libxmlsec1.dylib lib/libxmlsec1.1.dylib
-lib/libz.dylib lib/libz.1.dylib lib/libz.1.3.1.dylib
+lib/libz.dylib lib/libz.1.dylib lib/libz.1.3.2.dylib
lib/mariadb/libmariadb.dylib lib/mariadb/libmariadb.3.dylib lib/mariadb/libmysqlclient.dylib
lib/pkgconfig/
-lib/python3.13/
+lib/python3.14/
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
include/atk-1.0/
include/libxml2/
@@ -159,14 +160,14 @@ include/libsoup-2.4/
include/libxml2/
include/pango-1.0/
include/pixman-1
-include/python3.13/
+include/python3.14/
include/unicode/
include/webkitgtk-4.0/webkit2/
include/webkitgtk-4.0/jsc/
include/webp/
-share/cmake-3.31/
+share/cmake-4.3/
share/gettext/
-share/gettext-0.23.1/
+share/gettext-1.0/
share/guile/3.0
share/pkgconfig/
share/swig/
diff --git a/depstarball.sh b/depstarball.sh
index 2aa034e..0f1c191 100755
--- a/depstarball.sh
+++ b/depstarball.sh
@@ -4,7 +4,7 @@ if [ -z "$JHBUILD_PREFIX" ]; then
exit -1
fi
-GC_VERSION="5.13"
+GC_VERSION="5.15"
SRC_URI="https://github.com/gnucash/gnucash"
#Paths:
ROOT_DIR="/Users/runner/gnucash"
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 89c47e1..c37f324 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 5.15-1 © 2026 GnucashContributors</string>
+ <string>Gnucash version 5.15-2 © 2026 GnucashContributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.15-1 © 2026 Gnucash Contributors</string>
+ <string>5.15-2 © 2026 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.15-1</string>
+ <string>5.15-2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.15-1</string>
+ <string>5.15-2</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index c7f1dc7..83c5eaf 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -29,8 +29,8 @@
href="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/"
type="tarball" />
- <include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
+ <!--include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/-->
+ <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<meson id="shared-mime-info-2.2">
<branch module="2.2/shared-mime-info-2.2.tar.bz2"
diff --git a/patches/mariadb-clang-asm.patch b/patches/mariadb-clang-asm.patch
new file mode 100644
index 0000000..0a2cd5e
--- /dev/null
+++ b/patches/mariadb-clang-asm.patch
@@ -0,0 +1,12 @@
+--- a/libmariadb/ma_context.c 2025-10-06 05:06:21
++++ b/libmariadb/ma_context.c 2026-04-17 14:36:52
+@@ -637,6 +637,9 @@
+
+
+ #ifdef MY_CONTEXT_USE_AARCH64_GCC_ASM
++#ifdef __clang__
++#define asm(x) __asm(x)
++#endif
+
+ /* According to ARM, the instruction BTI [J][C] is a NOP in ARMv8
+ implementations that do not support it. However, the built-in assembler
Summary of changes:
dependencies.txt | 41 +++++++++++++++++++++--------------------
depstarball.sh | 2 +-
gnucash-bundler/Info.plist | 8 ++++----
modulesets/gnucash.modules | 4 ++--
patches/mariadb-clang-asm.patch | 12 ++++++++++++
5 files changed, 40 insertions(+), 27 deletions(-)
create mode 100644 patches/mariadb-clang-asm.patch
More information about the gnucash-changes
mailing list