[gtk-osx] Update core modules versions.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Update core modules versions.
- Date: Fri, 25 Mar 2022 20:48:03 +0000 (UTC)
commit bb08eff51378a89aaf6e88615cfa62c20ae7405f
Author: John Ralls <jralls ceridwen us>
Date: Fri Mar 25 13:47:42 2022 -0700
Update core modules versions.
Leaks into modulesets-unstable because cairo has switched from autotools to meson.
modulesets-stable/gtk-osx.modules | 131 +++---
modulesets-unstable/gtk-osx.modules | 5 +-
modulesets/gtk-osx.modules | 43 +-
patches/Cairo-quartz-surface-create-internal.patch | 313 ---------------
.../Quartz-version-detection-for-macOS-12.patch | 67 ----
patches/cairo-freetype-font-variations.patch | 32 --
patches/girscanner-objc.patch | 20 -
patches/gobject-introspection-1.70.0-obsolet.patch | 437 ---------------------
patches/gtk+-scale-absolute-value.patch | 32 --
...-remove-gtk4-update-icon-cache-dependency.patch | 10 +
.../pango-coretext-fix-clang-build-failure.patch | 30 ++
11 files changed, 130 insertions(+), 990 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index aba7a13..97a7063 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -7,17 +7,18 @@
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
<repository type="tarball" name="cairographics"
- href="https://www.cairographics.org/releases/"/>
+ href="https://www.cairographics.org/"/>
<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/"/>
<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="tarball" name="github-tarball" href="https://github.com/"/>
+ <repository type="tarball" name="pcre" href="https://ftp.pcre.org/pub/"/>
<repository type="system" name="system"/>
<!-- This module set works a bit differently than for example the
@@ -86,12 +87,19 @@
hash="sha256:72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"/>
</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">
+ <branch repo="pcre" 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 +108,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 -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,7 +129,7 @@
</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"/>
@@ -129,7 +137,7 @@
</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 +149,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,13 +161,10 @@
<!-- 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"
+ <meson id="cairo">
+ <branch module="snapshots/cairo-1.17.6.tar.bz2" version="1.17.6"
repo="cairographics"
- hash="sha256:5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331">
- <patch file="cairo-freetype-font-variations.patch" strip="1"/>
- <patch file="Cairo-quartz-surface-create-internal.patch" strip="1"/>
+ hash="sha256:90496d135c9ef7612c98f8ee358390cdec0825534573778a896ea021155599d2">
</branch>
<dependencies>
<dep package="pixman"/>
@@ -167,14 +172,12 @@
<dep package="harfbuzz-no-cairo"/>
<dep package="fontconfig"/>
</dependencies>
- </autotools>
+ </meson>
<meson id="gobject-introspection">
- <branch module="gobject-introspection/1.70/gobject-introspection-1.70.0.tar.xz"
- version="1.70.0"
- hash="sha256:902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a">
- <patch file="gobject-introspection-1.70.0-obsolet.patch" strip="1"/>
- <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"/>
@@ -185,9 +188,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 -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>
@@ -198,17 +201,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"/>
@@ -235,8 +239,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>
@@ -280,9 +284,9 @@
</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">
@@ -296,10 +300,9 @@
<!-- 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"/>
</branch>
<dependencies>
<dep package="glib"/>
@@ -316,9 +319,9 @@
</meson>
<meson id="graphene" mesonargs="-Dtests=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"/>
+ <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"/>
@@ -327,16 +330,16 @@
<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"/>
+ <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"/>
@@ -362,18 +365,14 @@
</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"/>
- </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="hafbuzz"/>
<dep package="freetype"/>
</dependencies>
<after>
@@ -384,9 +383,9 @@
</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>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 57c7594..ddbc220 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -123,8 +123,7 @@
<!-- 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"
- autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
+ <meson id="cairo">
<branch repo="freedesktop" module="cairo/cairo" />
<dependencies>
<dep package="pixman"/>
@@ -133,7 +132,7 @@
</dependencies>
<after>
</after>
- </autotools>
+ </meson>
<meson id="gobject-introspection">
<branch/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 36dcf2f..c558067 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -62,10 +62,17 @@
<branch module="atgreen/libffi" repo="github" tag="v3.3"/>
</autotools>
+ <autotools id="libpcre" autogen-sh="configure">
+ <branch repo="pcre" version="8.45"
+ module="pcre/pcre-8.45.tar.bz2"
+ hash="sha256:4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8"/>
+ </autotools>
+
<meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=disabled">
- <branch tag="glib-2-68"/>
+ <branch tag="glib-2-72"/>
<dependencies>
<dep package="libffi"/>
+ <dep package="libpcre"/>
</dependencies>
</meson>
@@ -74,14 +81,14 @@
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/freetype2" repo="nongnu" revision="VER-2-10-4"/>
+ <branch module="freetype/freetype2" repo="nongnu" revision="VER-2-11-1"/>
<dependencies>
<dep package="zlib"/>
</dependencies>
</cmake>
<meson id="harfbuzz-no-cairo" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled">
- <branch repo="github" module="harfbuzz/harfbuzz" tag="2.8.0"/>
+ <branch repo="github" module="harfbuzz/harfbuzz" tag="4.1.0"/>
<dependencies>
<dep package="glib"/>
<dep package="freetype-no-harfbuzz"/>
@@ -93,7 +100,7 @@
</meson>
<cmake id="freetype" cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D
CMAKE_BUILD_TYPE=Release">
- <branch module="freetype/freetype2" repo="nongnu" revision="VER-2-10-4"/>
+ <branch module="freetype/freetype2" repo="nongnu" revision="VER-2-11-1"/>
<dependencies>
<dep package="harfbuzz-no-cairo"/>
<dep package="zlib"/>
@@ -118,9 +125,8 @@
<!-- 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"
- autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
- <branch repo="freedesktop" module="jralls/cairo" branch="1.16"/>
+ <meson id="cairo"
+ <branch repo="freedesktop" module="cairo/cairo" tag="1.17.6"/>
<dependencies>
<dep package="pixman"/>
<dep package="meta-gtk-osx-bootstrap"/>
@@ -128,10 +134,10 @@
</dependencies>
<after>
</after>
- </autotools>
+ </meson>
<meson id="gobject-introspection">
- <branch tag="1.68.0" module="gobject-introspection"/>
+ <branch tag="1.72.0" module="gobject-introspection"/>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
@@ -145,7 +151,7 @@
to use introspection it requires harfbuzz to have
introspection, and gobject-introspection needs cairo. -->
<meson id="harfbuzz" mesonargs="-Dcoretext=enabled -Ddocs=disabled -Dbenchmark=disabled">
- <branch repo="github" module="harfbuzz/harfbuzz" tag="2.8.0"/>
+ <branch repo="github" module="harfbuzz/harfbuzz" tag="4.1.0"/>
<dependencies>
<dep package="gobject-introspection"/>
<dep package="cairo"/>
@@ -154,14 +160,14 @@
</meson>
<meson id="fribidi" mesonargs="-Ddocs=false">
- <branch module="fribidi/fribidi" repo="github" tag="v1.0.10"/>
+ <branch module="fribidi/fribidi" repo="github" tag="v1.0.11"/>
<dependencies>
<!--dep package="c2man"/ -->
</dependencies>
</meson>
<meson id="pango">
- <branch tag="1.48.4"/>
+ <branch tag="1.50.6"/>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
@@ -187,7 +193,7 @@
<meson id="gdk-pixbuf" mesonargs="-Drelocatable=true -Dman=false">
<!--gdk-pixbuf is releasing from master-->
- <branch tag="2.42.4"/>
+ <branch tag="2.42.8"/>
<dependencies>
<dep package="pango"/>
<dep package="gobject-introspection"/>
@@ -196,7 +202,7 @@
</meson>
<autotools id="xorg-util-macros">
- <branch repo="freedesktop" module="xorg/util/macros"/>
+ <branch repo="freedesktop" module="xorg/util/macros" tag="util-macros-1.19.3"/>
</autotools>
<autotools id="libepoxy">
@@ -242,7 +248,7 @@
<autotools id="gtk-4"
autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
- <branch module="gtk" checkoutdir="gtk-4.0" revision="gtk-4.0"/>
+ <branch module="gtk" checkoutdir="gtk-4.0" branch="gtk-4-6"/>
<dependencies>
<dep package="glib"/>
<dep package="pango"/>
@@ -266,14 +272,14 @@
</autotools>
<autotools id="adwaita-icon-theme">
- <branch revision="3.38.0"/>
+ <branch branch="gnome-42"/>
<dependencies>
<dep package="librsvg"/>
</dependencies>
</autotools>
<autotools id="librsvg" autogenargs="--disable-Bsymbolic">
- <branch module="librsvg" branch="librsvg-2.50"/>
+ <branch module="librsvg" branch="librsvg-2.54"/>
<dependencies>
<dep package="libcroco"/>
<dep package="freetype"/>
@@ -285,9 +291,6 @@
</after>
</autotools>
- <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
- <branch/>
- </autotools>
<!-- Null metamodule, provided so as not to break modules that use it. -->
<metamodule id="meta-gtk-osx-freetype" />
diff --git a/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch
b/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch
new file mode 100644
index 0000000..2850343
--- /dev/null
+++ b/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch
@@ -0,0 +1,10 @@
+--- a/meson.build~ 2022-03-04 20:53:25.000000000 -0800
++++ b/meson.build 2022-03-22 15:44:32.000000000 -0700
+@@ -1013,7 +1013,6 @@
+ gnome.post_install(
+ glib_compile_schemas: true,
+ gio_querymodules: gio_module_dirs,
+- gtk_update_icon_cache: get_option('demos'),
+ )
+ else
+ # Keep this in sync with post-install.py expected arguments
diff --git a/patches/pango-coretext-fix-clang-build-failure.patch
b/patches/pango-coretext-fix-clang-build-failure.patch
new file mode 100644
index 0000000..8476d50
--- /dev/null
+++ b/patches/pango-coretext-fix-clang-build-failure.patch
@@ -0,0 +1,30 @@
+From 9093ffd69850b630622a3fc8dcf09c45c51ae2f9 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Tue, 22 Mar 2022 12:09:09 -0700
+Subject: [PATCH] Coretext: fix clang build failure.
+
+Recent versions of clang notice that pango_core_text_fontset_load_font's
+`key` local variable isn't used and errors out. Remove it.
+---
+ pango/pangocoretext-fontmap.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
+index 40e62eed..e090bfc4 100644
+--- a/pango/pangocoretext-fontmap.c
++++ b/pango/pangocoretext-fontmap.c
+@@ -1696,11 +1696,8 @@ static PangoFont *
+ pango_core_text_fontset_load_font (PangoCoreTextFontset *ctfontset,
+ CTFontDescriptorRef ctdescriptor)
+ {
+- PangoCoreTextFontsetKey *key;
+ PangoCoreTextFont *font;
+
+- key = pango_core_text_fontset_get_key (ctfontset);
+-
+ /* For now, we will default the fallbacks to not have synthetic italic,
+ * in the future this may be improved.
+ */
+--
+2.32.0 (Apple Git-132)
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
