Tag: patch
Attaching debdiff for NMU fixing this.
diff -Nru meson-0.55.0/debian/changelog meson-0.55.0/debian/changelog --- meson-0.55.0/debian/changelog 2020-07-16 18:19:52.000000000 +0200 +++ meson-0.55.0/debian/changelog 2020-08-20 02:51:42.000000000 +0200 @@ -1,3 +1,9 @@ +meson (0.55.0-2.1) UNRELEASED; urgency=medium + + * Fix test with setuptools 49. Closes: #966923 + + -- Marco Trevisan (Treviño) <ma...@ubuntu.com> Thu, 20 Aug 2020 02:51:42 +0200 + meson (0.55.0-2) unstable; urgency=medium * Fix crossbuild test from Gianfranco Costamagna. Closes: #963546 diff -Nru meson-0.55.0/debian/patches/fix-setuptools-49-test.patch meson-0.55.0/debian/patches/fix-setuptools-49-test.patch --- meson-0.55.0/debian/patches/fix-setuptools-49-test.patch 1970-01-01 01:00:00.000000000 +0100 +++ meson-0.55.0/debian/patches/fix-setuptools-49-test.patch 2020-08-20 02:51:42.000000000 +0200 @@ -0,0 +1,27 @@ +From d3fe172acd856a1fece3b12c600b07df13677ad9 Mon Sep 17 00:00:00 2001 +From: Daniel Mensinger <dan...@mensinger-ka.de> +Date: Fri, 17 Jul 2020 18:17:47 +0200 +Subject: [PATCH] Fix setuptools 49 test. (fixes #7452) + +Origin: https://github.com/mesonbuild/meson/commit/d3fe172acd856a1fece3 +Applied-Upstream: 0.55.1 + +--- + run_meson_command_tests.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/run_meson_command_tests.py b/run_meson_command_tests.py +index 6ed3d8f8db..7bc6185f1a 100755 +--- a/run_meson_command_tests.py ++++ b/run_meson_command_tests.py +@@ -129,6 +129,10 @@ def test_meson_installed(self): + os.environ['PYTHONPATH'] = os.path.join(str(pylibdir), '') + os.environ['PATH'] = str(bindir) + os.pathsep + os.environ['PATH'] + self._run(python_command + ['setup.py', 'install', '--prefix', str(prefix)]) ++ # Fix importlib-metadata by appending all dirs in pylibdir ++ PYTHONPATHS = [pylibdir] + [x for x in pylibdir.iterdir()] ++ PYTHONPATHS = [os.path.join(str(x), '') for x in PYTHONPATHS] ++ os.environ['PYTHONPATH'] = os.pathsep.join(PYTHONPATHS) + # Check that all the files were installed correctly + self.assertTrue(bindir.is_dir()) + self.assertTrue(pylibdir.is_dir()) diff -Nru meson-0.55.0/debian/patches/series meson-0.55.0/debian/patches/series --- meson-0.55.0/debian/patches/series 2020-07-12 16:29:07.000000000 +0200 +++ meson-0.55.0/debian/patches/series 2020-08-20 02:51:42.000000000 +0200 @@ -1,2 +1,3 @@ +fix-setuptools-49-test.patch 1-disable-openmpi.patch 2-disable-rootdir-test.patch
