| Original line number | Diff line number | Diff line |
|---|---|---|
| @@ -20,6 +20,16 @@ | ||
<!---->
|
||
<include href="../jhb/gtk-osx-python.modules" />
|
||
<!---->
|
||
<distutils id="packaging">
|
||
<branch module="df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c/packaging-21.3.tar.gz"
|
||
version="21.3"
|
||
hash="sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"
|
||
repo="pymodules" />
|
||
<dependencies>
|
||
<dep package="python3" />
|
||
</dependencies>
|
||
</distutils>
|
||
<!---->
|
||
<meson id="pycairo">
|
||
<branch module="pygobject/pycairo/releases/download/v1.24.0/pycairo-1.24.0.tar.gz"
|
||
version="1.24.0"
|
||
| Original line number | Diff line number | Diff line |
|---|---|---|
| @@ -73,18 +73,25 @@ | ||
repo="github-tarball" />
|
||
</autotools>
|
||
<!---->
|
||
<meson id="glib"
|
||
mesonargs="-Dlibmount=disabled">
|
||
<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>
|
||
<meson id="glib-no-introspection"
|
||
mesonargs="-Dlibmount=disabled -Dintrospection=disabled">
|
||
<branch module="glib/2.80/glib-2.80.2.tar.xz"
|
||
version="2.80.2"
|
||
hash="sha256:b9cfb6f7a5bd5b31238fd5d56df226b2dda5ea37611475bf89f6a0f9400fe8bd" />
|
||
<dependencies>
|
||
<dep package="libffi" />
|
||
<dep package="libpcre2" />
|
||
<dep package="packaging" />
|
||
</dependencies>
|
||
</meson>
|
||
<!---->
|
||
<meson id="glib"
|
||
mesonargs="-Dlibmount=disabled">
|
||
<branch module="glib/2.80/glib-2.80.2.tar.xz"
|
||
version="2.80.2"
|
||
hash="sha256:b9cfb6f7a5bd5b31238fd5d56df226b2dda5ea37611475bf89f6a0f9400fe8bd" />
|
||
<dependencies>
|
||
<dep package="gobject-introspection" />
|
||
</dependencies>
|
||
</meson>
|
||
<!--
|
||
| @@ -120,12 +127,12 @@ | ||
<meson id="harfbuzz-no-cairo"
|
||
mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=disabled -Dtests=disabled">
|
||
<branch module="harfbuzz/harfbuzz/releases/download/7.3.0/harfbuzz-7.3.0.tar.xz"
|
||
version="7.3.0"
|
||
hash="sha256:20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb"
|
||
<branch module="harfbuzz/harfbuzz/releases/download/10.2.0/harfbuzz-10.2.0.tar.xz"
|
||
version="10.2.0"
|
||
hash="sha256:620e3468faec2ea8685d32c46a58469b850ef63040b3565cde05959825b48227"
|
||
repo="github-tarball" />
|
||
<dependencies>
|
||
<dep package="glib" />
|
||
<dep package="glib-no-introspection" />
|
||
<dep package="freetype-no-harfbuzz" />
|
||
<dep package="icu" />
|
||
</dependencies>
|
||
| @@ -148,9 +155,9 @@ | ||
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.14.2.tar.xz"
|
||
version="2.14.2"
|
||
hash="sha256:dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"
|
||
<branch module="fontconfig-2.16.0.tar.xz"
|
||
version="2.16.0"
|
||
hash="sha256:6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220"
|
||
repo="fontconfig" />
|
||
<dependencies>
|
||
<dep package="freetype" />
|
||
| @@ -174,9 +181,9 @@ | ||
-->
|
||
<meson id="cairo"
|
||
mesonargs="-Dfreetype=enabled -Dfontconfig=enabled">
|
||
<branch module="releases/cairo-1.18.0.tar.xz"
|
||
version="1.18.0"
|
||
hash="sha256:243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64"
|
||
<branch module="releases/cairo-1.18.2.tar.xz"
|
||
version="1.18.2"
|
||
hash="sha256:a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a"
|
||
repo="cairographics" />
|
||
<dependencies>
|
||
<dep package="pixman" />
|
||
| @@ -192,7 +199,7 @@ | ||
hash="sha256:196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf">
|
||
</branch>
|
||
<dependencies>
|
||
<dep package="glib" />
|
||
<dep package="glib-no-introspection" />
|
||
<dep package="cairo" />
|
||
</dependencies>
|
||
<after>
|
||
| @@ -203,9 +210,9 @@ | ||
<meson id="harfbuzz"
|
||
mesonargs="-Dcoretext=enabled -Dfreetype=enabled -Ddocs=disabled -Dbenchmark=disabled -Dintrospection=enabled -Dtests=disabled">
|
||
<branch module="harfbuzz/harfbuzz/releases/download/7.3.0/harfbuzz-7.3.0.tar.xz"
|
||
version="7.3.0"
|
||
hash="sha256:20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb"
|
||
<branch module="harfbuzz/harfbuzz/releases/download/10.2.0/harfbuzz-10.2.0.tar.xz"
|
||
version="10.2.0"
|
||
hash="sha256:620e3468faec2ea8685d32c46a58469b850ef63040b3565cde05959825b48227"
|
||
repo="github-tarball" />
|
||
<dependencies>
|
||
<dep package="gobject-introspection" />
|
||
| @@ -228,14 +235,10 @@ | ||
</meson>
|
||
<!---->
|
||
<meson id="pango"
|
||
mesonargs="-Dfontconfig=enabled">
|
||
<branch module="pango/1.50/pango-1.50.14.tar.xz"
|
||
version="1.50.14"
|
||
hash="sha256:1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8">
|
||
<patch file="pango-disable_tests.patch"
|
||
strip="1" />
|
||
</branch>
|
||
mesonargs="-Dfontconfig=enabled -Dintrospection=enabled">
|
||
<branch module="pango/1.56/pango-1.56.1.tar.xz"
|
||
version="1.56.1"
|
||
hash="sha256:426be66460c98b8378573e7f6b0b2ab450f6bb6d2ec7cecc33ae81178f246480" />
|
||
<dependencies>
|
||
<dep package="glib" />
|
||
<dep package="cairo" />
|
||
| @@ -314,9 +317,9 @@ | ||
<meson id="gtk-4"
|
||
mesonargs="-Dx11-backend=false -Dmedia-gstreamer=disabled -Dintrospection=enabled">
|
||
<branch module="gtk/4.14/gtk-4.14.4.tar.xz"
|
||
version="4.14.4"
|
||
hash="sha256:443518b97e8348f9f6430ac435b1010f9a6c5207f4dc6a7cd5d24e3820cee633" />
|
||
<branch module="gtk/4.16/gtk-4.16.12.tar.xz"
|
||
version="4.16.12"
|
||
hash="sha256:ef31bdbd6f082c4401634a20c850b0050c9bf252ef1e079764ee95a2a0c4c95a" />
|
||
<dependencies>
|
||
<dep package="pango" />
|
||
<dep package="atk" />
|
||
| Original line number | Diff line number | Diff line |
|---|---|---|
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)
|
||
| Original line number | Diff line number | Diff line |
|---|---|---|
--- a/meson.build 2023-03-02 14:19:55.000000000 +0100
|
||
+++ b/meson.build 2023-10-01 02:07:11.000000000 +0200
|
||
@@ -570,7 +570,6 @@
|
||
subdir('pango')
|
||
subdir('utils')
|
||
subdir('examples')
|
||
-subdir('tests')
|
||
subdir('tools')
|
||
|
||
if get_option('gtk_doc') |


























