[gtk-osx] Update gtk-osx.modules.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Update gtk-osx.modules.
- Date: Mon, 12 Apr 2021 21:34:12 +0000 (UTC)
commit dcee64f1131319e22182805869ebca2673f35860
Author: John Ralls <jralls ceridwen us>
Date: Mon Apr 12 14:05:29 2021 -0700
Update gtk-osx.modules.
modulesets-stable/gtk-osx.modules | 163 ++++++++++++++++++++++----------------
1 file changed, 94 insertions(+), 69 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 1cd3aa05..0823c9a4 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -21,27 +21,22 @@
<!-- This module set works a bit differently than for example the
GNOME ones do. It's split up in seperate pieces:
-- gtk-osx-bootstrap: contains bootstrap-like modules that you
-don't want to rebuild all the time.
-
-- gtk-osx.modules: contains the core GTK+ stack. This does not
-have a hard dependency on the bootstrap modules, in order to
-make it easy to rebuild the whole core stack without redoing
-the bootstrap parts. They have a soft, "after", depencency.
-
-The remaining modules are mostly for testing and might not work
-all the time:
-
-- gtk-osx-python.modules: self explaining.
-- gtk-osx-gtkmm.modules: self explaining.
-- gtk-osx-javascript.modules: GJS, associated tools, and the Mozilla JS
-library it depends on.
-- gtk-osx-gstreamer.modules: self explaining.
-- gtk-osx-themes.modules: self explaining.
-- gtk-osx-network.modules: The network/crypto stack and various
-configurations of WebKit.
-
-- gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
+ - gtk-osx-bootstrap: contains bootstrap-like modules that you
+ don't want to rebuild all the time.
+
+ - gtk-osx.modules: contains the core GTK+ stack. This does not
+ have a hard dependency on the bootstrap modules, in order to
+ make it easy to rebuild the whole core stack without redoing
+ the bootstrap parts. They have a soft, "after", depencency.
+
+ - gtk-osx-python.modules: Python bindings for Gtk.
+ - gtk-osx-gtkmm.modules: C++ wrappers for Gtk.
+ - gtk-osx-javascript.modules: GJS and its Mozilla JS (aka
+ spidermonkey) dependency.
+ - gtk-osx-gstreamer.modules: GStreamer library and modules.
+ - gtk-osx-themes.modules: Gtk2 Theming engines. Obsolete.
+ - gtk-osx-network.modules: The network/crypto stack and WebKit.
+ - gtk-osx-random.modules: "random stuff", has apps for testing GTK+.
-->
<include href="gtk-osx-bootstrap.modules"/>
@@ -82,12 +77,13 @@ configurations of WebKit.
<autotools id="libffi" autogenargs="--disable-builddir"
autogen-sh="configure">
<branch module="libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz"
- repo="github-tarball" version="3.3"/>
+ repo="github-tarball" version="3.3"
+ hash="sha256:72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"/>
</autotools>
<meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=disabled">
- <branch module="glib/2.66/glib-2.66.0.tar.xz" version="2.66.0"
- hash="sha256:c5a66bf143065648c135da4c943d2ac23cce15690fc91c358013b2889111156c">
+ <branch module="glib/2.68/glib-2.68.0.tar.xz" version="2.68.0"
+ hash="sha256:67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea">
</branch>
<dependencies>
<dep package="libffi"/>
@@ -99,30 +95,28 @@ configurations of WebKit.
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.2.tar.gz" version="2.10.2"
- repo="sourceforge"/>
+ <branch module="freetype/freetype-2.10.4.tar.gz" version="2.10.4"
+ repo="sourceforge"
+ hash="sha256:5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac"/>
<dependencies>
<dep package="zlib"/>
</dependencies>
</cmake>
<meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled">
- <branch repo="github-tarball" version="2.7.1"
- module="harfbuzz/harfbuzz/releases/download/2.7.1/harfbuzz-2.7.1.tar.xz"
- hash="sha256:e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569">
+ <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">
</branch>
<dependencies>
<dep package="glib"/>
<dep package="freetype-no-harfbuzz"/>
- </dependencies>
- <after>
<dep package="icu"/>
- <dep package="icu55"/>
- </after>
+ </dependencies>
</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.2.tar.gz" version="2.10.2"
+ <branch module="freetype/freetype-2.10.4.tar.gz" version="2.10.4"
repo="sourceforge"/>
<dependencies>
<dep package="harfbuzz-no-cairo"/>
@@ -133,7 +127,8 @@ configurations of WebKit.
<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"/>
+ module="fontconfig-2.13.1.tar.bz2"
+ hash="sha256:f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741"/>
<dependencies>
<dep package="freetype"/>
</dependencies>
@@ -157,9 +152,9 @@ configurations of WebKit.
autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
<branch module="cairo-1.16.0.tar.xz" version="1.16.0"
repo="cairographics"
- hash="sha1:00e81842ae5e81bb0343108884eb5205be0eac14">
+ hash="sha256:5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331">
<patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/cairo-freetype-font-variations.patch";
strip="1"/>
- <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/cairo-image-refcount.patch";
strip="1"/>
+ <patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Cairo-quartz-surface-create-internal.patch";
strip="1"/>
</branch>
<dependencies>
<dep package="pixman"/>
@@ -170,9 +165,9 @@ configurations of WebKit.
</autotools>
<meson id="gobject-introspection">
- <branch module="gobject-introspection/1.64/gobject-introspection-1.64.1.tar.xz"
- version="1.64.1"
- hash="sha256:80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7">
+ <branch module="gobject-introspection/1.68/gobject-introspection-1.68.0.tar.xz"
+ version="1.68.0"
+ hash="sha256:d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27">
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/girscanner-objc.patch";
strip="1"/>
</branch>
<dependencies>
@@ -185,9 +180,9 @@ configurations of WebKit.
</meson>
<meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled">
- <branch repo="github-tarball" version="2.7.1"
- module="harfbuzz/harfbuzz/releases/download/2.7.1/harfbuzz-2.7.1.tar.xz"
- hash="sha256:e95ee43b6bd0d3d1307e2aacf0f9c0050e5baceb21988b367b833028114aa569">
+ <branch repo="github-tarball" version="2.8.0"
+ module="harfbuzz/harfbuzz/releases/download/2.8.0/harfbuzz-2.8.0.tar.xz"
+>
</branch>
<dependencies>
<dep package="gobject-introspection"/>
@@ -197,16 +192,17 @@ configurations of WebKit.
</meson>
<meson id="fribidi" mesonargs="-Ddocs=false">
- <branch module="fribidi/fribidi/releases/download/v1.0.9/fribidi-1.0.9.tar.xz"
- repo="github-tarball" version="1.0.9"/>
+ <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"/>
<dependencies>
<!--dep package="c2man"/ -->
</dependencies>
</meson>
<meson id="pango">
- <branch version="1.46.2" module="pango/1.46/pango-1.46.2.tar.xz"
- hash="sha256:d89fab5f26767261b493279b65cfb9eb0955cd44c07c5628d36094609fc51841">
+ <branch version="1.48.4" module="pango/1.48/pango-1.48.4.tar.xz"
+ hash="sha256:418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a">
</branch>
<dependencies>
<dep package="glib"/>
@@ -233,8 +229,8 @@ configurations of WebKit.
</meson>
<meson id="gdk-pixbuf" mesonargs="-Dx11=false -Dman=false">
- <branch module="gdk-pixbuf/2.40/gdk-pixbuf-2.40.0.tar.xz" version="2.40.0"
- hash="sha256:1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6">
+ <branch module="gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.tar.xz" version="2.42.4"
+ hash="sha256:fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d">
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gdk-pixbuf-loader-name.patch";
strip="1"/>
</branch>
<after>
@@ -246,8 +242,8 @@ configurations of WebKit.
<!-- 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.32.tar.xz" version="2.24.32"
- hash="sha256:b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e">
+ <branch module="gtk+/2.24/gtk+-2.24.33.tar.xz" version="2.24.33"
+ hash="sha256:ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da">
<!--patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch";
strip="1"/-->
<patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch";
strip="1"/>
<patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch";
strip="1"/>
@@ -273,7 +269,8 @@ configurations of WebKit.
<autotools id="xorg-util-macros">
<branch repo="freedesktop" version="1.19.2"
- module="xorg/individual/util/util-macros-1.19.2.tar.bz2"/>
+ module="xorg/individual/util/util-macros-1.19.2.tar.bz2"
+ hash="sha256:d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712"/>
</autotools>
<meson id="libepoxy">
@@ -285,10 +282,11 @@ configurations of WebKit.
</dependencies>
</meson>
- <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
- autogenargs="--enable-quartz-backend --enable-quartz-relocation">
- <branch module="gtk+/3.24/gtk+-3.24.23.tar.xz" version="3.24.23"
- hash="sha256:5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1">
+ <!-- gtk3 is in maintenance mode with 3.24 the final release series. -->
+ <meson id="gtk+-3.0"
+ mesonargs="-Dquartz-backend=true -Dx11-backend=false -Dmedia=none">
+ <branch module="gtk+/3.24/gtk+-3.24.28.tar.xz" version="3.24.28"
+ hash="sha256:b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6">
</branch>
<dependencies>
<dep package="glib"/>
@@ -301,21 +299,51 @@ configurations of WebKit.
<after>
<dep package="meta-gtk-osx-bootstrap"/>
</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"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="gobject-introspection"/>
+ </dependencies>
+ </meson>
+
+ <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"/>
</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"/>
+ <dependencies>
+ <dep package="pango"/>
+ <dep package="atk"/>
+ <dep package="graphene"/>
+ <dep package="libsass"/>
+ <dep package="libepoxy"/>
+ </dependencies>
+ </meson>
+
<autotools id="gtk-mac-integration" autogen-sh="configure"
autogenargs="--disable-python">
- <branch module="gtk-mac-integration/2.1/gtk-mac-integration-2.1.3.tar.xz"
- version="2.1.3"
- hash="sha256:d5f72302daad1f517932194d72967a32e72ed8177cfa38aaf64f0a80564ce454">
+ <branch module="gtk-mac-integration/3.0/gtk-mac-integration-3.0.0.tar.xz"
+ version="3.0.0"
+ hash="sha256:af88bb3a284e24c550e15290e07e562fcd2a038ebb0fcc863dd069d3738952ae"
+ >
</branch>
<dependencies>
</dependencies>
<after>
<dep package="gtk+-2.0"/>
<dep package="gtk+-3.0"/>
- <dep package="gtk+-3.14"/>
- <dep package="meta-gtk-osx-bootstrap"/>
</after>
</autotools>
@@ -325,12 +353,9 @@ configurations of WebKit.
hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
</autotools>
- <!-- librsvg is converting to the Rust language. This requires
- substantial infrastructure that's resistant to installing with
- jhbuild, so we'll freeze at the 2.40 branch. -->
<autotools id="librsvg" autogenargs="--disable-Bsymbolic">
- <branch module="librsvg/2.40/librsvg-2.40.17.tar.xz" version="2.40.17"
- hash="sha256:e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc"/>
+ <branch module="librsvg/2.51/librsvg-2.51.0.tar.xz" version="2.51.0"
+ hash="sha256:89d32e38445025e1b1d9af3dd9d3aeb9f6fce527aeecbecf38b369b34c80c038"/>
<dependencies>
<dep package="libcroco"/>
<dep package="freetype"/>
@@ -339,13 +364,13 @@ configurations of WebKit.
<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
<dep package="gtk+-2.0"/>
<dep package="gtk+-3.0"/>
- <dep package="gtk+-3.14"/>
</after>
</autotools>
<autotools id="adwaita-icon-theme" autogen-sh="configure">
- <branch module="adwaita-icon-theme/3.36/adwaita-icon-theme-3.36.1.tar.xz"
- version="3.36.1" hash="sha256:e498518627044dfd7db7d79a5b3d437848caf1991ef4ef036a2d3a2ac2c1f14d"/>
+ <branch module="adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz"
+ version="3.38.0"
+ hash="sha256:6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97"/>
<dependencies>
<dep package="librsvg"/>
</dependencies>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
