Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / meson
Commits:
a0ba9847 by Jan Alexander Steffens (heftig) at 2024-11-21T19:04:53+01:00
1.6.0-3: Add patches for two issues
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- + fix-cmake.diff
- + fix-gir.diff
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = meson
pkgdesc = High productivity build system
pkgver = 1.6.0
- pkgrel = 2
+ pkgrel = 3
url = https://mesonbuild.com/
arch = any
license = Apache-2.0
@@ -67,6 +67,8 @@ pkgbase = meson
source = cross-lib32
source = native-clang
source = 0001-Skip-broken-tests.patch
+ source = fix-cmake.diff
+ source = fix-gir.diff
validpgpkeys = 19E2D6D9B46D8DAA6288F877C24E631BABB1FE70
b2sums =
c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893
b2sums = SKIP
@@ -76,5 +78,7 @@ pkgbase = meson
b2sums =
9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081
b2sums =
7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
b2sums =
f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54
+ b2sums =
8e75e4f6cac65cef19dade915528d05fedecf83586c482db17ebe1ed6399f1539fa74687fb7dad9747b8d2b2ca2fcfe89af049e19aedf489d34de93aec61dcbb
+ b2sums =
8f00fa21777fe012b6e3cb880b0442ba9074d90ab8a2c7b7c67e8c69e418ef0625a047f372f68c43b775f95c36f9119d6997fd337f2296b036e89e306346abbd
pkgname = meson
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=meson
pkgver=1.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="High productivity build system"
url="https://mesonbuild.com/";
arch=(any)
@@ -77,6 +77,8 @@ source=(
cross-lib32
native-clang
0001-Skip-broken-tests.patch
+ fix-cmake.diff
+ fix-gir.diff
)
b2sums=('c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893'
'SKIP'
@@ -85,7 +87,9 @@
b2sums=('c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc
'70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af'
'9b16477aa77a706492e26fb3ad42e90674b8f0dfe657dd3bd9ba044f921be12ceabeb0050a50a15caee4d999e1ec33ed857bd3bed9e4444d73bb4a4f06381081'
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
-
'f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54')
+
'f23df4324b30b81f1756a9b443dd35185c4e8717b31fafcd2479071b6f38a8ee0776e97a3cd21a7921a6da892685a45632f6f8282007123b2dd5745492768f54'
+
'8e75e4f6cac65cef19dade915528d05fedecf83586c482db17ebe1ed6399f1539fa74687fb7dad9747b8d2b2ca2fcfe89af049e19aedf489d34de93aec61dcbb'
+
'8f00fa21777fe012b6e3cb880b0442ba9074d90ab8a2c7b7c67e8c69e418ef0625a047f372f68c43b775f95c36f9119d6997fd337f2296b036e89e306346abbd')
validpgpkeys=(
19E2D6D9B46D8DAA6288F877C24E631BABB1FE70 # Jussi Pakkanen
<[email protected]>
)
@@ -95,6 +99,14 @@ prepare() {
# Pass tests
patch -Np1 -i ../0001-Skip-broken-tests.patch
+
+ # Unbreak CMake
+ # https://github.com/mesonbuild/meson/issues/13888
+ patch -Np1 -i ../fix-cmake.diff
+
+ # Unbreak GIR
+ # https://github.com/mesonbuild/meson/issues/13850
+ patch -Np1 -i ../fix-gir.diff
}
build() {
=====================================
fix-cmake.diff
=====================================
@@ -0,0 +1,15 @@
+ mesonbuild/cmake/interpreter.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git c/mesonbuild/cmake/interpreter.py i/mesonbuild/cmake/interpreter.py
+index fafee86ab..12d7049d2 100644
+--- c/mesonbuild/cmake/interpreter.py
++++ i/mesonbuild/cmake/interpreter.py
+@@ -828,6 +828,7 @@ class CMakeInterpreter:
+
+ cmake_args = []
+ cmake_args += cmake_get_generator_args(self.env)
++ cmake_args += ['-DCMAKE_LINK_DEPENDS_USE_LINKER=FALSE']
+ cmake_args += [f'-DCMAKE_INSTALL_PREFIX={self.install_prefix}']
+ cmake_args += extra_cmake_options
+ if not any(arg.startswith('-DCMAKE_BUILD_TYPE=') for arg in
cmake_args):
=====================================
fix-gir.diff
=====================================
@@ -0,0 +1,17 @@
+ mesonbuild/modules/gnome.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git c/mesonbuild/modules/gnome.py i/mesonbuild/modules/gnome.py
+index e0c1214d0..5a7160d60 100644
+--- c/mesonbuild/modules/gnome.py
++++ i/mesonbuild/modules/gnome.py
+@@ -667,6 +667,9 @@ class GnomeModule(ExtensionModule):
+ assert isinstance(girdir, str), 'for mypy'
+ gi_includes.update([girdir])
+ if isinstance(dep, InternalDependency):
++ # Ensure BothLibraries are resolved
++ dep = dep.get_as_shared(recursive=True)
++
+ cflags.update(dep.get_compile_args())
+ cflags.update(state.get_include_args(dep.include_directories))
+ for lib in dep.libraries:
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/a0ba9847d144a8ac22b1ae82f8b291f93ddd8770
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/a0ba9847d144a8ac22b1ae82f8b291f93ddd8770
You're receiving this email because of your account on gitlab.archlinux.org.
