Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Wed, 18 Oct 2023 18:06:40 UTC Commit: 8e935155ac66c13cad3e7a1ba487ccc3ff05d985 https://github.com/geany/geany-osx/commit/8e935155ac66c13cad3e7a1ba487ccc3ff...
Log Message: ----------- Update to latest gtk-osx modulesets-stable and patches
Modified Paths: -------------- modulesets-stable/bootstrap.modules modulesets-stable/gtk-osx-bootstrap.modules modulesets-stable/gtk-osx-gstreamer.modules modulesets-stable/gtk-osx-gtkmm.modules modulesets-stable/gtk-osx-network.modules modulesets-stable/gtk-osx-python.modules modulesets-stable/gtk-osx-random.modules modulesets-stable/gtk-osx.modules patches/Pygments-setup-py.patch patches/amtk-build-on-macOS.patch patches/gjs-remove-js::CodeCoverage.patch patches/glib-2.76.3-libintl.patch patches/gmp-6.2.1-avoid-x18-register-apple-silicon.patch patches/gnutls-gnulib.patch patches/graphviz-remove-rpath.patch patches/gtk+-2-m4-creation.patch patches/gtk+-Bug-655065-Better-Fix.patch patches/gtk-3-24-36-call-gdk-quartz-osx-version.patch patches/gtk-3-24-36-frame_callback_crash.patch patches/gtk-3-24-36-image-recolor-load-crash.patch patches/gtk-3-24-36-match-window-size.patch patches/gtk-3.14-GDesktopAppInfo-not-implemented-on-Mac.patch patches/gtk-3.14-stylecontext-unnecessary-assert.patch patches/gtk-gimp-dnd-bug767091.patch patches/gtk-quartz-fix-pixelated-image-surfaces-in-retina-hidpi-.patch patches/gtk3-14-get-scale-factor.patch patches/gtk3-14-gtkdesktop.patch patches/gtk3-quartz-3-24-7-fixes.patch patches/libgcrypt-1.10.2-no-getrandom.patch patches/libtasn1-inline-fix.patch patches/libxslt-python-config.patch patches/nasm-2.16.01-warnings.c-needs-srcdir.patch patches/p11-kit-libintl.patch patches/pango-coretext-fix-clang-build-failure.patch patches/vasnprintf.patch patches/webkit-2.32-bug-224093.patch
Modified: modulesets-stable/bootstrap.modules 77 lines changed, 39 insertions(+), 38 deletions(-) =================================================================== @@ -35,9 +35,9 @@ <autotools id="xz" autogen-sh="configure" bootstrap="true"> - <branch module="xz/xz-5.2.5.tar.bz2" - version="5.2.5" - hash="sha256:5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df" + <branch module="xz/xz-5.4.3.tar.bz2" + version="5.4.3" + hash="sha256:9243a04598d7a70c1f567a0143a255581ac5c64b140fd55fd5cbc1e00b0e6f90" repo="tukaani.org" /> </autotools> <!-- @@ -47,20 +47,32 @@ autogen-sh="configure" autogenargs="--disable-dependency-tracking" bootstrap="true"> - <branch module="make/make-4.3.tar.gz" - version="4.3" - hash="sha256:e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" + <branch module="make/make-4.4.tar.gz" + version="4.4" + hash="sha256:581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18" repo="ftp.gnu.org" /> </autotools> <!----> + <autotools id="libiconv" + autogen-sh="configure" + autogenargs="--disable-debug --disable-dependency-tracking --enable-extra-encodings"> + + <branch module="libiconv/libiconv-1.17.tar.gz" + version="1.17" + repo="ftp.gnu.org" /> + </autotools> + <autotools id="gettext" autogen-sh="configure" autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">
- <branch module="gettext/gettext-0.21.tar.xz" - version="0.21" - hash="sha256:d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192" + <branch module="gettext/gettext-0.22.3.tar.xz" + version="0.22.3" + hash="sha256:b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6" repo="ftp.gnu.org" /> + <dependencies> + <dep package="libiconv" /> + </dependencies> </autotools> <!-- cmakes ./configure is picky about invalid flags so we manually set it @@ -69,8 +81,9 @@ autogen-sh="bootstrap" autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s" bootstrap="true"> - <branch module="v3.25/cmake-3.25.1.tar.gz" - version="3.25.1" + <branch module="v3.26/cmake-3.26.4.tar.gz" + version="3.26.4" + hash="sha256:313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208" repo="cmake" /> </autotools> <!-- @@ -80,13 +93,10 @@ <autotools id="m4" autogen-sh="configure" bootstrap="true"> - <branch module="m4/m4-1.4.18.tar.xz" - version="1.4.18" - hash="sha256:f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07" - repo="ftp.gnu.org"> - <patch file="vasnprintf.patch" - strip="1" /> - </branch> + <branch module="m4/m4-1.4.19.tar.xz" + version="1.4.19" + hash="sha256:63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96" + repo="ftp.gnu.org" /> </autotools> <!----> <autotools id="autoconf" @@ -105,18 +115,18 @@ <autotools id="autoconf-archive" autogen-sh="configure" bootstrap="true"> - <branch module="autoconf-archive/autoconf-archive-2021.02.19.tar.xz" - version="2021-02-19" - hash="sha256:e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd" + <branch module="autoconf-archive/autoconf-archive-2023.02.20.tar.xz" + version="2023-02-20" + hash="sha256:71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33" repo="ftp.gnu.org" /> </autotools> <!----> <autotools id="libtool" autogen-sh="configure" bootstrap="true"> - <branch module="libtool/libtool-2.4.6.tar.gz" - version="2.4.6" - hash="sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" + <branch module="libtool/libtool-2.4.7.tar.gz" + version="2.4.7" + hash="sha256:04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8" repo="ftp.gnu.org"> <patch file="libtool-apple-sort.patch" strip="1" /> @@ -126,9 +136,9 @@ <autotools id="automake" autogen-sh="configure" bootstrap="true"> - <branch module="automake/automake-1.16.3.tar.xz" - version="1.16.3" - hash="sha256:ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a" + <branch module="automake/automake-1.16.5.tar.xz" + version="1.16.5" + hash="sha256:f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469" repo="ftp.gnu.org" /> <dependencies> <dep package="autoconf" /> @@ -150,9 +160,8 @@ --> <autotools id="bison" autogen-sh="configure"> - <branch module="bison/bison-3.7.6.tar.xz" - version="3.7.6" - hash="sha256:67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf" + <branch module="bison/bison-3.8.2.tar.xz" + version="3.8.2" repo="ftp.gnu.org" /> <dependencies> <dep package='flex' /> @@ -191,19 +200,11 @@ version="0.51.0" hash="sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" repo="intltool" /> - <!-- - <dependencies> - <dep package="perl-xml-parser"/> - </dependencies> - --> </autotools> <!----> <metamodule id="meta-bootstrap"> <dependencies> <dep package="xz" /> - <!-- - Needed for 64-bit - --> <dep package="gettext" /> <dep package="cmake" /> <dep package="autoconf-archive" />
Modified: modulesets-stable/gtk-osx-bootstrap.modules 56 lines changed, 6 insertions(+), 50 deletions(-) =================================================================== @@ -36,9 +36,9 @@ <autotools id="libpng" autogen-sh="configure" autogenargs="--enable-shared"> - <branch module="libpng/libpng-1.6.39.tar.xz" - version="1.6.39" - hash="sha256:1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937" + <branch module="libpng/libpng-1.6.40.tar.xz" + version="1.6.40" + hash="sha256:535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1" repo="sourceforge" /> <dependencies> <dep package="zlib" /> @@ -56,9 +56,9 @@ <autotools id="libtiff" autogen-sh="configure" autogenargs="--without-x"> - <branch module="libtiff/tiff-4.5.0.tar.gz" - version="4.5.0" - hash="sha256:c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464" + <branch module="libtiff/tiff-4.5.1.tar.xz" + version="4.5.1" + hash="sha256:3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a" repo="libtiff"> <patch file="tiff-nohtml.patch" strip="1" /> @@ -68,61 +68,17 @@ </dependencies> </autotools> <!----> - <autotools id="libxml2" - autogen-sh="autoreconf" - autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'> - - <branch module="libxml2/2.10/libxml2-2.10.3.tar.xz" - version="2.10.3" - hash="sha256:5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c"> - <patch file="libxml2-python-config.patch" - strip="1" /> - </branch> - <after> - <dep package="python3" /> - </after> - </autotools> - <!----> - <autotools id="libxslt" - autogen-sh="configure"> - <branch module="libxslt/1.1/libxslt-1.1.37.tar.xz" - version="1.1.37" - hash="sha256:3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4"> - <patch file="libxslt-python-config.patch" - strip="1" /> - </branch> - <dependencies> - <dep package="libxml2" /> - </dependencies> - </autotools> - <!----> <meson id="gtk-doc" mesonargs="-Dyelp_manual=false -Dtests=false"> <branch module="gtk-doc/1.33/gtk-doc-1.33.2.tar.xz" version="1.33.2" hash="sha256:cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" /> - <dependencies> - <dep package="libxml2" /> - <dep package="libxslt" /> - </dependencies> <after> <dep package="python3" /> <dep package="pygments" /> </after> </meson> <!----> - <autotools id="icu" - autogen-sh="source/configure" - autogenargs="--enable-rpath" - makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'> - - <branch module="unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz" - version="68.2" - hash="sha256:c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625" - checkoutdir="icu" - repo="github-tarball" /> - </autotools> - <!----> <metamodule id="meta-gtk-osx-bootstrap"> <dependencies> <dep package="libpng" />
Modified: modulesets-stable/gtk-osx-gstreamer.modules 51 lines changed, 27 insertions(+), 24 deletions(-) =================================================================== @@ -24,9 +24,9 @@ <meson id="liborc" mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dtests=disabled">
- <branch module="orc/orc-0.4.33.tar.xz" - version="0.4.33" - hash="sha256:844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a" /> + <branch module="orc/orc-0.4.34.tar.xz" + version="0.4.34" + hash="sha256:8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f" /> </meson> <!----> <autotools id="faad2" @@ -44,7 +44,10 @@ <branch module="2.16.01/nasm-2.16.01.tar.xz" version="2.16.01" hash="sha256:c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558" - repo="nasm" /> + repo="nasm"> + <patch file="nasm-2.16.01-warnings.c-needs-srcdir-patch" + strip="1" /> + </branch> </autotools> <!----> <autotools id="ffmpeg" @@ -62,9 +65,9 @@ </autotools> <!----> <meson id="gstreamer"> - <branch module="gstreamer/gstreamer-1.22.0.tar.xz" - version="1.22.0" - hash="sha256:78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09"> + <branch module="gstreamer/gstreamer-1.22.5.tar.xz" + version="1.22.5" + hash="sha256:4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61"> </branch> <after> <dep package="glib" /> @@ -73,41 +76,40 @@ <!----> <meson id="gst-plugins-base" mesonargs="-Dexamples=disabled -Ddoc=disabled"> - <branch module="gst-plugins-base/gst-plugins-base-1.22.0.tar.xz" - version="1.22.0" - hash="sha256:f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d" /> + <branch module="gst-plugins-base/gst-plugins-base-1.22.5.tar.xz" + version="1.22.5" + hash="sha256:edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a" /> <dependencies> <dep package="gstreamer" /> <dep package="liborc" /> </dependencies> - <after></after> </meson> <!----> <meson id="gst-plugins-good"> - <branch module="gst-plugins-good/gst-plugins-good-1.22.0.tar.xz" - version="1.22.0" - hash="sha256:582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0"> + <branch module="gst-plugins-good/gst-plugins-good-1.22.5.tar.xz" + version="1.22.5" + hash="sha256:b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778"> </branch> <dependencies> <dep package="gstreamer" /> <dep package="gst-plugins-base" /> </dependencies> </meson> <!----> - <meson id="gst-plugins-ugly"> - <branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz" - version="1.22.0" - hash="sha256:a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c" /> + <meson id="gst-plugins-ugly" mesonargs="-Dgpl=enabled"> + <branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.5.tar.xz" + version="1.22.5" + hash="sha256:2680473b218158f18467cac3e1c50291b7ff4e0710dd350a59eaacbc29c09a54" /> <dependencies> <dep package="gstreamer" /> <dep package="gst-plugins-base" /> </dependencies> </meson> <!----> <meson id="gst-plugins-bad"> - <branch module="gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz" - version="1.22.0" - hash="sha256:3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1" /> + <branch module="gst-plugins-bad/gst-plugins-bad-1.22.5.tar.xz" + version="1.22.5" + hash="sha256:e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c" /> <dependencies> <dep package="gstreamer" /> <dep package="gst-plugins-base" /> @@ -117,9 +119,10 @@ </meson> <!----> <meson id="gst-libav"> - <branch module="gst-libav/gst-libav-1.22.0.tar.xz" - version="1.22.0" - hash="sha256:0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" /> + <branch module="gst-libav/gst-libav-1.22.5.tar.xz" + version="1.22.5" + hash="sha256:8583f0c1f4fcb01eed11fa1e3c21126543a8bd739ed4fc1db31f756a5ab01d9a"> + </branch> <dependencies> <dep package="gstreamer" /> <dep package="gst-plugins-base" />
Modified: modulesets-stable/gtk-osx-gtkmm.modules 105 lines changed, 45 insertions(+), 60 deletions(-) =================================================================== @@ -19,17 +19,17 @@ type="tarball" /> <!----> <meson id="mm-common"> - <branch module="mm-common/1.0/mm-common-1.0.2.tar.xz" - version="1.0.2" - hash="sha256:a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d" /> + <branch module="mm-common/1.0/mm-common-1.0.5.tar.xz" + version="1.0.5" + hash="sha256:705c6d29f4116a29bde4e36cfc1b046c92b6ef8c6dae4eaec85018747e6da5aa" /> </meson> <!-- Libsigc++ was rewritten to use C++17 variadic templates for version 3, and adopting that has created substantial API breaks for the whole "mm" stack. - gtkmm2 and gtkmm3 use the older versions, gtkmm4 the new ones. + gtkmm3 uses the older versions, gtkmm4 the new ones. Note that C++17 is supported only on macOS-10.13 and later. --> - <meson id="cairomm-1.14"> + <meson id="cairomm3"> <branch module="cairomm-1.14.2.tar.xz" version="1.14.2" hash="sha256:0126b9cc295dc36bc9c0860d5b720cb5469fd78d5620c8f10cc5f0c07b928de3" @@ -49,22 +49,21 @@ </dependencies> </meson> <!----> - <autotools id="glibmm-2.4" - autogen-sh="autoreconf"> - <branch module="glibmm/2.60/glibmm-2.60.0.tar.xz" - version="2.60.0" - hash="sha256:a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc" /> + <meson id="glibmm3"> + <branch module="glibmm/2.66/glibmm-2.66.6.tar.xz" + version="2.66.6" + hash="sha256:5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f" /> <dependencies> <dep package="glib" /> <dep package="libsigc++2" /> <dep package="mm-common" /> </dependencies> - </autotools> + </meson> <!----> <meson id="glibmm"> - <branch module="glibmm/2.68/glibmm-2.68.0.tar.xz" - version="2.68.0" - hash="sha256:c1f38573191dceed85a05600888cf4cf4695941f339715bd67d51c2416f4f375"> + <branch module="glibmm/2.76/glibmm-2.76.0.tar.xz" + version="2.76.0" + hash="sha256:8637d80ceabd94fddd6e48970a082a264558d4ab82684e15ffc87e7ef3462ab2"> </branch> <dependencies> <dep package="glib" /> @@ -73,44 +72,44 @@ </dependencies> </meson> <!----> - <meson id="pangomm-1.4"> + <meson id="pangomm3"> <branch module="pangomm/2.42/pangomm-2.42.2.tar.xz" version="2.42.2" hash="sha256:1b24c92624ae1275ccb57758175d35f7c39ad3342d8c0b4ba60f0d9849d2d08a" /> <dependencies> - <dep package="glibmm-2.4" /> - <dep package="cairomm-1.14" /> + <dep package="glibmm3" /> + <dep package="cairomm3" /> <dep package="pango" /> </dependencies> </meson> <!----> <meson id="pangomm"> - <branch module="pangomm/2.48/pangomm-2.48.0.tar.xz" - version="2.48.0" - hash="sha256:9e0ed474c33f8c2002ca9e2b61ca0d1f3d8e409e09e99f4d8c19eeafccf55b78" /> + <branch module="pangomm/2.50/pangomm-2.50.1.tar.xz" + version="2.50.1" + hash="sha256:ccc9923413e408c2bff637df663248327d72822f11e394b423e1c5652b7d9214" /> <dependencies> <dep package="glibmm" /> <dep package="cairomm" /> <dep package="pango" /> </dependencies> </meson> <!----> - <meson id="atkmm-1.6"> - <branch module="atkmm/2.28/atkmm-2.28.1.tar.xz" - version="2.28.1" - hash="sha256:116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad" /> + <meson id="atkmm3"> + <branch module="atkmm/2.28/atkmm-2.28.3.tar.xz" + version="2.28.3" + hash="sha256:7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969" /> <dependencies> - <dep package="glibmm-2.4" /> - <dep package="cairomm-1.14" /> - <dep package="pangomm-1.4" /> + <dep package="glibmm3" /> + <dep package="cairomm3" /> + <dep package="pangomm3" /> <dep package="atk" /> </dependencies> </meson> <!----> <meson id="atkmm"> - <branch module="atkmm/2.36/atkmm-2.36.0.tar.xz" - version="2.36.0" - hash="sha256:c93fa9f3876536391b54c307a923b7788e79796ace69a5e9141d67398c019973" /> + <branch module="atkmm/2.36/atkmm-2.36.2.tar.xz" + version="2.36.2" + hash="sha256:6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079" /> <dependencies> <dep package="glibmm" /> <dep package="cairomm" /> @@ -120,52 +119,38 @@ </meson> <!----> <meson id="libsigc++2"> - <branch module="libsigc++/2.10/libsigc++-2.10.6.tar.xz" - version="2.10.6" - hash="sha256:dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b" /> + <branch module="libsigc++/2.12/libsigc++-2.12.0.tar.xz" + version="2.12.0" + hash="sha256:1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5" /> </meson> <!----> <meson id="libsigc++3"> - <branch module="libsigc++/3.0/libsigc++-3.0.6.tar.xz" - version="3.0.6" - hash="sha256:b70edcf4611651c54a426e109b17196e1fa17da090592a5000e2d134c03ac5ce" /> + <branch module="libsigc++/3.4/libsigc++-3.4.0.tar.xz" + version="3.4.0" + hash="sha256:02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e" /> </meson> <!----> - <autotools id="gtkmm2" - autogen-sh="configure"> - <branch module="gtkmm/2.24/gtkmm-2.24.5.tar.xz" - version="2.24.5" - hash="sha256:0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72" /> - <dependencies> - <dep package="glibmm-2.4" /> - <dep package="cairomm-1.14" /> - <dep package="pangomm-1.4" /> - <dep package="atkmm-1.6" /> - <dep package="gtk+-2.0" /> - </dependencies> - </autotools> - <!----> <meson id="gtkmm3"> - <branch module="gtkmm/3.24/gtkmm-3.24.4.tar.xz" - version="3.24.4" - hash="sha256:9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743"> + <branch module="gtkmm/3.24/gtkmm-3.24.7.tar.xz" + version="3.24.7" + hash="sha256:1d7a35af9c5ceccacb244ee3c2deb9b245720d8510ac5c7e6f4b6f9947e6789c">
<patch file="gtkmm-3-bad-const-property-background.patch" strip="1" /> </branch> <dependencies> - <dep package="glibmm-2.4" /> - <dep package="cairomm-1.14" /> - <dep package="pangomm-1.4" /> - <dep package="atkmm-1.6" /> + <dep package="glibmm3" /> + <dep package="cairomm3" /> + <dep package="pangomm3" /> + <dep package="atkmm3" /> <dep package="gtk+-3.0" /> </dependencies> </meson> <!----> <meson id="gtkmm4"> - <branch module="gtkmm/4.0/gtkmm-4.0.1.tar.xz" - version="4.0.1" - hash="sha256:8973d9bc7848e02cb2051e05f3ee3a4baffe2feb4af4a5487f0e3132eec03884" /> + <branch module="gtkmm/4.10/gtkmm-4.10.0.tar.xz" + version="4.10.0" + hash="sha256:e1b109771557ecc53cba915a80b6ede827ffdbd0049c62fdf8bd7fa79afcc6eb" /> <dependencies> <dep package="glibmm" /> <dep package="cairomm" />
Modified: modulesets-stable/gtk-osx-network.modules 199 lines changed, 110 insertions(+), 89 deletions(-) =================================================================== @@ -54,24 +54,17 @@ autogenargs="shared" makeinstallargs="install_sw" supports-non-srcdir-builds="no"> - <branch module="openssl-1.1.1s.tar.gz" - version="1.1.1s" - hash="sha256:c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa" - repo="openssl" /> + <branch module="openssl-3.1.1.tar.gz" version="3.1.1" repo="openssl" + hash="sha256:b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"/> </autotools> - <!-- - Rudely demands TeX to build documentation - libnettle 3.7 doesn't have arm64 assembler support and the support that's added in master - is for arm-64-neutron that's incompatible with Apple Silicon. - --> + <!----> <if condition-set="arm64"> <autotools id="libnettle" autogen-sh="configure" autogenargs="--disable-documentation --disable-assembler"> - - <branch module="nettle/nettle-3.7.3.tar.gz" - version="3.7.3" - hash="sha256:661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0" + <branch module="nettle/nettle-3.9.1.tar.gz" + version="3.9.1" + hash="sha256:ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3" repo="ftp.gnu.org" /> <dependencies> <dep package="gmp" /> @@ -84,9 +77,9 @@ <autotools id="libnettle" autogen-sh="configure" autogenargs="--disable-documentation"> - <branch module="nettle/nettle-3.7.3.tar.gz" - version="3.7.3" - hash="sha256:661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0" + <branch module="nettle/nettle-3.9.1.tar.gz" + version="3.9.1" + hash="sha256:ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3" repo="ftp.gnu.org" /> <dependencies> <dep package="gmp" /> @@ -97,102 +90,95 @@ <!----> <autotools id="libtasn1" autogen-sh="configure"> - <branch module="libtasn1/libtasn1-4.17.0.tar.gz" - version="4.17.0" - hash="sha256:ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5" - repo="ftp.gnu.org"> - <patch file="libtasn1-inline-fix.patch" - strip="1" /> - </branch> + <branch module="libtasn1/libtasn1-4.19.0.tar.gz" + version="4.19.0" + hash="sha256:1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a" + repo="ftp.gnu.org" /> </autotools> <!----> <cmake id="zlib"> - <branch module="zlib-1.2.13.tar.xz" - version="1.2.13" - hash="sha256:d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98" + <branch module="zlib-1.3.tar.xz" + version="1.3" + hash="sha256:8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7" repo="zlib" /> </cmake> <!----> <autotools id="p11-kit" autogen-sh="configure" autogenargs="--without-trust-paths"> - <branch module="p11-glue/p11-kit/releases/download/0.23.22/p11-kit-0.23.22.tar.xz" - version="0.23.22" - hash="sha256:8a8f40153dd5a3f8e7c03e641f8db400133fb2a6a9ab2aee1b6d0cb0495ec6b6" - repo="github-tarball" /> + <branch module="p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz" + version="0.24.1" + hash="sha256:d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8" + repo="github-tarball"> + <patch file="p11-kit-libintl.patch" + strip="1" /> + </branch> <dependencies> <dep package="libffi" /> <dep package="libtasn1" /> </dependencies> </autotools> <!----> - <if condition-unset="pre-Mavericks"> - <autotools id="gnutls" - autogen-sh="autoreconf" - autogenargs="--disable-gtk-doc-html --with-included-unistring"> - - <branch module="gcrypt/gnutls/v3.7/gnutls-3.7.7.tar.xz" - version="3.7.7" - hash="sha256:be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106" - repo="gnupg.org" > - <patch file="gnutls-pkg-config-pc.patch" - strip="1"/> - </branch> - <dependencies> - <dep package="libnettle" /> - <dep package="libtasn1" /> - <dep package="zlib" /> - <dep package="p11-kit" /> - <dep package="libgcrypt" /> - </dependencies> - </autotools> - </if> + <autotools id="gnutls" + autogen-sh="autoreconf" + autogenargs="--disable-doc --with-included-unistring"> + + <branch module="gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz" + version="3.8.0" + hash="sha256:0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5" + repo="gnupg.org"> + <patch file="gnutls-pkg-config-pc.patch" + strip="1" /> + <patch file="gnutls-gnulib.patch" + strip="1" /> + </branch> + <dependencies> + <dep package="libnettle" /> + <dep package="libtasn1" /> + <dep package="zlib" /> + <dep package="p11-kit" /> + <dep package="libgcrypt" /> + </dependencies> + </autotools> <!----> <autotools id="libgpg-error" autogen-sh="autoreconf" autogenargs="--disable-doc"> - <branch module="gcrypt/libgpg-error/libgpg-error-1.43.tar.bz2" - version="1.43" - hash="sha256:a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf" + <branch module="gcrypt/libgpg-error/libgpg-error-1.47.tar.bz2" + version="1.47" + hash="sha256:9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb" repo="gnupg.org" /> </autotools> <!----> <autotools id="libgcrypt" autogen-sh="configure"> - <branch module="gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2" - version="1.9.4" - hash="sha256:ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7" - repo="gnupg.org" /> - <dependencies> - <dep package="libgpg-error" /> - </dependencies> - </autotools> - <!----> - <autotools id="gpg" - autogen-sh='configure'> - <branch module="gcrypt/gnupg/gnupg-2.3.3.tar.bz2" - version="2.3.3" - hash="sha256:5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937" - repo="gnupg.org" /> + <branch module="gcrypt/libgcrypt/libgcrypt-1.10.2.tar.bz2" + version="1.10.2" + hash="sha256:3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03" + repo="gnupg.org"> + <patch file="libgcrypt-1.10.2-no-getrandom.patch" + strip="1" /> + </branch> <dependencies> <dep package="libgpg-error" /> - <dep package="libgcrypt" /> </dependencies> </autotools> <!----> <meson id="libsecret" mesonargs="-Dvapi=disabled -Dgtk_doc=disabled"> - <branch module="libsecret/0.20/libsecret-0.20.4.tar.xz" - version="0.20.4" /> + <branch module="libsecret/0.20/libsecret-0.20.5.tar.xz" + version="0.20.5" + hash="sha256:3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d" /> <dependencies> <dep package="glib" /> <dep package="libgcrypt" /> </dependencies> </meson> <!----> <meson id="gcr"> - <branch module="gcr/3.38/gcr-3.38.1.tar.xz" - version="3.38" /> + <branch module="gcr/4.1/gcr-4.1.0.tar.xz" + version="4.1.0" + hash="sha256:9ceaad29284ba919b9216e2888c18ec67240c2c93b3a4856bc5488bbc1f3a383" /> <dependencies> <dep package="p11-kit" /> <dep package="gpg" /> @@ -203,23 +189,42 @@ <!----> <autotools id="gnome-keyring" autogenargs="--disable-pam --without-root-certs"> - <branch module="gnome-keyring/40/gnome-keyring-40.0.tar.xz" - version="40.0" /> + <branch module="gnome-keyring/42/gnome-keyring-42.1.tar.xz" + version="42.1" + hash="sha256:c7f4d040cc76a6b7fe67e08ef9106911c3c80d40fc88cbfc8e2684a4c946e3e6" /> <dependencies> <dep package="libgcrypt" /> <dep package="gcr" /> </dependencies> </autotools> <!----> + <meson id="gsettings-desktop-schemas"> + <branch module="gsettings-desktop-schemas/44/gsettings-desktop-schemas-44.0.tar.xz" + version="44.0" + hash="shas56:eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e" /> + </meson> + <!----> + <meson id="libproxy" + mesonargs="-Ddocs=false -Dtests=false -Dpacrunner-duktape=false -Dvapi=false -Dcurl=false -Dintrospection=false"> + + <branch module="libproxy/libproxy/archive/refs/tags/0.5.2.tar.gz" + version="0.5.2" + hash="sha256:7d75a2cf1c977056eb86f460daab0247d30e6a34e26ec755aab4de40cfd0a06d" + checkoutdir="libproxy-0.5.2" + repo="github-tarball" /> + <dependencies> + <dep package="gsettings-desktop-schemas" /> + </dependencies> + </meson> + <!----> <meson id="glib-networking" mesonargs="-Dopenssl=enabled"> - <branch module="glib-networking/2.68/glib-networking-2.68.0.tar.xz" - version="2.68.0" - hash="sha256:0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e" /> + <branch module="glib-networking/2.76/glib-networking-2.76.0.tar.xz" + version="2.76.0" + hash="sha256:149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a" /> <dependencies> - <if condition-unset="pre-Mavericks"> - <dep package="gnutls" /> - </if> + <dep package="libproxy" /> + <dep package="gnutls" /> <dep package="glib" /> </dependencies> </meson> @@ -234,9 +239,9 @@ <!----> <meson id="libsoup" mesonargs="-Dvapi=disabled"> - <branch module="libsoup/2.72/libsoup-2.72.0.tar.xz" - version="2.72.0" - hash="sha256:170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387"> + <branch module="libsoup/2.74/libsoup-2.74.3.tar.xz" + version="2.74.3" + hash="sha256:e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"> </branch> <dependencies> <dep package="libpsl" /> @@ -248,13 +253,27 @@ </dependencies> </meson> <!----> + <meson id="libsoup3" + mesonargs="-Dvapi=disabled"> + <branch module="libsoup/3.4/libsoup-3.4.2.tar.xz" + version="3.4.2" + hash="sha256:78c8fa37cb152d40ec8c4a148d6155e2f6947f3f1602a7cda3a31ad40f5ee2f3" /> + <dependencies> + <dep package="libpsl" /> + <dep package="python3" /> + <dep package="glib" /> + <dep package="glib-networking" /> + <dep package="sqlite" /> + <dep package="vala" /> + </dependencies> + </meson> + <!----> <autotools id="libwebp" autogen-sh="configure" autogenargs="--enable-libwebpmux --enable-libwebpdecoder"> - - <branch module="webp/libwebp-1.2.2.tar.gz" - version="1.2.2" - hash="sha256:7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6" + <branch module="webp/libwebp-1.3.0.tar.gz" + version="1.3.0" + hash="sha256:64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c" repo="webm" /> </autotools> <!-- @@ -293,6 +312,8 @@ strip="1" /> <patch file="WebKit2Gtk3-2.32.0-color-components-correct-math-header.patch" strip="1" /> + <patch file="webkit-2.32-bug-224093.patch" + strip="1" /> </branch> <dependencies> <dep package="libwebp" />
Modified: modulesets-stable/gtk-osx-python.modules 29 lines changed, 17 insertions(+), 12 deletions(-) =================================================================== @@ -29,6 +29,8 @@ <!----> <metamodule id="meta-gtk-osx-python3-gtk3"> <dependencies> + <dep package="meta-gtk-osx-gtk3" /> + <dep package='pygments' /> <dep package="pycairo" /> <dep package="pygobject3" /> <dep package="gtk-mac-integration-python" /> @@ -41,9 +43,9 @@ <autotools id="python3" autogen-sh="configure" autogenargs="--enable-shared"> - <branch module="3.10.10/Python-3.10.10.tar.xz" - version="3.10.10" - hash="sha256:0419e9085bf51b7a672009b3f50dbf1859acdf18ba725d0ec19aa5c8503f0ea3" + <branch module="3.11.4/Python-3.11.4.tar.xz" + version="3.11.4" + hash="sha256:2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6" repo="python" /> <dependencies> <dep package='readline' /> @@ -55,9 +57,9 @@ </autotools> <!----> <meson id="pycairo"> - <branch module="/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz" - version="1.20.0" - hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c" + <branch module="pygobject/pycairo/releases/download/v1.24.0/pycairo-1.24.0.tar.gz" + version="1.24.0" + hash="sha256:1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6" repo="github-tarball" /> <dependencies> <dep package="cairo" /> @@ -67,9 +69,9 @@ </meson> <!----> <meson id="pygobject3"> - <branch module="pygobject/3.40/pygobject-3.40.1.tar.xz" - version="3.40.1" - hash="sha256:00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035" /> + <branch module="pygobject/3.44/pygobject-3.44.1.tar.xz" + version="3.44.1" + hash="sha256:3c6805d1321be90cc32e648215a562430e0d3d6edcda8f4c5e7a9daffcad5710" /> <dependencies> <dep package="pycairo" /> </dependencies> @@ -94,9 +96,12 @@ </autotools> <!----> <distutils id="pygments"> - <branch module="ba/6e/7a7c13c21d8a4a7f82ccbfe257a045890d4dbf18c023f985f565f97393e3/Pygments-2.9.0.tar.gz" - version="2.9.0" - repo="pymodules" /> + <branch module="89/6b/2114e54b290824197006e41be3f9bbe1a26e9c39d1f5fa20a6d62945a0b3/Pygments-2.15.1.tar.gz" + version="2.15.1" + repo="pymodules"> + <patch file="Pygments-setup-py.patch" + strip="1" /> + </branch> <dependencies> <dep package="python3" /> </dependencies>
Modified: modulesets-stable/gtk-osx-random.modules 176 lines changed, 90 insertions(+), 86 deletions(-) =================================================================== @@ -32,20 +32,15 @@ <repository name="sqlite" href="http://www.sqlite.org/" type="tarball" /> - <repository name="fossies" - href="https://fossies.org/linux/misc/" - type="tarball" /> - <repository name="paguire" - href="https://releases.pagure.org/" - type="tarball" /> - <repository name="pcre" - href="https://ftp.pcre.org/pub/" + <repository name="itstool" + href="http://files.itstool.org/" type="tarball" /> <!----> - <cmake id="graphviz"> - <branch module="2.47.0/graphviz-2.47.0.tar.bz2" - version="2.47.0" - hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714" + <cmake id="graphviz" + cmakeargs="-Dwith_gvedit=NO"> + <branch module="8.0.5/graphviz-8.0.5.tar.bz2" + version="8.0.5" + hash="sha256:c1901fe52483fad55fbf893ccd59a3dcaedd53f0d50b5aebbbf3deaba93b674d" repo="graphviz"> <patch file="graphviz-remove-rpath.patch" strip="1" /> @@ -58,9 +53,9 @@ <!----> <autotools id="vala" autogen-sh="configure"> - <branch module="vala/0.52/vala-0.52.0.tar.xz" - version="0.52.0" - hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b" /> + <branch module="vala/0.56/vala-0.56.8.tar.xz" + version="0.56.8" + hash="sha256:93f81dcfc6a93b77baa271d65e6be981ee3238ad451ef380af118e295d904bde" /> <dependencies> <dep package="graphviz" /> <dep package="meta-gtk-osx-bootstrap" /> @@ -70,29 +65,40 @@ <!----> <autotools id="expat" autogen-sh="configure"> - <branch module="expat/expat-2.3.0.tar.bz2" - version="2.3.0" - hash="sha256:f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586" + <branch module="expat/expat-2.5.0.tar.xz" + version="2.5.0" + hash="sha256:ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe" repo="sourceforge" /> </autotools> <!----> <meson id="amtk"> - <branch module="amtk/5.3/amtk-5.3.1.tar.xz" - version="5.3.1" - hash="sha256:d5aa236c5d71dc41aa4674f345560a67a27f21c0efc97c9b3da09cb582b4638b"> - - <patch file="amtk-build-on-macOS.patch" - strip="1" /> + <branch module="amtk/5.6/amtk-5.6.1.tar.xz" + version="5.6.1" + hash="sha256:d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228"> </branch> <dependencies> <dep package="gtk+-3.0" /> </dependencies> </meson> <!----> + <autotools id="itstool" + autogen-sh="configure"> + <branch module="itstool/itstool-2.0.6.tar.bz2" + version="2.0.6n" + hash="sha256:6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9" + repo="itstool"> + <patch file="itstool-config-python.patch" + strip="1" /> + </branch> + <dependencies> + <dep package="libxml2" /> + </dependencies> + </autotools> + <!----> <meson id="devhelp-gtk3"> - <branch module="devhelp/3.38/devhelp-3.38.1.tar.xz" - version="3.38.1" - hash="sha256:4da8f5951b3a5920df73d057beab3ebe1855a75eae41208a9d89305a6b114a8f"> + <branch module="devhelp/43/devhelp-43.0.tar.xz" + version="43.0" + hash="sha256:63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04">
<patch file="devhelp-3-build-on-macOS.patch" strip="1" /> @@ -105,6 +111,7 @@ Without shared-mime-info, HTML documents display as plain text --> <dep package="shared-mime-info" /> + <dep package="itstool" /> </dependencies> </meson> <!----> @@ -125,76 +132,41 @@ --> <meson id="gtksourceview3" mesonargs="-Dvapi=false"> - <branch module="gtksourceview/4.8/gtksourceview-4.8.1.tar.xz" - version="4.8.1" - hash="sha256:d163d71b5fcafbc5b1eec6dd841edbdbcddd3a7511cd5fdcffd86b8bbfe69ac1"> + <branch module="gtksourceview/4.8/gtksourceview-4.8.4.tar.xz" + version="4.8.4" + hash="sha256:7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d"> </branch> <dependencies> <dep package="gtk+-3.0" /> </dependencies> </meson> <!----> - <autotools id="libpcre2" - autogen-sh="configure"> - <branch module="pcre/pcre2-10.36.tar.bz2" - version="20.36" - hash="sha256:a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c" - repo="pcre" /> - </autotools> - <!----> - <meson id="gtksourceview4"> - <branch module="gtksourceview/5.0/gtksourceview-5.0.0.tar.xz" - version="5.0.0" - hash="sha256:64826633c0c8d2c6a6eb4ec653215ef04e31e13a2d4156a09ca5fd9013acd9c3"> + <meson id="gtksourceview4" + mesonargs="-Dintrospection=disabled"> + <branch module="gtksourceview/5.8/gtksourceview-5.8.0.tar.xz" + version="5.8.0" + hash="sha256:110dd4c20def21886fbf777298fe0ef8cc2ad6023b8f36c7424411a414818933"> </branch> <dependencies> <dep package="gtk-4" /> <dep package="libpcre2" /> </dependencies> </meson> <!----> - <autotools id="getopt" - autogen-sh="configure" - supports-non-srcdir-builds="no"> - <branch module="getopt-1.1.6.tar.gz" - version="1.1.6" - hash="sha256:d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe" - repo="fossies"> - <patch file="getopt-autotools.patch" - strip="1" /> - </branch> - </autotools> - <!----> - <autotools id="xmlto" - autogen-sh="autoreconf"> - <branch module="xmlto/xmlto-0.0.28.tar.bz2" - version="0.0.28" - hash="sha256:1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276" - repo="paguire"> - <patch file="xmlto-allow-net-access.patch" - strip="1" /> - </branch> - <dependencies> - <dep package="getopt" /> - </dependencies> - </autotools> - <!----> <meson id="shared-mime-info"> <branch module="2.2/shared-mime-info-2.2.tar.bz2" version="2.2" hash="sha256:418c480019d9865f67f922dfb88de00e9f38bf971205d55cdffab50432919e61" - repo="shared-mime-info"> - </branch> + repo="shared-mime-info" /> <dependencies> <dep package="glib" /> - <dep package="xmlto" /> </dependencies> </meson> <!----> <meson id="gsettings-desktop-schemas"> - <branch module="gsettings-desktop-schemas/40/gsettings-desktop-schemas-40.0.tar.xz" - version="40.0" - hash="sha256:f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685" /> + <branch module="gsettings-desktop-schemas/44/gsettings-desktop-schemas-44.0.tar.xz" + version="44.0" + hash="sha256:eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e" /> <dependencies> <dep package="gobject-introspection" /> </dependencies> @@ -203,9 +175,9 @@ <autotools id="sqlite" autogen-sh="configure" autogenargs="--disable-tcl --enable-threadsafe"> - <branch module="2022/sqlite-autoconf-3390400.tar.gz" - version='3.39.4' - hash="sha256:f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb" + <branch module="2023/sqlite-autoconf-3420000.tar.gz" + version='3.42.0' + hash="sha256:7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6" repo="sqlite" /> </autotools> <!-- @@ -235,20 +207,19 @@ <!----> <autotools id="hunspell" autogen-sh="autoreconf"> - <branch module="hunspell/hunspell/archive/v1.7.0.tar.gz" - version="1.7.0" - hash="sha256:bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a" - checkoutdir="hunspell-1.7.0" - rename-tarball="hunspell-1.7.0.tar.gz" + <branch module="hunspell/hunspell/archive/v1.7.2.tar.gz" + version="1.7.2" + hash="sha256:69fa312d3586c988789266eaf7ffc9861d9f6396c31fc930a014d551b59bbd6e" + checkoutdir="hunspell-1.7.2" + rename-tarball="hunspell-1.7.2.tar.gz" repo="github-tarball" /> </autotools> <!----> <autotools id="enchant" autogen-sh="configure" autogenargs="--enable-relocatable"> - <branch module="AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz" - version="2.2.15" - hash="sha256:3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03" + <branch module="AbiWord/enchant/releases/download/v2.5.0/enchant-2.5.0.tar.gz" + version="2.5.0" repo="github-tarball" /> <dependencies> <dep package="glib" /> @@ -280,7 +251,10 @@ <branch module="gmp/gmp-6.2.1.tar.bz2" version="6.2.1" hash="sha256:eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c" - repo="ftp.gnu.org" /> + repo="ftp.gnu.org"> + <patch file="gmp-6.2.1-avoid-x18-register-apple-silicon.patch" + strip="1" /> + </branch> </autotools> <!----> <autotools id='readline' @@ -299,4 +273,34 @@ repo="iso-codes" /> </autotools> <!----> + <autotools id="libxml2" + autogen-sh="autoreconf" + autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'> + + <branch module="libxml2/2.11/libxml2-2.11.4.tar.xz" + version="2.11.4" + hash="sha256:737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"> + + <patch file="libxml2-python-config.patch" + strip="1" /> + </branch> + <after> + <dep package="python3" /> + </after> + </autotools> + <!----> + <autotools id="libxslt" + autogen-sh="autoreconf"> + <branch module="libxslt/1.1/libxslt-1.1.38.tar.xz" + version="1.1.38" + hash="sha256:1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1"> + + <patch file="libxslt-python-config.patch" + strip="1" /> + </branch> + <dependencies> + <dep package="libxml2" /> + </dependencies> + </autotools> + <!----> </moduleset>
Modified: modulesets-stable/gtk-osx.modules 174 lines changed, 88 insertions(+), 86 deletions(-) =================================================================== @@ -93,32 +93,36 @@ <!----> <autotools id="libffi" autogen-sh="configure" - autogenargs="--disable-multi-os-directory"> + autogenargs="--disable-multi-os-directory --disable-docs"> + <branch module="libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz" version="3.4.4" hash="sha256:d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676" repo="github-tarball" /> </autotools> <!----> - <autotools id="libpcre" + <autotools id="libpcre2" autogen-sh="configure" - autogenargs="--enable-unicode-properties --enable-newline-is-any --enable-jit"> - - <branch module="pcre/pcre-8.45.tar.bz2" - version="8.45" - hash="sha256:4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8" - repo="sourceforge" /> + autogenargs="--enable-pcre2-16 --enable-pcre2-32 --enable-jit"> + + <branch module="PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2" + version="10.42" + hash="sha256:8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840" + repo="github-tarball" /> </autotools> <!----> <meson id="glib" mesonargs="-Dlibmount=disabled"> - <branch module="glib/2.72/glib-2.72.0.tar.xz" - version="2.72.0" - hash="sha256:d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d"> + <branch module="glib/2.76/glib-2.76.3.tar.xz" + version="2.76.3" + hash="sha256:c0be444e403d7c3184d1f394f89f0b644710b5e9331b54fa4e8b5037813ad32a"> + + <patch file="glib-2.76.3-libintl.patch" + strip="1" /> </branch> <dependencies> <dep package="libffi" /> - <dep package="libpcre" /> + <dep package="libpcre2" /> </dependencies> </meson> <!-- @@ -130,22 +134,34 @@ <cmake id="freetype-no-harfbuzz" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
- <branch module="freetype/freetype-2.11.1.tar.gz" - version="2.11.1" - hash="sha256:f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b" + <branch module="freetype/freetype-2.13.1.tar.xz" + version="2.13.1" + hash="sha256:ea67e3b019b1104d1667aa274f5dc307d8cbd606b399bc32df308a77f1a564bf" repo="sourceforge" /> <dependencies> <dep package="zlib" /> </dependencies> </cmake> <!----> + <autotools id="icu" + autogen-sh="source/configure" + autogenargs="--enable-rpath" + makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'> + + <branch module="unicode-org/icu/releases/download/release-73-2/icu4c-73_2-src.tgz" + version="73.2" + hash="sha256:818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1" + checkoutdir="icu" + repo="github-tarball" /> + </autotools> + <!----> <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=disabled">
- <branch module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz" - version="4.1.0" - hash="sha256:f7984ff4241d4d135f318a93aa902d910a170a8265b7eaf93b5d9a504eed40c8" - repo="github-tarball"></branch> + <branch module="harfbuzz/harfbuzz/releases/download/7.3.0/harfbuzz-7.3.0.tar.xz" + version="7.3.0" + hash="sha256:20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb" + repo="github-tarball" /> <dependencies> <dep package="glib" /> <dep package="freetype-no-harfbuzz" /> @@ -156,9 +172,9 @@ <cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
- <branch module="freetype/freetype-2.11.1.tar.gz" - version="2.11.1" - hash="sha256:f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b" + <branch module="freetype/freetype-2.13.1.tar.gz" + version="2.13.1" + hash="sha256:ea67e3b019b1104d1667aa274f5dc307d8cbd606b399bc32df308a77f1a564bf" repo="sourceforge" /> <dependencies> <dep package="harfbuzz-no-cairo" /> @@ -170,26 +186,25 @@ autogen-sh="configure" autogenargs="--disable-docs --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts --with-cache-dir=home">
- <branch module="fontconfig-2.13.1.tar.bz2" - version="2.13.1" - hash="sha256:f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741" + <branch module="fontconfig-2.14.2.tar.xz" + version="2.14.2" + hash="sha256:dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b" repo="fontconfig" /> <dependencies> <dep package="freetype" /> </dependencies> </autotools> <!----> - <autotools id="pixman" - autogen-sh="configure" - autogenargs="--disable-gtk --disable-mmx"> - <branch module="releases/pixman-0.40.0.tar.gz" - version="0.40.0" - hash="sha512:063776e132f5d59a6d3f94497da41d6fc1c7dca0d269149c78247f0e0d7f520a25208d908cf5e421d1564889a91da44267b12d61c0bd7934cd54261729a7de5f" - repo="cairographics"></branch> + <meson id="pixman" + mesonargs="-Dgtk=disabled -Dmmx=disabled -Da64-neon=disabled"> + <branch module="releases/pixman-0.42.2.tar.gz" + version="0.42.2" + hash="sha512:0a4e327aef89c25f8cb474fbd01de834fd2a1b13fdf7db11ab72072082e45881cd16060673b59d02054b1711ae69c6e2395f6ae9214225ee7153939efcd2fa5d" + repo="cairographics" /> <after> <dep package="meta-gtk-osx-bootstrap" /> </after> - </autotools> + </meson> <!-- cairo doesn't really need fontconfig, but if Pango finds freetype it insists that it has to have fontconfig too and that @@ -199,8 +214,7 @@ <branch module="1.17.8/cairo-1.17.8.tar.bz2" version="1.17.8" hash="sha256:ead4724423eb969f98b456fe1e3ee1e1741fe1c8dfb1a41ca12afa81a6c1665f" - repo="cairographics-temp"> - </branch> + repo="cairographics-temp" /> <dependencies> <dep package="pixman" /> <dep package="meta-gtk-osx-bootstrap" /> @@ -210,9 +224,9 @@ </meson> <!----> <meson id="gobject-introspection"> - <branch module="gobject-introspection/1.72/gobject-introspection-1.72.1.tar.xz" - version="1.72.1" - hash="sha256:012e313186e3186cf0fde6decb57d970adf90e6b1fac5612fe69cbb5ba99543a"> + <branch module="gobject-introspection/1.76/gobject-introspection-1.76.1.tar.xz" + version="1.76.1" + hash="sha256:196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf"> </branch> <dependencies> <dep package="glib" /> @@ -224,11 +238,11 @@ </meson> <!----> <meson id="harfbuzz" - mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=enabled"> + mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=enabled -Dtests=disabled">
- <branch module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz" - version="4.1.0" - hash="sha256:f7984ff4241d4d135f318a93aa902d910a170a8265b7eaf93b5d9a504eed40c8" + <branch module="harfbuzz/harfbuzz/releases/download/7.3.0/harfbuzz-7.3.0.tar.xz" + version="7.3.0" + hash="sha256:20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb" repo="github-tarball" /> <dependencies> <dep package="gobject-introspection" /> @@ -239,9 +253,9 @@ <!----> <meson id="fribidi" mesonargs="-Ddocs=false"> - <branch module="fribidi/fribidi/releases/download/v1.0.12/fribidi-1.0.12.tar.xz" - version="1.0.12" - hash="sha256:0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495" + <branch module="fribidi/fribidi/releases/download/v1.0.13/fribidi-1.0.13.tar.xz" + version="1.0.13" + hash="sha256:7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2" repo="github-tarball" /> <!-- <dependencies> @@ -252,12 +266,9 @@ <!----> <meson id="pango" mesonargs="-Dfontconfig=enabled"> - <branch module="pango/1.50/pango-1.50.6.tar.xz" - version="1.50.6" - hash="sha256:a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a"> - - <patch file="pango-coretext-fix-clang-build-failure.patch" - strip="1" /> + <branch module="pango/1.50/pango-1.50.14.tar.xz" + version="1.50.14" + hash="sha256:1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8"> </branch> <dependencies> <dep package="glib" /> @@ -272,10 +283,9 @@ </meson> <!----> <meson id="atk"> - <branch module="atk/2.36/atk-2.36.0.tar.xz" - version="2.36.0" - hash="sha256:fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788" /> - <dependencies></dependencies> + <branch module="atk/2.38/atk-2.38.0.tar.xz" + version="2.38.0" + hash="sha256:ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36" /> <after> <dep package="glib" /> <dep package="meta-gtk-osx-bootstrap" /> @@ -285,9 +295,9 @@ <!----> <meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false"> - <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz" - version="2.42.8" - hash="sha256:84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6"> + <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz" + version="2.42.10" + hash="sha256:ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b">
<patch file="gdk-pixbuf-loader-name.patch" strip="1" /> @@ -312,31 +322,23 @@ </autotools> <!----> <meson id="libepoxy"> - <branch module="anholt/libepoxy/releases/download/1.5.4/libepoxy-1.5.4.tar.xz" - version="1.5.4" - hash="sha256:0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2" + <branch module="anholt/libepoxy/archive/refs/tags/1.5.10.tar.gz" + version="1.5.10" + hash="sha256:a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15" + checkoutdir="libexpoxy-1.5.10" repo="github-tarball" /> - <dependencies> + <!--dependencies> <dep package="xorg-util-macros" /> - </dependencies> + </dependencies--> </meson> <!-- gtk3 is in maintenance mode with 3.24 the final release series. --> <meson id="gtk+-3.0" mesonargs="-Dx11_backend=false"> - <branch module="gtk+/3.24/gtk+-3.24.36.tar.xz" - version="3.24.36" - hash="sha256:27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691"> - - <patch file="gtk-3-24-36-image-recolor-load-crash.patch" - strip="1" /> - <patch file="gtk-3-24-36-call-gdk-quartz-osx-version.patch" - strip="1" /> - <patch file="gtk-3-24-36-match-window-size.patch" - strip="1" /> - <patch file="gtk-3-24-36-frame_callback_crash.patch" - strip="1" /> + <branch module="gtk+/3.24/gtk+-3.24.38.tar.xz" + version="3.24.38" + hash="sha256:ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7"> </branch> <dependencies> <dep package="glib" /> @@ -355,8 +357,7 @@ <meson id="graphene" mesonargs="-Dtests=false"> <branch module="ebassi/graphene/releases/download/1.10.6/graphene-1.10.6.tar.xz" - version="1.10.6" - hash="sha256:80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25" + version="1.10.8" repo="github-tarball" /> <dependencies> <dep package="glib" /> @@ -378,9 +379,9 @@ <meson id="gtk-4" mesonargs="-Dx11-backend=false -Dmedia-gstreamer=disabled">
- <branch module="gtk/4.6/gtk-4.6.2.tar.xz" - version="4.6.2" - hash="sha256:ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec" /> + <branch module="gtk/4.10/gtk-4.10.4.tar.xz" + version="4.10.4" + hash="sha256:7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24" /> <dependencies> <dep package="pango" /> <dep package="atk" /> @@ -409,10 +410,11 @@ <autotools id="librsvg" autogen-sh="autoreconf" autogenargs="--disable-Bsymbolic"> - <branch module="librsvg/2.54/librsvg-2.54.0.tar.xz" - version="2.54.0" - hash="sha256:baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085" /> + <branch module="librsvg/2.56/librsvg-2.56.1.tar.xz" + version="2.56.1" + hash="sha256:1685aeacae9a441dcb12c0c3ec63706172a2f52705dafbefb8e7311d4d5e430b" /> <dependencies> + <dep package="libxml2" /> <dep package="cairo" /> <dep package="pango" /> <dep package="harfbuzz" /> @@ -429,9 +431,9 @@ <!----> <autotools id="adwaita-icon-theme" autogen-sh="configure"> - <branch module="adwaita-icon-theme/42/adwaita-icon-theme-42.0.tar.xz" - version="42.0" - hash="sha256:5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0" /> + <branch module="adwaita-icon-theme/44/adwaita-icon-theme-44.0.tar.xz" + version="44.0" + hash="sha256:4889c5601bbfecd25d80ba342209d0a936dcf691ee56bd6eca4cde361f1a664c" /> <dependencies> <dep package="librsvg" /> </dependencies>
Modified: patches/Pygments-setup-py.patch 21 lines changed, 21 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,21 @@ +From 3a15b6526b54b46453043f8e1a853aa0ac7e7f63 Mon Sep 17 00:00:00 2001 +From: John Ralls jralls@ceridwen.us +Date: Thu, 13 Jul 2023 10:28:01 -0700 +Subject: [PATCH] Add setup.py for jhbuild compatibility. + +--- + setup.py | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 setup.py + +diff --git a/setup.py b/setup.py +new file mode 100644 +index 00000000..878e3311 +--- /dev/null ++++ b/setup.py +@@ -0,0 +1,2 @@ ++from setuptools import setup ++setup(name='Pygments', version='2.15.1') +-- +2.37.1 (Apple Git-137.1) +
Modified: patches/amtk-build-on-macOS.patch 15 lines changed, 0 insertions(+), 15 deletions(-) =================================================================== @@ -1,15 +0,0 @@ -diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/amtk-5.3.1/amtk/meson.build~ /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/amtk-5.3.1/amtk/meson.build ---- a/amtk/meson.build 2021-01-11 01:38:22.000000000 -0800 -+++ b/amtk/meson.build 2021-04-09 10:30:46.000000000 -0700 -@@ -71,7 +71,8 @@ - amtk_lib_link_args = [] - amtk_lib_link_depends = [] - --if meson.get_compiler('c').get_argument_syntax() != 'msvc' -+if meson.get_compiler('c').get_argument_syntax() != 'msvc' and\ -+ meson.get_compiler('c').get_linker_id() != 'ld64' - symbol_map = meson.current_source_dir() / 'symbol.map' - amtk_lib_link_args = '-Wl,--version-script,' + symbol_map - amtk_lib_link_depends = symbol_map - -Diff finished. Fri Apr 9 14:41:36 2021
Modified: patches/gjs-remove-js::CodeCoverage.patch 21 lines changed, 0 insertions(+), 21 deletions(-) =================================================================== @@ -1,21 +0,0 @@ -diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/gjs-1.68.0/gjs/coverage.cpp~ /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/gjs-1.68.0/gjs/coverage.cpp ---- a/gjs/coverage.cpp 2021-03-20 09:28:52.000000000 -0700 -+++ b/gjs/coverage.cpp 2021-04-12 11:51:39.000000000 -0700 -@@ -19,7 +19,6 @@ - #include <js/TypeDecls.h> - #include <js/Utility.h> // for UniqueChars - #include <js/Value.h> --#include <js/experimental/CodeCoverage.h> // for EnableCodeCoverage - #include <jsapi.h> // for JSAutoRealm, JS_SetPropertyById - #include <jsfriendapi.h> // for GetCodeCoverageSummary - -@@ -496,6 +495,5 @@ - * Since: 1.66 - */ - void gjs_coverage_enable() { -- js::EnableCodeCoverage(); -- s_coverage_enabled = true; -+ s_coverage_enabled = false; - } - -Diff finished. Mon Apr 12 11:53:49 2021
Modified: patches/glib-2.76.3-libintl.patch 50 lines changed, 50 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,50 @@ +From 32249a22fc39319651e7c23442d37ec837f05764 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan nirbheek@centricular.com +Date: Thu, 8 Sep 2022 02:36:33 +0530 +Subject: [PATCH] meson: Fix detection of a system-provided proxy-libintl + +proxy-libintl defines ngettext() as a define in the header that points +to the actual symbol in the library which is g_libintl_ngettext(). +Same with bind_textdomain_codeset(). +--- + meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 0cbc9689f..de0bee5a3 100644 +--- a/meson.build ++++ b/meson.build +@@ -2089,6 +2089,7 @@ libz_dep = dependency('zlib') + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. + libintl_deps = [] ++libintl_prefix = '#include <libintl.h>' + libintl = dependency('intl', required: false, allow_fallback: false) + if libintl.found() + # libintl supports different threading APIs, which may not +@@ -2100,11 +2101,11 @@ if libintl.found() + # + # Meson's builtin dependency lookup as of 0.60.0 doesn't check for + # pthread, so we do this manually here. +- if cc.has_function('ngettext', dependencies : libintl) ++ if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) + libintl_deps += [libintl] + else + libintl_pthread = cc.find_library('pthread', required : false) +- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) ++ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) + libintl_deps += [libintl, libintl_pthread] + else + libintl = disabler() +@@ -2113,7 +2114,7 @@ if libintl.found() + endif + + if libintl.found() +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) ++ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix) + else + libintl = dependency('intl', allow_fallback: true) + assert(libintl.type_name() == 'internal') +-- +2.37.1 (Apple Git-137.1) +
Modified: patches/gmp-6.2.1-avoid-x18-register-apple-silicon.patch 501 lines changed, 501 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,501 @@ +--- a/mpn/arm64/aors_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/aors_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -68,7 +68,7 @@ + EPILOGUE() + PROLOGUE(func_n) + CLRCY +-L(ent): lsr x18, n, #2 ++L(ent): lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x7, [up] +@@ -77,7 +77,7 @@ + str x13, [rp],#8 + tbnz n, #1, L(b11) + +-L(b01): cbz x18, L(ret) ++L(b01): cbz x17, L(ret) + ldp x4, x5, [up,#8] + ldp x8, x9, [vp,#8] + sub up, up, #8 +@@ -88,7 +88,7 @@ + ldp x10, x11, [vp,#8] + add up, up, #8 + add vp, vp, #8 +- cbz x18, L(end) ++ cbz x17, L(end) + b L(top) + + L(bx0): tbnz n, #1, L(b10) +@@ -101,7 +101,7 @@ + + L(b10): ldp x6, x7, [up] + ldp x10, x11, [vp] +- cbz x18, L(end) ++ cbz x17, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#16] +@@ -114,8 +114,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + stp x12, x13, [rp],#16 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): ADDSUBC x12, x6, x10 + ADDSUBC x13, x7, x11 +--- a/mpn/arm64/aorsmul_1.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/aorsmul_1.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -32,10 +32,15 @@ + + include(`../config.m4') + +-C cycles/limb +-C Cortex-A53 9.3-9.8 +-C Cortex-A57 7.0 +-C X-Gene 5.0 ++C addmul_1 submul_1 ++C cycles/limb cycles/limb ++C Cortex-A53 9.3-9.8 9.3-9.8 ++C Cortex-A55 9.0-9.5 9.3-9.8 ++C Cortex-A57 7 7 ++C Cortex-A72 ++C Cortex-A73 6 6 ++C X-Gene 5 5 ++C Apple M1 1.75 1.75 + + C NOTES + C * It is possible to keep the carry chain alive between the addition blocks +--- a/mpn/arm64/aorsorrlshC_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/aorsorrlshC_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -65,14 +65,14 @@ + + ASM_START() + PROLOGUE(func_n) +- lsr x18, n, #2 ++ lsr x6, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x5, [up] + tbnz n, #1, L(b11) + + L(b01): ldr x11, [vp] +- cbz x18, L(1) ++ cbz x6, L(1) + ldp x8, x9, [vp,#8] + lsl x13, x11, #LSH + ADDSUB( x15, x13, x5) +@@ -94,7 +94,7 @@ + ADDSUB( x17, x13, x5) + str x17, [rp],#8 + sub up, up, #8 +- cbz x18, L(end) ++ cbz x6, L(end) + b L(top) + + L(bx0): tbnz n, #1, L(b10) +@@ -107,7 +107,7 @@ + L(b10): CLRRCY( x9) + ldp x10, x11, [vp] + sub up, up, #16 +- cbz x18, L(end) ++ cbz x6, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#16] +@@ -124,8 +124,8 @@ + ADDSUBC(x16, x12, x4) + ADDSUBC(x17, x13, x5) + stp x16, x17, [rp],#16 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x6, x6, #1 ++ cbnz x6, L(top) + + L(end): ldp x4, x5, [up,#16] + extr x12, x10, x9, #RSH +--- a/mpn/arm64/cnd_aors_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/cnd_aors_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -65,7 +65,7 @@ + + CLRCY + +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x13, [vp] +@@ -75,7 +75,7 @@ + str x9, [rp] + tbnz n, #1, L(b11) + +-L(b01): cbz x18, L(rt) ++L(b01): cbz x17, L(rt) + ldp x12, x13, [vp,#8] + ldp x10, x11, [up,#8] + sub up, up, #8 +@@ -86,7 +86,7 @@ + L(b11): ldp x12, x13, [vp,#8]! + ldp x10, x11, [up,#8]! + sub rp, rp, #8 +- cbz x18, L(end) ++ cbz x17, L(end) + b L(top) + + L(bx0): ldp x12, x13, [vp] +@@ -99,7 +99,7 @@ + b L(mid) + + L(b10): sub rp, rp, #16 +- cbz x18, L(end) ++ cbz x17, L(end) + + ALIGN(16) + L(top): bic x6, x12, cnd +@@ -116,8 +116,8 @@ + ADDSUBC x9, x11, x7 + ldp x10, x11, [up,#32]! + stp x8, x9, [rp,#32]! +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): bic x6, x12, cnd + bic x7, x13, cnd +--- a/mpn/arm64/logops_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/logops_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -78,7 +78,7 @@ + + ASM_START() + PROLOGUE(func) +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x7, [up] +@@ -88,7 +88,7 @@ + str x15, [rp],#8 + tbnz n, #1, L(b11) + +-L(b01): cbz x18, L(ret) ++L(b01): cbz x17, L(ret) + ldp x4, x5, [up,#8] + ldp x8, x9, [vp,#8] + sub up, up, #8 +@@ -99,7 +99,7 @@ + ldp x10, x11, [vp,#8] + add up, up, #8 + add vp, vp, #8 +- cbz x18, L(end) ++ cbz x17, L(end) + b L(top) + + L(bx0): tbnz n, #1, L(b10) +@@ -110,7 +110,7 @@ + + L(b10): ldp x6, x7, [up] + ldp x10, x11, [vp] +- cbz x18, L(end) ++ cbz x17, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#16] +@@ -127,8 +127,8 @@ + POSTOP( x12) + POSTOP( x13) + stp x12, x13, [rp],#16 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): LOGOP( x12, x6, x10) + LOGOP( x13, x7, x11) +--- a/mpn/arm64/lshift.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/lshift.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -61,7 +61,7 @@ + add rp, rp_arg, n, lsl #3 + add up, up, n, lsl #3 + sub tnc, xzr, cnt +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x4, [up,#-8] +@@ -69,7 +69,7 @@ + + L(b01): NSHIFT x0, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt1) ++ cbnz x17, L(gt1) + str x2, [rp,#-8] + ret + L(gt1): ldp x4, x5, [up,#-24] +@@ -89,7 +89,7 @@ + PSHIFT x13, x5, cnt + NSHIFT x10, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt2) ++ cbnz x17, L(gt2) + orr x10, x10, x13 + stp x2, x10, [rp,#-16] + ret +@@ -123,11 +123,11 @@ + orr x11, x12, x2 + stp x10, x11, [rp,#-32]! + PSHIFT x2, x4, cnt +-L(lo0): sub x18, x18, #1 ++L(lo0): sub x17, x17, #1 + L(lo3): NSHIFT x10, x6, tnc + PSHIFT x13, x7, cnt + NSHIFT x12, x7, tnc +- cbnz x18, L(top) ++ cbnz x17, L(top) + + L(end): orr x10, x10, x13 + orr x11, x12, x2 +--- a/mpn/arm64/lshiftc.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/lshiftc.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -61,7 +61,7 @@ + add rp, rp_arg, n, lsl #3 + add up, up, n, lsl #3 + sub tnc, xzr, cnt +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x4, [up,#-8] +@@ -69,7 +69,7 @@ + + L(b01): NSHIFT x0, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt1) ++ cbnz x17, L(gt1) + mvn x2, x2 + str x2, [rp,#-8] + ret +@@ -90,7 +90,7 @@ + PSHIFT x13, x5, cnt + NSHIFT x10, x4, tnc + PSHIFT x2, x4, cnt +- cbnz x18, L(gt2) ++ cbnz x17, L(gt2) + eon x10, x10, x13 + mvn x2, x2 + stp x2, x10, [rp,#-16] +@@ -125,11 +125,11 @@ + eon x11, x12, x2 + stp x10, x11, [rp,#-32]! + PSHIFT x2, x4, cnt +-L(lo0): sub x18, x18, #1 ++L(lo0): sub x17, x17, #1 + L(lo3): NSHIFT x10, x6, tnc + PSHIFT x13, x7, cnt + NSHIFT x12, x7, tnc +- cbnz x18, L(top) ++ cbnz x17, L(top) + + L(end): eon x10, x10, x13 + eon x11, x12, x2 +--- a/mpn/arm64/mul_1.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/mul_1.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -56,7 +56,7 @@ + + PROLOGUE(mpn_mul_1) + adds x4, xzr, xzr C clear register and cy flag +-L(com): lsr x18, n, #2 ++L(com): lsr x17, n, #2 + tbnz n, #0, L(bx1) + + L(bx0): mov x11, x4 +@@ -65,7 +65,7 @@ + L(b10): ldp x4, x5, [up] + mul x8, x4, v0 + umulh x10, x4, v0 +- cbz x18, L(2) ++ cbz x17, L(2) + ldp x6, x7, [up,#16]! + mul x9, x5, v0 + b L(mid)-8 +@@ -80,7 +80,7 @@ + str x9, [rp],#8 + tbnz n, #1, L(b10) + +-L(b01): cbz x18, L(1) ++L(b01): cbz x17, L(1) + + L(b00): ldp x6, x7, [up] + mul x8, x6, v0 +@@ -90,8 +90,8 @@ + adcs x12, x8, x11 + umulh x11, x7, v0 + add rp, rp, #16 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x17, x17, #1 ++ cbz x17, L(end) + + ALIGN(16) + L(top): mul x8, x4, v0 +@@ -110,8 +110,8 @@ + stp x12, x13, [rp],#32 + adcs x12, x8, x11 + umulh x11, x7, v0 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x17, x17, #1 ++ cbnz x17, L(top) + + L(end): mul x8, x4, v0 + adcs x13, x9, x10 +--- a/mpn/arm64/rsh1aors_n.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/rsh1aors_n.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -59,7 +59,7 @@ + + ASM_START() + PROLOGUE(func_n) +- lsr x18, n, #2 ++ lsr x6, n, #2 + + tbz n, #0, L(bx0) + +@@ -69,7 +69,7 @@ + + L(b01): ADDSUB x13, x5, x9 + and x10, x13, #1 +- cbz x18, L(1) ++ cbz x6, L(1) + ldp x4, x5, [up],#48 + ldp x8, x9, [vp],#48 + ADDSUBC x14, x4, x8 +@@ -80,8 +80,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + str x17, [rp], #24 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x6, x6, #1 ++ cbz x6, L(end) + b L(top) + + L(1): cset x14, COND +@@ -97,7 +97,7 @@ + ldp x8, x9, [vp],#32 + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 +- cbz x18, L(3) ++ cbz x6, L(3) + ldp x4, x5, [up,#-16] + ldp x8, x9, [vp,#-16] + extr x17, x12, x15, #1 +@@ -117,7 +117,7 @@ + ADDSUB x12, x4, x8 + ADDSUBC x13, x5, x9 + and x10, x12, #1 +- cbz x18, L(2) ++ cbz x6, L(2) + ldp x4, x5, [up,#-16] + ldp x8, x9, [vp,#-16] + ADDSUBC x14, x4, x8 +@@ -134,8 +134,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + add rp, rp, #16 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x6, x6, #1 ++ cbz x6, L(end) + + ALIGN(16) + L(top): ldp x4, x5, [up,#-16] +@@ -152,8 +152,8 @@ + ADDSUBC x12, x4, x8 + ADDSUBC x13, x5, x9 + stp x16, x17, [rp],#32 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x6, x6, #1 ++ cbnz x6, L(top) + + L(end): extr x16, x15, x14, #1 + extr x17, x12, x15, #1 +--- a/mpn/arm64/rshift.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/rshift.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -60,7 +60,7 @@ + PROLOGUE(mpn_rshift) + mov rp, rp_arg + sub tnc, xzr, cnt +- lsr x18, n, #2 ++ lsr x17, n, #2 + tbz n, #0, L(bx0) + + L(bx1): ldr x5, [up] +@@ -68,7 +68,7 @@ + + L(b01): NSHIFT x0, x5, tnc + PSHIFT x2, x5, cnt +- cbnz x18, L(gt1) ++ cbnz x17, L(gt1) + str x2, [rp] + ret + L(gt1): ldp x4, x5, [up,#8] +@@ -89,7 +89,7 @@ + PSHIFT x13, x4, cnt + NSHIFT x10, x5, tnc + PSHIFT x2, x5, cnt +- cbnz x18, L(gt2) ++ cbnz x17, L(gt2) + orr x10, x10, x13 + stp x10, x2, [rp] + ret +@@ -121,11 +121,11 @@ + orr x11, x12, x2 + stp x11, x10, [rp,#32]! + PSHIFT x2, x5, cnt +-L(lo0): sub x18, x18, #1 ++L(lo0): sub x17, x17, #1 + L(lo3): NSHIFT x10, x7, tnc + NSHIFT x12, x6, tnc + PSHIFT x13, x6, cnt +- cbnz x18, L(top) ++ cbnz x17, L(top) + + L(end): orr x10, x10, x13 + orr x11, x12, x2 +--- a/mpn/arm64/sqr_diag_addlsh1.asm Sat Nov 28 23:38:32 2020 +0100 ++++ b/mpn/arm64/sqr_diag_addlsh1.asm Sun Nov 29 22:31:40 2020 +0100 +@@ -47,7 +47,7 @@ + ASM_START() + PROLOGUE(mpn_sqr_diag_addlsh1) + ldr x15, [up],#8 +- lsr x18, n, #1 ++ lsr x14, n, #1 + tbz n, #0, L(bx0) + + L(bx1): adds x7, xzr, xzr +@@ -62,8 +62,8 @@ + ldr x17, [up],#16 + ldp x6, x7, [tp],#32 + umulh x11, x15, x15 +- sub x18, x18, #1 +- cbz x18, L(end) ++ sub x14, x14, #1 ++ cbz x14, L(end) + + ALIGN(16) + L(top): extr x9, x6, x5, #63 +@@ -84,7 +84,7 @@ + extr x8, x5, x4, #63 + stp x12, x13, [rp],#16 + adcs x12, x8, x10 +- sub x18, x18, #1 +- cbnz x18, L(top) ++ sub x14, x14, #1 ++ cbnz x14, L(top) + + L(end): extr x9, x6, x5, #63 + mul x10, x17, x17 \ No newline at end of file
Modified: patches/gnutls-gnulib.patch 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,12 @@ +--- a/src/gl/verify.h 2023-02-09 06:55:15.000000000 -0800 ++++ b/src/gl/verify.h 2023-06-30 13:53:05.000000000 -0700 +@@ -213,7 +213,7 @@ + # define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC) + #else + # define _GL_VERIFY(R, DIAGNOSTIC, ...) \ +- extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ ++ int (*_GL_GENSYM (_gl_verify_function) (void)) \ + [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] + # if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) + # pragma GCC diagnostic ignored "-Wnested-externs" +
Modified: patches/graphviz-remove-rpath.patch 22 lines changed, 11 insertions(+), 11 deletions(-) =================================================================== @@ -1,6 +1,6 @@ --- a/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 +++ b/CMakeLists.txt 2021-07-29 13:42:38.000000000 -0700 -@@ -72,6 +72,8 @@ +@@ -94,6 +94,8 @@ # Name of the config file used by Graphviz set(GVPLUGIN_CONFIG_FILE config${GRAPHVIZ_PLUGIN_VERSION})
@@ -11,7 +11,7 @@ list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR}) --- a/plugin/core/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 +++ b/plugin/core/CMakeLists.txt 2021-07-29 13:42:09.000000000 -0700 -@@ -53,6 +53,8 @@ +@@ -44,6 +44,8 @@ ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} )
@@ -22,18 +22,18 @@ VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0 --- a/plugin/pango/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 +++ b/plugin/pango/CMakeLists.txt 2021-07-29 13:43:13.000000000 -0700 -@@ -40,6 +40,8 @@ - ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} - ) +@@ -36,6 +36,8 @@ + ${PANGOCAIRO_LINK_LIBRARIES} + )
-+set_target_properties(gvplugin_pango PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}") ++ set_target_properties(gvplugin_pango PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}") + - # Include DLLs with this library on Windows - if (WIN32) - install( + # Installation location of library files + install( + TARGETS gvplugin_pango --- a/plugin/neato_layout/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 +++ b/plugin/neato_layout/CMakeLists.txt 2021-07-29 13:42:57.000000000 -0700 -@@ -45,6 +45,8 @@ +@@ -42,6 +42,8 @@ ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} )
@@ -44,7 +44,7 @@ VERSION ${GRAPHVIZ_PLUGIN_VERSION}.0.0 --- a/plugin/dot_layout/CMakeLists.txt 2021-03-15 17:04:01.000000000 -0700 +++ b/plugin/dot_layout/CMakeLists.txt 2021-07-29 13:42:28.000000000 -0700 -@@ -30,6 +30,8 @@ +@@ -27,6 +27,8 @@ ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} )
Modified: patches/gtk+-2-m4-creation.patch 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -1,5 +0,0 @@ -diff -uN gtk+-2.24.21/m4/.bogus gtk+-2.24.21.save/m4/.bogus ---- gtk+-2.24.21/m4/.bogus 2013-10-02 08:01:33.000000000 -0700 -+++ gtk+-2.24.21.save/m4/.bogus 2013-10-02 08:03:40.000000000 -0700 -@@ -0,0 +1 @@ -+A phony file to enable making a patch to create this directory.
Modified: patches/gtk+-Bug-655065-Better-Fix.patch 86 lines changed, 0 insertions(+), 86 deletions(-) =================================================================== @@ -1,86 +0,0 @@ -diff --git a/tests/Makefile.am b/tests/Makefile.am -index e011484..c34b72e 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -14,7 +14,7 @@ DEPS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - --LDADDS = \ -+LDADD = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(GTK_DEP_LIBS) \ -@@ -166,72 +166,6 @@ testtooltips_DEPENDENCIES = $(TEST_DEPS) - testvolumebutton_DEPENDENCIES = $(TEST_DEPS) - testwindows_DEPENDENCIES = $(TEST_DEPS) - --flicker_LDADD = $(LDADDS) --simple_LDADD = $(LDADDS) --print_editor_LDADD = $(LDADDS) --testaccel_LDADD = $(LDADDS) --testassistant_LDADD = $(LDADDS) --testbbox_LDADD = $(LDADDS) --testbuttons_LDADD = $(LDADDS) --testframe_LDADD = $(LDADDS) --testcairo_LDADD = $(LDADDS) --testcalendar_LDADD = $(LDADDS) --testcombo_LDADD = $(LDADDS) --testcombochange_LDADD = $(LDADDS) --testcellrenderertext_LDADD = $(LDADDS) --testclientmessage_LDADD = $(LDADDS) --testdnd_LDADD = $(LDADDS) --testentrycompletion_LDADD = $(LDADDS) --testentryicons_LDADD = $(LDADDS) --testfilechooser_LDADD = $(LDADDS) --testfilechooserbutton_LDADD = $(LDADDS) --testgtk_LDADD = $(LDADDS) --testicontheme_LDADD = $(LDADDS) --testiconview_LDADD = $(LDADDS) --testiconview_keynav_LDADD = $(LDADDS) --testinput_LDADD = $(LDADDS) --testimage_LDADD = $(LDADDS) --testmenus_LDADD = $(LDADDS) --testmenubars_LDADD = $(LDADDS) --testmountoperation_LDADD = $(LDADDS) --testmultidisplay_LDADD = $(LDADDS) --testmultiscreen_LDADD = $(LDADDS) --testnotebookdnd_LDADD = $(LDADDS) --testnouiprint_LDADD = $(LDADDS) --testoffscreen_LDADD = $(LDADDS) --testoffscreenwindow_LDADD = $(LDADDS) --testorientable_LDADD = $(LDADDS) --testprint_LDADD = $(LDADDS) --testrecentchooser_LDADD = $(LDADDS) --testrecentchoosermenu_LDADD = $(LDADDS) --testrgb_LDADD = $(LDADDS) --testrichtext_LDADD = $(LDADDS) --testscale_LDADD = $(LDADDS) --testselection_LDADD = $(LDADDS) --testsocket_LDADD = $(LDADDS) --testsocket_child_LDADD = $(LDADDS) --testspinbutton_LDADD = $(LDADDS) --teststatusicon_LDADD = $(LDADDS) --testtoolbar_LDADD = $(LDADDS) --stresstest_toolbar_LDADD = $(LDADDS) --testtreeedit_LDADD = $(LDADDS) --testtreemodel_LDADD = $(LDADDS) --testtreeview_LDADD = $(LDADDS) --testtreefocus_LDADD = $(LDADDS) --testtreeflow_LDADD = $(LDADDS) --testtreecolumns_LDADD = $(LDADDS) --testtreecolumnsizing_LDADD = $(LDADDS) --testtreesort_LDADD = $(LDADDS) --testtext_LDADD = $(LDADDS) --treestoretest_LDADD = $(LDADDS) --testxinerama_LDADD = $(LDADDS) --testmerge_LDADD = $(LDADDS) --testactions_LDADD = $(LDADDS) --testgrouping_LDADD = $(LDADDS) --testtooltips_LDADD = $(LDADDS) --testvolumebutton_LDADD = $(LDADDS) --testwindows_LDADD = $(LDADDS) -- - - testentrycompletion_SOURCES = \ - prop-editor.c \
Modified: patches/gtk-3-24-36-call-gdk-quartz-osx-version.patch 25 lines changed, 0 insertions(+), 25 deletions(-) =================================================================== @@ -1,25 +0,0 @@ -From 10689066e33eb07d5d2bbdd8cc12d15fe173db58 Mon Sep 17 00:00:00 2001 -From: John Ralls jralls@ceridwen.us -Date: Fri, 6 Jan 2023 10:13:02 -0800 -Subject: [PATCH] [quartz] Fix typo to call function. - ---- - gdk/quartz/gdkevents-quartz.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c -index 60e9eaf131..630be6e1c7 100644 ---- a/gdk/quartz/gdkevents-quartz.c -+++ b/gdk/quartz/gdkevents-quartz.c -@@ -858,7 +858,7 @@ find_window_for_ns_event (NSEvent *nsevent, - * macOS versions. These trigger 4 pixels out from the window's - * frame so we obtain that rect and adjust it for hit testing. - */ -- if (!nsevent.trackingArea && gdk_quartz_osx_version >= GDK_OSX_VENTURA) -+ if (!nsevent.trackingArea && gdk_quartz_osx_version() >= GDK_OSX_VENTURA) - { - static const int border_width = 4; - NSRect frame = nsevent.window.frame; --- -2.37.1 (Apple Git-137.1) -
Modified: patches/gtk-3-24-36-frame_callback_crash.patch 98 lines changed, 0 insertions(+), 98 deletions(-) =================================================================== @@ -1,98 +0,0 @@ -From 33fd9eb472212014d42df5b8ec633184002c0dda Mon Sep 17 00:00:00 2001 -From: John Ralls jralls@ceridwen.us -Date: Thu, 23 Mar 2023 11:32:15 -0700 -Subject: [PATCH] [quartz] Convert frame_link, windows_awaiting_frame to - GSList. - -We were't using GList's prev member; worse, we weren't setting it -and that broke g_list_remove_link so that the link wasn't removed -in _gdk_quartz_display_remove_frame_callback. - -Closes #5593 ---- - gdk/quartz/gdkdisplay-quartz.c | 15 ++++++++++----- - gdk/quartz/gdkdisplay-quartz.h | 2 +- - gdk/quartz/gdkwindow-quartz.h | 2 +- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c -index 53726e38b6..3ace0170be 100644 ---- a/gdk/quartz/gdkdisplay-quartz.c -+++ b/gdk/quartz/gdkdisplay-quartz.c -@@ -96,7 +96,6 @@ _gdk_quartz_display_add_frame_callback (GdkDisplay *display, - display_quartz = GDK_QUARTZ_DISPLAY (display); - - impl->frame_link.data = window; -- impl->frame_link.prev = NULL; - impl->frame_link.next = display_quartz->windows_awaiting_frame; - - display_quartz->windows_awaiting_frame = &impl->frame_link; -@@ -110,14 +109,14 @@ _gdk_quartz_display_remove_frame_callback (GdkDisplay *display, - GdkWindow *window) - { - GdkQuartzDisplay *display_quartz = GDK_QUARTZ_DISPLAY (display); -- GList *link; -+ GSList *link; - -- link = g_list_find (display_quartz->windows_awaiting_frame, window); -+ link = g_slist_find (display_quartz->windows_awaiting_frame, window); - - if (link != NULL) - { - display_quartz->windows_awaiting_frame = -- g_list_remove_link (display_quartz->windows_awaiting_frame, link); -+ g_slist_remove_link (display_quartz->windows_awaiting_frame, link); - } - - if (display_quartz->windows_awaiting_frame == NULL) -@@ -129,7 +128,7 @@ gdk_quartz_display_frame_cb (gpointer data) - { - GdkDisplayLinkSource *source; - GdkQuartzDisplay *display_quartz = data; -- GList *iter; -+ GSList *iter, **last_next = NULL; - gint64 presentation_time; - gint64 now; - -@@ -154,6 +153,12 @@ gdk_quartz_display_frame_cb (gpointer data) - GdkFrameClock *frame_clock = gdk_window_get_frame_clock (window); - GdkFrameTimings *timings; - -+ /* Clear the frame_link */ -+ iter->data = NULL; -+ if (last_next && *last_next) -+ *last_next = NULL; -+ last_next = &iter->next; -+ - if (frame_clock == NULL) - continue; - -diff --git a/gdk/quartz/gdkdisplay-quartz.h b/gdk/quartz/gdkdisplay-quartz.h -index 59245da7ca..dbe8f67e97 100644 ---- a/gdk/quartz/gdkdisplay-quartz.h -+++ b/gdk/quartz/gdkdisplay-quartz.h -@@ -39,7 +39,7 @@ struct _GdkQuartzDisplay - GPtrArray *monitors; - /* This structure is not allocated. It points to an embedded - * GList in the GdkWindow. */ -- GList *windows_awaiting_frame; -+ GSList *windows_awaiting_frame; - GSource *frame_source; - }; - -diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h -index de9a5ebccf..7551e9be67 100644 ---- a/gdk/quartz/gdkwindow-quartz.h -+++ b/gdk/quartz/gdkwindow-quartz.h -@@ -66,7 +66,7 @@ struct _GdkWindowImplQuartz - gint shadow_max; - - gboolean use_cg_context; -- GList frame_link; -+ GSList frame_link; - gint pending_frame_counter; - }; - --- -2.37.1 (Apple Git-137.1) -
Modified: patches/gtk-3-24-36-image-recolor-load-crash.patch 35 lines changed, 0 insertions(+), 35 deletions(-) =================================================================== @@ -1,35 +0,0 @@ -From 40bcba64548bb29b6a6209030eeb06bf13ca98f9 Mon Sep 17 00:00:00 2001 -From: John Ralls jralls@ceridwen.us -Date: Fri, 23 Dec 2022 13:27:50 -0800 -Subject: [PATCH] Don't rely on gtk_icon_info_load_symbolic to set a GError. - ---- - gtk/gtkcssimagerecolor.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gtk/gtkcssimagerecolor.c b/gtk/gtkcssimagerecolor.c -index 1c38654cfa..db7d08f008 100644 ---- a/gtk/gtkcssimagerecolor.c -+++ b/gtk/gtkcssimagerecolor.c -@@ -125,12 +125,17 @@ gtk_css_image_recolor_load (GtkCssImageRecolor *recolor, - if (gerror) - { - char *uri; -+ char *msg; -+ if (local_error && local_error->message) -+ msg = local_error->message; -+ else -+ msg = "gtk_icon_info_load_symbolic did not set the passed-in GError."; - - uri = g_file_get_uri (url->file); - g_set_error (gerror, - GTK_CSS_PROVIDER_ERROR, - GTK_CSS_PROVIDER_ERROR_FAILED, -- "Error loading image '%s': %s", uri, local_error->message); -+ "Error loading image '%s': %s", uri, msg); - g_error_free (local_error); - g_free (uri); - } --- -2.37.1 (Apple Git-137.1) -
Modified: patches/gtk-3-24-36-match-window-size.patch 164 lines changed, 0 insertions(+), 164 deletions(-) =================================================================== @@ -1,164 +0,0 @@ -From f60359c183cc24435521b3d3bbcfc4ebb2a79197 Mon Sep 17 00:00:00 2001 -From: John Ralls jralls@ceridwen.us -Date: Thu, 19 Jan 2023 10:37:55 -0800 -Subject: [PATCH] [quartz] GdkWindow, GdkNSView frame and cairo surface same - size. - -The cairo surface must be padded to 4 pixels in order to -transfer correctly to the GPU. The GdkWindow and GdkNSView's -content frame must be the same width, otherwise there's a mismatch -that causes either the GdkWindow to draw wider than the frame or the -frame to be clipped narrower than the title bar. - -Fixes #5535. ---- - gdk/quartz/GdkQuartzNSWindow.c | 14 +++++++++++--- - gdk/quartz/GdkQuartzView.c | 15 ++++++++++----- - gdk/quartz/gdkprivate-quartz.h | 3 ++- - gdk/quartz/gdkwindow-quartz.c | 10 ++++++++-- - 4 files changed, 31 insertions(+), 11 deletions(-) - -diff --git a/gdk/quartz/GdkQuartzNSWindow.c b/gdk/quartz/GdkQuartzNSWindow.c -index f0e57434f4..5a546891aa 100644 ---- a/gdk/quartz/GdkQuartzNSWindow.c -+++ b/gdk/quartz/GdkQuartzNSWindow.c -@@ -229,6 +229,9 @@ - GdkWindow *window = [[self contentView] gdkWindow]; - GdkEvent *event; - gboolean maximized = gdk_window_get_state (window) & GDK_WINDOW_STATE_MAXIMIZED; -+ /* Alignment to 4 pixels is on scaled pixels and these are unscaled pixels so divide by scale to compensate. */ -+ const gint scale = gdk_window_get_scale_factor (window); -+ const guint align = GDK_WINDOW_QUARTZ_ALIGNMENT / scale; - - /* see same in windowDidMove */ - if (maximized && !inMaximizeTransition && !NSEqualRects (lastMaximizedFrame, [self frame])) -@@ -241,13 +244,18 @@ - window->width = content_rect.size.width; - window->height = content_rect.size.height; - -+ if(window->width % align) -+ content_rect.size.width += align - window->width % align; -+ -+ content_rect.origin.x = 0; -+ content_rect.origin.y = 0; -+ -+ [[self contentView] setFrame:content_rect]; -+ - /* Certain resize operations (e.g. going fullscreen), also move the - * origin of the window. - */ - _gdk_quartz_window_update_position (window); -- -- [[self contentView] setFrame:NSMakeRect (0, 0, window->width, window->height)]; -- - _gdk_window_update_size (window); - - /* Synthesize a configure event */ -diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c -index bd34365a1e..81c2d32007 100644 ---- a/gdk/quartz/GdkQuartzView.c -+++ b/gdk/quartz/GdkQuartzView.c -@@ -424,8 +424,7 @@ copy_rectangle_argb32 (cairo_surface_t *dest, cairo_surface_t *source, - return; - - ++impl->in_paint_rect_count; -- cairo_rect_from_nsrect (&bounds_rect, &backing_bounds); -- bounds_region = cairo_region_create_rectangle (&bounds_rect); -+ - if (impl->needs_display_region) - { - cairo_region_t *region = impl->needs_display_region; -@@ -439,7 +438,7 @@ copy_rectangle_argb32 (cairo_surface_t *dest, cairo_surface_t *source, - cairo_region_t *region; - - cairo_rect_from_nsrect (&bounds, &layer_bounds); -- region = cairo_region_create_rectangle (&bounds); -+ region = cairo_region_create_rectangle(&bounds); - _gdk_window_process_updates_recurse (gdk_window, region); - cairo_region_destroy (region); - } -@@ -447,8 +446,6 @@ copy_rectangle_argb32 (cairo_surface_t *dest, cairo_surface_t *source, - if (!impl || !impl->cairo_surface) - return; - -- impl_rect.width = cairo_image_surface_get_width (impl->cairo_surface); -- impl_rect.height = cairo_image_surface_get_height (impl->cairo_surface); - CVPixelBufferLockBaseAddress (pixels, 0); - cvpb_surface = - cairo_image_surface_create_for_data (CVPixelBufferGetBaseAddress (pixels), -@@ -458,6 +455,12 @@ copy_rectangle_argb32 (cairo_surface_t *dest, cairo_surface_t *source, - (int)CVPixelBufferGetBytesPerRow (pixels)); - - -+ cairo_rect_from_nsrect (&bounds_rect, &backing_bounds); -+ bounds_region = cairo_region_create_rectangle (&bounds_rect); -+ -+ impl_rect.width = cairo_image_surface_get_width (impl->cairo_surface); -+ impl_rect.height = cairo_image_surface_get_height (impl->cairo_surface); -+ - cairo_region_intersect_rectangle (bounds_region, &impl_rect); - copy_rectangle_argb32 (cvpb_surface, impl->cairo_surface, bounds_region); - -@@ -465,7 +468,9 @@ copy_rectangle_argb32 (cairo_surface_t *dest, cairo_surface_t *source, - cairo_region_destroy (bounds_region); - _gdk_quartz_unref_cairo_surface (gdk_window); // reffed in gdk_window_impl_quartz_begin_paint - CVPixelBufferUnlockBaseAddress (pixels, 0); -+ - --impl->in_paint_rect_count; -+ - self.layer.contents = NULL; - self.layer.contents = (id)CVPixelBufferGetIOSurface (pixels); - } -diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h -index a6e644b870..6b7986cedd 100644 ---- a/gdk/quartz/gdkprivate-quartz.h -+++ b/gdk/quartz/gdkprivate-quartz.h -@@ -27,7 +27,8 @@ - #include "config.h" - - #define GDK_WINDOW_IS_QUARTZ(win) (GDK_IS_WINDOW_IMPL_QUARTZ (((GdkWindow *)win)->impl)) -- -+/* Cairo surface widths must be 4-pixel byte aligned so that the image will transfer to the CPU. */ -+#define GDK_WINDOW_QUARTZ_ALIGNMENT 16 - - /* Display */ - -diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c -index 9f8534e5c1..429f2bc0cf 100644 ---- a/gdk/quartz/gdkwindow-quartz.c -+++ b/gdk/quartz/gdkwindow-quartz.c -@@ -306,9 +306,10 @@ gdk_quartz_ref_cairo_surface (GdkWindow *window) - gint height = gdk_window_get_height (impl->wrapper); - gint scale = gdk_window_get_scale_factor (impl->wrapper); - gint scaled_width = width * scale; -+ const gint align = GDK_WINDOW_QUARTZ_ALIGNMENT; - -- if (scaled_width % 16) -- scaled_width += 16 - scaled_width % 16; // Surface widths must be 4-pixel aligned -+ if (scaled_width % align) -+ scaled_width += align - scaled_width % align; // Surface widths must be 4-pixel aligned - - impl->cairo_surface = gdk_quartz_create_cairo_surface (impl, - scaled_width, -@@ -929,6 +930,8 @@ _gdk_quartz_display_create_window_impl (GdkDisplay *display, - NSUInteger style_mask; - int nx, ny; - const char *title; -+ const gint scale = gdk_window_get_scale_factor (window); -+ const guint align = GDK_WINDOW_QUARTZ_ALIGNMENT / scale; - - /* initWithContentRect will place on the mainScreen by default. - * We want to select the screen to place on ourselves. We need -@@ -942,6 +945,9 @@ _gdk_quartz_display_create_window_impl (GdkDisplay *display, - nx -= screen_rect.origin.x; - ny -= screen_rect.origin.y; - -+ if (window->width % align) -+ window->width += align - window->width % align; -+ - content_rect = NSMakeRect (nx, ny - window->height, - window->width, - window->height); --- -2.37.1 (Apple Git-137.1) -
Modified: patches/gtk-3.14-GDesktopAppInfo-not-implemented-on-Mac.patch 49 lines changed, 0 insertions(+), 49 deletions(-) =================================================================== @@ -1,49 +0,0 @@ ---- a/gtk/gtkapplicationwindow.c 2015-07-21 07:22:36.000000000 -0700 -+++ b/gtk/gtkapplicationwindow.c 2018-05-26 11:11:10.000000000 -0700 -@@ -29,7 +29,7 @@ - #include "gtkintl.h" - #include "gtksettings.h" - --#ifdef HAVE_GIO_UNIX -+#if !defined(HAVE_GIO_UNIX) && !defined(__APPLE__) - #include <gio/gdesktopappinfo.h> - #endif - -@@ -255,7 +255,7 @@ - { - gchar *retval = NULL; - --#ifdef HAVE_GIO_UNIX -+#if !defined(HAVE_GIO_UNIX) && !defined(__APPLE__) - GDesktopAppInfo *app_info; - const gchar *app_name = NULL; - gchar *desktop_file; ---- a/gtk/gtk-launch.c 2014-11-26 18:54:55.000000000 -0800 -+++ b/gtk/gtk-launch.c 2018-05-26 11:16:49.000000000 -0700 -@@ -28,7 +28,7 @@ - #include <glib.h> - #include <glib/gi18n.h> - #include <gio/gio.h> --#ifdef G_OS_UNIX -+#if !defined(G_OS_UNIX) && !defined(__APPLE) - #include <gio/gdesktopappinfo.h> - #endif - #include <gtk.h> -@@ -47,7 +47,7 @@ - GOptionContext *context = NULL; - gchar *summary; - gchar *app_name; --#ifdef G_OS_UNIX -+#if !defined(G_OS_UNIX) && !defined(__APPLE) - gchar *desktop_file_name; - #endif - GAppInfo *info = NULL; -@@ -109,7 +109,7 @@ - gtk_init (&argc, &argv); - - app_name = *args; --#ifdef G_OS_UNIX -+#if !defined(G_OS_UNIX) && !defined(__APPLE) - if (g_str_has_suffix (app_name, ".desktop")) - desktop_file_name = g_strdup (app_name); - else
Modified: patches/gtk-3.14-stylecontext-unnecessary-assert.patch 11 lines changed, 0 insertions(+), 11 deletions(-) =================================================================== @@ -1,11 +0,0 @@ ---- a/gtk/gtkstylecontext.c 2015-07-21 07:22:36.000000000 -0700 -+++ b/gtk/gtkstylecontext.c 2018-05-26 10:35:57.000000000 -0700 -@@ -795,8 +795,6 @@ - if (info->values) - return info->values; - -- g_assert (priv->widget != NULL || priv->widget_path != NULL); -- - values = g_hash_table_lookup (priv->style_values, info); - if (values) - {
Modified: patches/gtk-gimp-dnd-bug767091.patch 107 lines changed, 0 insertions(+), 107 deletions(-) =================================================================== @@ -1,107 +0,0 @@ -From 54d6a8e505b9c0df8ad13337b60c61ee9acf779f Mon Sep 17 00:00:00 2001 -From: Kristian Rietveld kris@loopnest.org -Date: Sun, 7 Aug 2016 16:44:24 +0200 -Subject: [PATCH] Bug 767091 - Gimp Crashes dragging pattern to overlay layer - -The problem was caused by the fact that 'draggingUpdated' was sometimes -called after 'performDragOperation:'. This seems to be timing dependent. -Because the context was released in 'performDragOperation', updating the -context from 'draggingUpdated' led to a crash. - -It also turns out that 'draggingEnded' is called on every window which -received 'draggingEntered' earlier, once the drag has been completed. -We use this to designate 'draggingEnded' as the place to release the -context from now on. - -To solve this bug, we remove the calls to release the context from -'draggingExited' and 'performDragOperation'. Instead, we have -'draggingEnded' release the context on the first call (it is called -multiple times if multiple windows h@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).