Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Tue, 15 Nov 2022 22:09:46 UTC Commit: 80c10f61cfc792451b0bc185a8023b8e97884432 https://github.com/geany/geany-osx/commit/80c10f61cfc792451b0bc185a8023b8e97...

Log Message: ----------- Update modulesets to the current version (which works)

Modified Paths: -------------- modulesets-stable/gtk-osx-bootstrap.modules modulesets-stable/gtk-osx-gtkmm.modules modulesets-stable/gtk-osx-javascript.modules modulesets-stable/gtk-osx-network.modules modulesets-stable/gtk-osx-obsolete.modules modulesets-stable/gtk-osx-python.modules modulesets-stable/gtk-osx-random.modules modulesets-stable/gtk-osx.modules

Modified: modulesets-stable/gtk-osx-bootstrap.modules 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -31,9 +31,8 @@ </autotools>

<autotools id="libjpeg" autogen-sh="configure"> - <branch module="jpegsrc.v9d.tar.gz" version="9d" - repo="jpeg" checkoutdir="jpeg-9d" - hash="sha256:6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee"> + <branch module="jpegsrc.v9e.tar.gz" version="9e" + repo="jpeg" checkoutdir="jpeg-9e"> </branch> </autotools>

@@ -62,7 +61,6 @@ <patch file="libxml2-python-config.patch" strip="1"/> </branch> <after> - <dep package="python2"/> <dep package="python3"/> </after> </autotools>

Modified: modulesets-stable/gtk-osx-gtkmm.modules 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -143,7 +143,7 @@ <dep package="cairomm"/> <dep package="pangomm"/> <dep package="atkmm"/> - <dep package="gtk-4.0"/> + <dep package="gtk-4"/> </dependencies> </meson>

Modified: modulesets-stable/gtk-osx-javascript.modules 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -14,7 +14,6 @@ </dependencies> <after> <dep package="meta-gtk-osx-gtk3"/> - <dep package="meta-gtk-osx-gtk3.14"/> <dep package="meta-gtk-osx-bootstrap"/> </after> </metamodule>

Modified: modulesets-stable/gtk-osx-network.modules 21 lines changed, 10 insertions(+), 11 deletions(-) =================================================================== @@ -16,6 +16,7 @@ <repository name="webkit.org" type="tarball" href="http://www.webkitgtk.org/releases/"/> <repository type="tarball" name="github-tarball" href="https://github.com/"/> + <repository type="tarball" name="zlib" href="https://www.zlib.net/"/>

<!-- Builds latest stable version of WebKitGTK for GTK 3.x --> <metamodule id="meta-gtk-osx-webkit-gtk3"> @@ -30,8 +31,8 @@ <autotools id="openssl" autogen-sh="Configure" autogenargs="shared " autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl %(autogenargs)s" makeinstallargs="install_sw" supports-non-srcdir-builds="no"> - <branch module="openssl-1.1.1k.tar.gz" version="1.1.1k" repo="openssl" - hash="sha256:892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5"/> + <branch module="openssl-1.1.1n.tar.gz" version="1.1.1n" repo="openssl" + hash="sha256:40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a"/> </autotools>

<!-- Rudely demands TeX to build documentation --> @@ -71,12 +72,11 @@ </branch> </autotools>

- <autotools id="zlib" autogen-sh="configure" skip-autogen="never" - supports-non-srcdir-builds="no"> - <branch repo="sourceforge" version="1.2.11" - module="libpng/zlib-1.2.11.tar.xz" - hash="sha256:4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"/> - </autotools> + <cmake id="zlib"> + <branch repo="zlib" version="1.2.13" + module="zlib-1.2.13.tar.xz" + hash="sha256:d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"/> + </cmake>

<autotools id="p11-kit" autogen-sh="configure" autogenargs="--without-trust-paths"> @@ -93,9 +93,8 @@ <if condition-unset="pre-Mavericks"> <autotools id="gnutls" autogen-sh="autoreconf" autogenargs="--disable-gtk-doc-html --with-included-unistring"> - <branch repo="gnupg.org" version="3.7.1" - module="gcrypt/gnutls/v3.7/gnutls-3.7.1.tar.xz" - hash="sha256:3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f"> + <branch repo="gnupg.org" version="3.7.7" + module="gcrypt/gnutls/v3.7/gnutls-3.7.7.tar.xz"> </branch> <dependencies> <dep package="libnettle"/>

Modified: modulesets-stable/gtk-osx-obsolete.modules 264 lines changed, 0 insertions(+), 264 deletions(-) =================================================================== @@ -1,264 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE moduleset SYSTEM "moduleset.dtd"> -<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> -<moduleset> - <repository type="tarball" name="ftp.gnome.org" default="yes" - href="http://download.gnome.org/sources/%22/%3E - <repository type="tarball" name="tango.freedesktop.org" - href="http://tango.freedesktop.org/releases/%22/%3E - <repository type="tarball" name="icon-theme.freedesktop.org" - href="http://icon-theme.freedesktop.org/releases%22/%3E - - <!-- - OBSOLETE PACKAGES - - The following packages are no longer maintained and are provided - solely to support projects that have failed to - modernize. Developers/packagers using these modules are advised - to copy this moduleset into their project because this file - along with all of these modules will be removed at the next - regular update. - - These modules successfully built on macOS at one point, but they - are no longer tested and may or may not build on newer macOS - versions or with newer compilers. If you use them you're on your - own for working out patches needed to keep building them in your - environment. - --> - - <!-- Builds last version of WebKitGTK that supported GTK 2.x --> - <metamodule id="meta-gtk-osx-webkit-gtk2"> - <dependencies> - <dep package="meta-gtk-osx-gtk2"/> - <dep package="webkit1gtk2"/> - </dependencies> - </metamodule> - - <autotools id="icu55" autogen-sh="source/configure" - autogenargs="--enable-rpath" - makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'> - <branch repo="github-tarball" version="55.2" checkoutdir="icu" - module="unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz" - hash="sha256:eda2aa9f9c787748a2e2d310590720ca8bcc6252adf6b4cfb03b65bef9d66759"/> - </autotools> - - <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API. - disable-webkit2: Requires both GTK2 and 3. Currently not supported. - disable-credential-storage: Requires libsecret. No module for this yet. - disable-geolocation: Requires geoclue 1 or 2. No module for this yet. - disable-video, disable-web-audio: Requires gstreamer. If you want video and - audio, add this to your .jhbuildrc: - append_autogenargs('WebKit', '&#45;-enable-video') - append_autogenargs('WebKit', '&#45;-enable-web-audio') - -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171 - - It has some issues with ICU 58 so we keep it on ICU55. Note that - you can't install both, so if you need to build this webkit add icu - to your skip-list. - --> - <autotools id="webkit1gtk2" autogen-sh="autoreconf" - autogenargs="--enable-quartz-target --with-gtk=2.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-stdlib=libc++'"> - - <branch repo="webkit.org" module="webkitgtk-2.4.11.tar.xz" version="2.4.11" - hash="sha256:588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7"> - <patch file="webkit-140167-disable-netscape-api.patch" strip="1"/> - <!-- This patch can be commented out for XCode >= 6.3, but does no harm if - it's left in --> - <patch file="webkit-133293-cfi-clang-failure.patch" strip="1"/> - <patch file="WebKit-2.4.11-fixups.patch" strip="1"/> - </branch> - <dependencies> - <dep package="libwebp"/> - <dep package="enchant"/> - <dep package="icu55"/> - <dep package="libsoup"/> - </dependencies> - <after> - <dep package="meta-gtk-osx-gtk2 -"/> - <dep package="meta-gstreamer"/> - </after> - </autotools> - <autotools id="libunique" autogen-sh="configure" - autogenargs="--without-x --disable-dbus"> - <branch module="libunique/3.0/libunique-3.0.2.tar.bz2" version="3.0.2" - hash="sha256:a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038"> - <patch file="libunique-663913-sockaddr-un.patch" strip="1"/> - </branch> - <dependencies> - <dep package="gtk+-2.0"/> - </dependencies> - </autotools> - -<!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation - with later versions it installs as pygobject2 and PyGObject 3 - installs as pygobject3. Introspection is disabled here, because - gir-scanner isn't smart enough to co-install them. --> - <autotools id="pygobject2" autogen-sh="configure" - autogenargs="--disable-introspection" - supports-non-srcdir-builds="no"> - <branch version="2.28.7" module="pygobject/2.28/pygobject-2.28.7.tar.xz" - hash="sha256:bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a"> - <!-- remove all references to the missing gdestktopappinfo --> - <patch file="pygobject-gdesktopappinfo-missing.patch" - strip="1"/> - </branch> - <dependencies> - <dep package="meta-gtk-osx-gtk2"/> - </dependencies> - <after> - <dep package="python2"/> - </after> - </autotools> - -<!-- Libglade's functions are now part of Gtk+ with different names and -Libglade itself is deprecated. This is the last release. It's required by pygtk, another obsolete package.--> - <autotools id="libglade" autogen-sh='autoreconf'> - <branch module="libglade/2.6/libglade-2.6.4.tar.bz2" version="2.6.4" - hash="sha256:64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec"> - <patch file="libglade-gmodule.patch" strip="1"/> - </branch> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - <dep package="meta-gtk-osx-gtk2"/> - </after> - </autotools> - -<!-- Pygtk is discontinued, this is the last release --> - <autotools id="pygtk" autogen-sh="configure" - autogenargs="CFLAGS=&quot;$CFLAGS -xobjective-c&quot; lt_cv_sys_global_symbol_pipe=&quot;'sed -n -e '''s/^.*[ ]([BCDEGRST][BCDEGRST]*)[ ][ ]*_([_A-Za-z][_A-Za-z0-9]*)$/\1 _\2 \2/p''' | sed '''/ __gnu_lto/d''''&quot;"> - <branch version="2.24.0" module="pygtk/2.24/pygtk-2.24.0.tar.bz2" - hash="sha256:cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912"> - <patch file="pygtk-libtool.patch" strip="1"/> - <patch file="pygtk-pango1.4x.patch" strip="1"/> - <patch file="pygtk-pango-decls.patch" strip="1"/> - </branch> - <dependencies> - <dep package="pygobject"/> - <dep package="meta-gtk-osx-gtk2"/> - <dep package="pycairo"/> - </dependencies> - <after> - <dep package="libglade"/> - </after> - </autotools> - -<!-- This is, I think, the last Gtk+2 version --> - <autotools id="devhelp" autogen-sh="autogen.sh"> - <branch module="devhelp/2.32/devhelp-2.32.0.tar.bz2" version="2.32.0" - hash="sha256:61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4"> - <patch file="devhelp-663789-gtkosxapplication.patch" strip="1"/> - <patch file="devhelp-646962-variable-name.patch" strip="1"/> - </branch> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - <dep package="meta-gtk-osx-themes"/> - <dep package="meta-gtk-osx-gtk2"/> - </after> - <dependencies> - <dep package="webkit1gtk2"/> - <dep package="libunique"/> - </dependencies> - </autotools> - -<!-- Glade 3.8 is the last stable series for Gtk+-2 --> - <autotools id="glade3" autogen-sh="configure" - autogenargs="--disable-scrollkeeper"> - <branch module="glade3/3.8/glade3-3.8.5.tar.xz" version="3.8.5" - hash="sha256:58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735"> - <patch file="Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch" strip="1"/> - </branch> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - <dep package="meta-gtk-osx-themes"/> - <dep package="meta-gtk-osx-gtk2"/> - </after> - </autotools> - - <!-- gtksourceview-2.10.5 is the last version that supports Gtk+-2 --> - <autotools id="gtksourceview" autogen-sh="configure"> - <branch module="gtksourceview/2.10/gtksourceview-2.10.5.tar.bz2" - version="2.10.5" hash="sha256:c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"> - <patch file="gtksourceview-664511-gtkosxapplication.patch" strip="1"/> - </branch> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - <dep package="meta-gtk-osx-gtk2"/> - </after> - </autotools> - -<!-- Goocanvas-1 is for gtk+-2. --> - <autotools id="goocanvas" autogen-sh="configure"> - <branch module="goocanvas/1.0/goocanvas-1.0.0.tar.bz2" version="1.0.0" - hash="sha256:1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e"/> - <dependencies> - <dep package="gtk+-2.0"/> - </dependencies> - </autotools> - -<!-- Libart_lgpl is deprecated by gnome. This is probably the last release. --> - <autotools id="libart_lgpl"> - <branch module="libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2" - version="2.3.21" hash="sha256:fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"/> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - <dep package="meta-gtk-osx-gtk2"/> - </after> - </autotools> - - <autotools id="gtkspell" autogen-sh="configure"> - <branch module="gtkspell/gtkspell-2.0.16.tar.gz" repo="sourceforge" - version="2.0.16"/> - <dependencies> - <dep package="enchant"/> - </dependencies> - </autotools> - - <metamodule id="meta-gtk-osx-themes"> - <dependencies> - <dep package="tango-icon-theme"/> - <dep package="icon-naming-utils"/> - <dep package="gtk-engines"/> - </dependencies> - </metamodule> - - <autotools id="icon-naming-utils" autogen-sh="configure"> - <branch repo="tango.freedesktop.org" version="0.8.90" - module="icon-naming-utils-0.8.90.tar.bz2" - hash="md5:dd8108b56130b9eedc4042df634efa66"/> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - </after> - </autotools> - - <autotools id="hicolor-icon-theme" autogen-sh="configure" - supports-non-srcdir-builds="no"> - <branch module="hicolor-icon-theme-0.17.tar.xz" repo="icon-theme" - version="0.17"/> - </autotools> - - <autotools id="tango-icon-theme" autogenargs="--disable-icon-framing" - autogen-sh="configure"> - <branch repo="tango.freedesktop.org" version="0.8.90" - module="tango-icon-theme-0.8.90.tar.gz" - hash="md5:0795895d2f20eddcbd2bffe94ed431a6"/> - <dependencies> - <dep package="icon-naming-utils"/> - <dep package="hicolor-icon-theme"/> - </dependencies> - </autotools> - - <autotools id="gtk-engines" autogen-sh="configure"> - <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2" - version="2.20.2" hash="sha256:15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"/> - <after> - <dep package="meta-gtk-osx-gtk2"/> - </after> - </autotools> - - <autotools id="murrine-engine" autogen-sh="configure"> - <branch module="murrine/0.98/murrine-0.98.1.1.tar.bz2" version="0.98.1.1" - hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/> - </autotools> - -</moduleset>

Modified: modulesets-stable/gtk-osx-python.modules 82 lines changed, 4 insertions(+), 78 deletions(-) =================================================================== @@ -16,27 +16,6 @@ <repository type="tarball" name="github-tarball" href="https://github.com"/>

- <metamodule id="meta-gtk-osx-python2-gtk2"> - <dependencies> - <dep package="pycairo"/> - <dep package="pygobject2"/> - <dep package="pygtk"/> - <dep package="gtk-mac-integration-python"/> - </dependencies> - </metamodule> - - <metamodule id="meta-gtk-osx-python2-gtk3"> - <dependencies> - <dep package="pycairo"/> - <dep package="pygobject3-2"/> - <dep package="gtk-mac-integration-python"/> - </dependencies> - <after> - <dep package="meta-gtk-osx-gtk3"/> - <dep package="meta-gtk-osx-gtk3.14"/> - </after> - </metamodule> - <metamodule id="meta-gtk-osx-python3-gtk3"> <dependencies> <dep package="pycairo"/> @@ -45,27 +24,13 @@ </dependencies> <after> <dep package="meta-gtk-osx-gtk3"/> - <dep package="meta-gtk-osx-gtk3.14"/> </after> </metamodule>

- <!-- Python 2 end-of-life was 31 December 2020 and 2.7.18 was the last release. --> - <autotools id="python2" autogenargs="--enable-shared" - supports-non-srcdir-builds="no" autogen-sh="autoreconf"> - <branch repo="python" - module="2.7.18/Python-2.7.18.tgz" version="2.7.18" - hash="sha256:da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814"> - <!-- related to https://bugs.python.org/issue11445 --> - <patch file="python-ldflags.patch" strip="1"/> - </branch> - <dependencies> - <dep package='readline'/> - </dependencies> - </autotools> - <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure"> - <branch repo="python" module="3.9.2/Python-3.9.2.tar.xz" version="3.9.2" - hash="sha256:3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d"/> + <branch repo="python" module="3.10.2/Python-3.10.2.tar.xz" version="3.10.2" + hash="sha256:17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7"/> + <dependencies> <dep package='readline'/> <dep package="openssl"/> <!-- For hashlib --> @@ -78,48 +43,10 @@ hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"/> <dependencies> <dep package="cairo"/> - </dependencies> - <after> <dep package="python3"/> - <dep package="python2"/> <dep package="meta-gtk-osx-gtk3"/> - <dep package="meta-gtk-osx-gtk2"/> - </after> - </meson> - - <!-- PyGObject 3.36 is the last version of PyGObject that supports - Python2. It's provided here for those laggards who haven't yet - migrated their projects to Python3. Don't expect it to stay - forever, migrate now! --> - - <meson id="pygobject3-2" > - <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz" - hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/> - <dependencies> - <dep package="pycairo"/> - </dependencies> - <after> - <dep package="python2"/> - <dep package="python3"/> - </after> - </meson> - - <!-- PyGObject 3.36 is the last version of PyGObject that supports - Python2. It's provided here for those laggards who haven't yet - migrated their projects to Python3. Don't expect it to stay - forever, migrate now! --> - - <meson id="pygobject3-2" > - <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz" - hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/> - <dependencies> - <dep package="pycairo"/> </dependencies> - <after> - <dep package="python2"/> - <dep package="python3"/> - </after> - </meson> + </meson>

<meson id="pygobject3" > <branch version="3.40.1" module="pygobject/3.40/pygobject-3.40.1.tar.xz" @@ -142,7 +69,6 @@ <dependencies> </dependencies> <after> - <dep package="pygtk"/> <dep package="pygobject3"/> </after> </autotools>

Modified: modulesets-stable/gtk-osx-random.modules 25 lines changed, 11 insertions(+), 14 deletions(-) =================================================================== @@ -16,8 +16,8 @@ <repository type="tarball" name="graphviz" href="https://gitlab.com/graphviz/graphviz/-/archive/"/> <repository type="tarball" name="sqlite" href="http://www.sqlite.org/"/> - <repository type="tarball" name="frodo" - href="http://frodo.looijaard.name/system/files/software/%22/%3E + <repository type="tarball" name="fossies" + href="https://fossies.org/linux/misc/%22/%3E <repository type="tarball" name="paguire" href="https://releases.pagure.org/"/> <repository type="tarball" name="pcre" href="https://ftp.pcre.org/pub/"/>

@@ -39,12 +39,9 @@ hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b"/> <dependencies> <dep package="graphviz"/> - </dependencies> - <after> <dep package="meta-gtk-osx-bootstrap"/> <dep package="meta-gtk-osx-gtk3"/> - <dep package="meta-gtk-osx-gtk2"/> - </after> + </dependencies> </autotools>

<autotools id="expat" autogen-sh="configure"> @@ -78,8 +75,8 @@ </meson>

<meson id="glade" mesonargs="-Dmac_bundle=true -Dman=false" > - <branch module="glade/3.38/glade-3.38.2.tar.xz" version="3.38.2" - hash="sha256:98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7"> + <branch module="glade/3.40/glade-3.40.0.tar.xz" version="3.40.0" + hash="sha256:31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c"> </branch> <dependencies> <dep package="itstool"/> @@ -116,11 +113,11 @@ </dependencies> </meson>

- <autotools id="frodo-getopt" autogen-sh="configure" + <autotools id="getopt" autogen-sh="configure" supports-non-srcdir-builds="no"> - <branch repo="frodo" version="1.1.6" module="getopt/getopt-1.1.6.tar.gz" + <branch repo="fossies" version="1.1.6" module="getopt-1.1.6.tar.gz" hash="sha256:d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe"> - <patch file="frodo-getopt-autotools.patch" strip="1"/> + <patch file="getopt-autotools.patch" strip="1"/> </branch> </autotools> <autotools id="xmlto" autogen-sh="autoreconf"> @@ -130,7 +127,7 @@ <patch file="xmlto-allow-net-access.patch" strip="1"/> </branch> <dependencies> - <dep package="frodo-getopt"/> + <dep package="getopt"/> </dependencies> </autotools>

@@ -158,9 +155,9 @@ <!-- SQLite3 is also available from the macOS SDK --> <autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe" autogen-sh="configure"> - <branch module="2021/sqlite-autoconf-3350400.tar.gz" version='3.35.4' + <branch module="2022/sqlite-autoconf-3390400.tar.gz" version='3.39.4' repo="sqlite" - hash="sha256:7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d"/> + hash="sha3:431328e30d12c551da9ba7ef2122b269076058512014afa799caaf62ca567090"/> </autotools>

<!-- Goocanvas2 is for gtk+-3. -->

Modified: modulesets-stable/gtk-osx.modules 203 lines changed, 83 insertions(+), 120 deletions(-) =================================================================== @@ -4,20 +4,22 @@ <moduleset> <repository type="tarball" name="ftp.gnome.org" default="yes" href="http://ftp.gnome.org/pub/GNOME/sources/"/> - <repository type="tarball" name="sourceforge" - href="http://downloads.sourceforge.net/sourceforge/%22/%3E <repository type="tarball" name="cairographics" - href="https://www.cairographics.org/releases/%22/%3E + href="https://www.cairographics.org/%22/%3E + <repository type="tarball" name="cairographics-temp" + href="https://gitlab.freedesktop.org/cairo/cairo/-/archive/%22/%3E <repository type="tarball" name="ftp.gnu.org" href="https://ftp.gnu.org/gnu/"/> - <repository type="tarball" name="freedesktop" - href="ftp://ftp.freedesktop.org/pub/"/> + <repository type="tarball" name="xorg" + href="https://www.x.org/releases/%22/%3E <repository type="tarball" name="fontconfig" href="http://www.freedesktop.org/software/fontconfig/release/"/> <repository type="tarball" name="hicolor" href="https://icon-theme.freedesktop.org/releases/"/> - <repository type="git" name="github" href="git://github.com/"/> + <repository type="git" name="github" href="https://github.com/"/> <repository type="tarball" name="github-tarball" href="https://github.com/"/> + <repository type="tarball" name="sourceforge" + href="http://downloads.sourceforge.net/sourceforge/%22/%3E <repository type="system" name="system"/>

<!-- This module set works a bit differently than for example the @@ -58,16 +60,6 @@ <branch repo="system"/> </systemmodule>

- <metamodule id="meta-gtk-osx-gtk2"> - <dependencies> - <dep package="gtk+-2.0"/> - <dep package="gtk-mac-integration"/> - </dependencies> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - </after> - </metamodule> - <metamodule id="meta-gtk-osx-gtk3"> <dependencies> <dep package="gtk+-3.0"/> @@ -79,19 +71,27 @@ </after> </metamodule>

- <autotools id="libffi" autogenargs="--disable-builddir" + <autotools id="libffi" autogenargs="--disable-multi-os-directory" autogen-sh="configure"> - <branch module="libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz" - repo="github-tarball" version="3.3" - hash="sha256:72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"/> + <branch module="libffi/libffi/releases/download/v3.4.3/libffi-3.4.3.tar.gz" + repo="github-tarball" version="3.4.3" + hash="sha256:4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8"/> </autotools>

- <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=disabled"> - <branch module="glib/2.68/glib-2.68.0.tar.xz" version="2.68.0" - hash="sha256:67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea"> + <autotools id="libpcre" autogen-sh="configure" + autogenargs="--enable-unicode-properties --enable-newline-is-any --enable-jit"> + <branch repo="sourceforge" version="8.45" + module="pcre/pcre-8.45.tar.bz2" + hash="sha256:4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8"/> + </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> <dependencies> <dep package="libffi"/> + <dep package="libpcre"/> </dependencies> </meson>

@@ -100,18 +100,18 @@ then build harfbuzz without cairo because cairo requires harfbuzz. --> <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.10.4.tar.gz" version="2.10.4" + <branch module="freetype/freetype-2.11.1.tar.gz" version="2.11.1" repo="sourceforge" - hash="sha256:5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac"/> + hash="sha256:f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b"/> <dependencies> <dep package="zlib"/> </dependencies> </cmake>

- <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled"> - <branch repo="github-tarball" version="2.8.0" - module="harfbuzz/harfbuzz/releases/download/2.8.0/harfbuzz-2.8.0.tar.xz" - hash="sha256:a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42"> + <meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=disabled"> + <branch repo="github-tarball" version="4.1.0" + module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz" + hash="sha256:f7984ff4241d4d135f318a93aa902d910a170a8265b7eaf93b5d9a504eed40c8"> </branch> <dependencies> <dep package="glib"/> @@ -121,15 +121,15 @@ </meson>

<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.10.4.tar.gz" version="2.10.4" + <branch module="freetype/freetype-2.11.1.tar.gz" version="2.11.1" repo="sourceforge"/> <dependencies> <dep package="harfbuzz-no-cairo"/> <dep package="zlib"/> </dependencies> </cmake>

- <autotools id="fontconfig" autogen-sh="configure" + <autotools id="fontconfig" autogen-sh="configure" autogenargs="--disable-docs --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts --with-cache-dir=home"> <branch repo="fontconfig" version="2.13.1" module="fontconfig-2.13.1.tar.bz2" @@ -141,7 +141,7 @@

<autotools id="pixman" autogenargs="--disable-gtk --disable-mmx" autogen-sh="configure"> - <branch version="0.40.0" module="pixman-0.40.0.tar.gz" + <branch version="0.40.0" module="releases/pixman-0.40.0.tar.gz" repo="cairographics" hash="sha512:063776e132f5d59a6d3f94497da41d6fc1c7dca0d269149c78247f0e0d7f520a25208d908cf5e421d1564889a91da44267b12d61c0bd7934cd54261729a7de5f"> </branch> @@ -153,27 +153,24 @@ <!-- cairo doesn't really need fontconfig, but if Pango finds freetype it insists that it has to have fontconfig too and that they are both built into cairo. --> - <autotools id="cairo" autogen-sh="autoreconf" - autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x"> - <branch module="cairo-1.16.0.tar.xz" version="1.16.0" - repo="cairographics" - hash="sha256:5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"> - <patch file="cairo-freetype-font-variations.patch" strip="1"/> - <patch file="Cairo-quartz-surface-create-internal.patch" strip="1"/> + <meson id="cairo"> + <branch module="1.17.6/cairo-1.17.6.tar.bz2" version="1.17.6" + repo="cairographics-temp" + hash="sha256:90496d135c9ef7612c98f8ee358390cdec0825534573778a896ea021155599d2"> + <patch file="cairo-1.17.6-snapshot-memory-leak.patch" strip="1"/> </branch> <dependencies> <dep package="pixman"/> <dep package="meta-gtk-osx-bootstrap"/> <dep package="harfbuzz-no-cairo"/> <dep package="fontconfig"/> </dependencies> - </autotools> + </meson>

<meson id="gobject-introspection"> - <branch module="gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz" - version="1.68.0" - hash="sha256:d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27"> - <patch file="girscanner-objc.patch" strip="1"/> + <branch module="gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz" + version="1.72.0" + hash="sha256:02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc"> </branch> <dependencies> <dep package="glib"/> @@ -184,9 +181,9 @@ </after> </meson>

- <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled"> - <branch repo="github-tarball" version="2.8.0" - module="harfbuzz/harfbuzz/releases/download/2.8.0/harfbuzz-2.8.0.tar.xz" + <meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=enabled"> + <branch repo="github-tarball" version="4.1.0" + module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz"

</branch> <dependencies> @@ -197,17 +194,18 @@ </meson>

<meson id="fribidi" mesonargs="-Ddocs=false"> - <branch module="fribidi/fribidi/releases/download/v1.0.10/fribidi-1.0.10.tar.xz" - repo="github-tarball" version="1.0.10" - hash="sha256:7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01"/> + <branch module="fribidi/fribidi/releases/download/v1.0.11/fribidi-1.0.11.tar.xz" + repo="github-tarball" version="1.0.11" + hash="sha256:30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d"/> <dependencies> <!--dep package="c2man"/ --> </dependencies> </meson>

<meson id="pango" mesonargs="-Dfontconfig=enabled"> - <branch version="1.48.4" module="pango/1.48/pango-1.48.4.tar.xz" - hash="sha256:418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a"> + <branch version="1.50.6" module="pango/1.50/pango-1.50.6.tar.xz" + hash="sha256:a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a"> + <patch file="pango-coretext-fix-clang-build-failure.patch" strip="1"/> </branch> <dependencies> <dep package="glib"/> @@ -234,8 +232,8 @@ </meson>

<meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false"> - <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz" version="2.42.4" - hash="sha256:fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d"> + <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz" version="2.42.8" + hash="sha256:84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6"> <patch file="gdk-pixbuf-loader-name.patch" strip="1"/> </branch> <after> @@ -249,39 +247,10 @@ repo="hicolor"/> </autotools>

- <!-- gtk2 has reached its end-of-life as of December 2020 and 2.24.33 is the final release. --> - <autotools id="gtk+-2.0" autogen-sh="autoreconf" - autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection --disable-visibility"> - <branch module="gtk+/2.24/gtk+-2.24.33.tar.xz" version="2.24.33" - hash="sha256:ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da"> - <!--patch file="0004-Bug-571582-GtkSelection-implementation-for-quartz.patch" strip="1"/--> - <patch file="0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch" strip="1"/> - <patch file="0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch" strip="1"/> - <patch file="gtk+-2-m4-creation.patch" strip="1"/> - <!-- upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=767091 --> - <patch file="gtk-gimp-dnd-bug767091.patch" strip="1"/> - <!-- upstream bug: https://gitlab.gnome.org/GNOME/gtk/issues/529 --> - <patch file="https://gitlab.gnome.org/GNOME/gtk/uploads/f0c19446b9cd1df467c4cc9050516d4b/0001-Bug-743717-Crashes-on-clipboard-operation-influence-.patch" strip="1"/> - <!-- upstream bug: https://gitlab.gnome.org/GNOME/gtk/issues/580 --> - <patch file="https://gitlab.gnome.org/GNOME/gtk/uploads/2a194d81de8e8346a81816870264b3bf/gdkimage.patch" strip="1"/> - </branch> - <dependencies> - <dep package="glib"/> - <dep package="pango"/> - <dep package="atk"/> - <dep package="gdk-pixbuf"/> - <dep package="gobject-introspection"/> - <dep package="hicolor-icon-theme"/> - </dependencies> - <after> - <dep package="meta-gtk-osx-bootstrap"/> - </after> - </autotools> - <autotools id="xorg-util-macros"> - <branch repo="freedesktop" version="1.19.2" - module="xorg/individual/util/util-macros-1.19.2.tar.bz2" - hash="sha256:d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712"/> + <branch repo="xorg" version="1.19.3" + module="individual/util/util-macros-1.19.3.tar.bz2" + hash="sha256:0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971"/> </autotools>

<meson id="libepoxy"> @@ -295,10 +264,10 @@

<!-- 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.30.tar.xz" version="3.24.30" - hash="sha256:ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9"> - <patch file="Quartz-version-detection-for-macOS-12.patch" strip="1"/> - <patch file="gtk+-scale-absolute-value.patch" strip="1"/> + <branch module="gtk+/3.24/gtk+-3.24.33.tar.xz" version="3.24.33" + hash="sha256:588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801"> + <patch file="gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch" strip="1"/> + <patch file="gtk-3.24.33-quartz-window-transient-for.patch" strip="1"/> </branch> <dependencies> <dep package="glib"/> @@ -314,10 +283,10 @@ </after> </meson>

- <meson id="graphene" mesonargs="-Dtests=false -Dbenchmarks=false"> - <branch repo="github-tarball" version="1.10.4" - module="ebassi/graphene/releases/download/1.10.4/graphene-1.10.4.tar.xz" - hash="sha256:b2a45f230f332478553bd79666eca8df1d1c6dbf208c344ba9f5120592772414"/> + <meson id="graphene" mesonargs="-Dtests=false"> + <branch repo="github-tarball" version="1.10.6" + module="ebassi/graphene/releases/download/1.10.6/graphene-1.10.6.tar.xz"/> + <!-- hash="sha256:"/ --> <dependencies> <dep package="glib"/> <dep package="gobject-introspection"/> @@ -326,19 +295,20 @@

<autotools id="libsass" autogen-sh="autoreconf" autogenargs="--disable-tests --disable-static"> - <branch repo="github-tarball" version="3.6.4" - module="sass/libsass/archive/refs/tags/3.6.4.tar.gz" - rename-tarball="libsass-3.6.4.tar.gz" - checkoutdir="libsass-3.6.4" - hash="sha256:f9484d9a6df60576e791566eab2f757a97fd414fce01dd41fc0a693ea5db2889"/> + <branch repo="github-tarball" version="3.6.5" + module="sass/libsass/archive/refs/tags/3.6.5.tar.gz" + rename-tarball="libsass-3.6.5.tar.gz" + checkoutdir="libsass-3.6.5"/> + <!--hash="sha256:"/ --> </autotools>

- <meson id="gtk-4" mesonargs="-Dx11-backend=false"> - <branch module="gtk/4.2/gtk-4.2.0.tar.xz" version="4.2.0" - hash="sha256:e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072"/> + <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"/> <dependencies> <dep package="pango"/> <dep package="atk"/> + <dep package="gdk-pixbuf"/> <dep package="graphene"/> <dep package="libsass"/> <dep package="libepoxy"/> @@ -353,38 +323,31 @@ <patch file="gtk-mac-integration-work-around-svg-locale-bug.patch" strip="1"/> </branch> <dependencies> - </dependencies> - <after> - <dep package="gtk+-2.0"/> <dep package="gtk+-3.0"/> - </after> - </autotools> - - <autotools id="libcroco" autogenargs="--disable-Bsymbolic" - autogen-sh="configure"> - <branch module="libcroco/0.6/libcroco-0.6.13.tar.xz" version="0.6.13" - hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/> + </dependencies> </autotools>

<autotools id="librsvg" autogen-sh="autoreconf" autogenargs="--disable-Bsymbolic"> - <branch module="librsvg/2.51/librsvg-2.51.0.tar.xz" version="2.51.0" - hash="sha256:89d32e38445025e1b1d9af3dd9d3aeb9f6fce527aeecbecf38b369b34c80c038"/> + <branch module="librsvg/2.54/librsvg-2.54.0.tar.xz" version="2.54.0" + hash="sha256:baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085"/> <dependencies> - <dep package="libcroco"/> + <dep package="cairo"/> + <dep package="pango"/> + <dep package="harfbuzz"/> <dep package="freetype"/> </dependencies> <after> - <!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 --> - <dep package="gtk+-2.0"/> +<!-- Circular dependency if we depend on meta-gtk-osx-gtk3 --> <dep package="gtk+-3.0"/> + <dep package="gtk-4"/> </after> </autotools>

<autotools id="adwaita-icon-theme" autogen-sh="configure"> - <branch module="adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz" - version="3.38.0" - hash="sha256:6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97"/> + <branch module="adwaita-icon-theme/42/adwaita-icon-theme-42.0.tar.xz" + version="42.0" + hash="sha256:5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0"/> <dependencies> <dep package="librsvg"/> </dependencies>

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).