From cb32bb23a7a9192c7cf6c97dd109a1e9e083e9b0e785ccf11d92c59caa262bb8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 Jan 2019 11:23:01 +0000 Subject: [PATCH] - Add meson-no-lrelease.patch: Don't require lrelease for qt. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=124 --- meson-no-lrelease.patch | 26 ++++++++++++++++++++++++++ meson.changes | 5 +++++ meson.spec | 4 ++++ 3 files changed, 35 insertions(+) create mode 100644 meson-no-lrelease.patch diff --git a/meson-no-lrelease.patch b/meson-no-lrelease.patch new file mode 100644 index 0000000..3aa8b3f --- /dev/null +++ b/meson-no-lrelease.patch @@ -0,0 +1,26 @@ +From 391878e83aef4c2ba43e69c4850bbc84f409783e Mon Sep 17 00:00:00 2001 +From: Dylan Baker +Date: Tue, 18 Dec 2018 14:13:05 -0800 +Subject: [PATCH] dependencies/ui: Don't require lrelease for qt + +We previously didn't require it so we shouldn't silently start doing so. + +Fixes #4654 +--- + mesonbuild/dependencies/ui.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py +index e8fba91a23..1f65c3b86f 100644 +--- a/mesonbuild/dependencies/ui.py ++++ b/mesonbuild/dependencies/ui.py +@@ -243,7 +243,7 @@ def gen_bins(): + if self.bindir: + yield os.path.join(self.bindir, b), b, False + yield '{}-{}'.format(b, self.name), b, False +- yield b, b, self.required ++ yield b, b, self.required if b != 'lrelease' else False + + for b, name, required in gen_bins(): + if found[name].found(): + diff --git a/meson.changes b/meson.changes index 8185a82..51033c5 100644 --- a/meson.changes +++ b/meson.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 16 11:20:15 UTC 2019 - Dominique Leuenberger + +- Add meson-no-lrelease.patch: Don't require lrelease for qt. + ------------------------------------------------------------------- Wed Jan 9 14:00:46 UTC 2019 - Tomáš Chvátal diff --git a/meson.spec b/meson.spec index 9cb80e5..e6fac3e 100644 --- a/meson.spec +++ b/meson.spec @@ -47,7 +47,10 @@ Patch2: meson-restore-python3.4.patch Patch3: meson-suse-fix-llvm-3.8.patch # PATCH-FIX-OPENSUSE meson-fix-gcc48.patch sor.alexei@meowr.ru -- Fix GCC 4.8 handling for openSUSE Leap 42.x. Patch4: meson-fix-gcc48.patch +# PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools Patch5: meson-distutils.patch +# PATCH-FIX-UPSTREAM meson-no-lrelease.patch dimstar@opensuse.org -- Don't require lrelease for qt +Patch6: meson-no-lrelease.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -159,6 +162,7 @@ This package provides support for meson.build files in Vim. %if !%{with setuptools} %patch5 -p1 %endif +%patch6 -p1 # Remove static boost tests from "test cases/frameworks/1 boost/". sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build