From b474b008f215dc3bcd1ed3fc164e47f606d783d5 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 15 Sep 2020 18:51:00 +0000 Subject: Tue Sep 15 18:51:00 UTC 2020 a/libgudev-234-x86_64-1.txz: Upgraded. ap/htop-3.0.2-x86_64-1.txz: Upgraded. l/glib2-2.66.0-x86_64-2.txz: Rebuilt. Build against system gtk-doc and don't bundle a newer version. You'll need to reinstall the linuxdoc-tools package to restore the correct version of gtk-doc. Thanks to chrisVV. l/mozjs68-68.11.0esr-x86_64-2.txz: Removed. l/mozjs78-78.2.0esr-x86_64-1.txz: Added. This is needed by the new version of polkit. l/polkit-0.118-x86_64-1.txz: Upgraded. This requires the new mozjs78 package. x/libva-2.9.0-x86_64-1.txz: Upgraded. x/libva-utils-2.9.0-x86_64-1.txz: Upgraded. --- source/l/mozjs78/patches/emitter.patch | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 source/l/mozjs78/patches/emitter.patch (limited to 'source/l/mozjs78/patches/emitter.patch') diff --git a/source/l/mozjs78/patches/emitter.patch b/source/l/mozjs78/patches/emitter.patch new file mode 100644 index 000000000..15e752ba7 --- /dev/null +++ b/source/l/mozjs78/patches/emitter.patch @@ -0,0 +1,61 @@ +From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:39:47 +0200 +Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir + +--- + python/mozbuild/mozbuild/frontend/emitter.py | 6 ------ + .../mozbuild/test/frontend/test_emitter.py | 20 ------------------- + 2 files changed, 26 deletions(-) + +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 8d5ab8e..65c43ff 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin): + 'is a filename, but a directory is required: %s ' + '(resolved to %s)' % (local_include, full_path), + context) +- if (full_path == context.config.topsrcdir or +- full_path == context.config.topobjdir): +- raise SandboxValidationError( +- 'Path specified in LOCAL_INCLUDES ' +- '(%s) resolves to the topsrcdir or topobjdir (%s), which is ' +- 'not allowed' % (local_include, full_path), context) + include_obj = LocalInclude(context, local_include) + local_includes.append(include_obj.path.full_path) + yield include_obj +diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +index e8cbd81..d45ccee 100644 +--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py ++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +@@ -1040,26 +1040,6 @@ class TestEmitterBasic(unittest.TestCase): + + self.assertEqual(local_includes, expected) + +- def test_local_includes_invalid(self): +- """Test that invalid LOCAL_INCLUDES are properly detected.""" +- reader = self.reader('local_includes-invalid/srcdir') +- +- with six.assertRaisesRegex( +- self, +- SandboxValidationError, +- 'Path specified in LOCAL_INCLUDES.*resolves to the ' +- 'topsrcdir or topobjdir'): +- self.read_topsrcdir(reader) +- +- reader = self.reader('local_includes-invalid/objdir') +- +- with six.assertRaisesRegex( +- self, +- SandboxValidationError, +- 'Path specified in LOCAL_INCLUDES.*resolves to the ' +- 'topsrcdir or topobjdir'): +- self.read_topsrcdir(reader) +- + def test_local_includes_file(self): + """Test that a filename can't be used in LOCAL_INCLUDES.""" + reader = self.reader('local_includes-filename') +-- +2.26.2 + -- cgit v1.2.3