From fd417a42ad2a2dfe0477c1d072f4926a9cd20e74 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Sep 2022 18:58:40 +0200 Subject: [PATCH 01/46] New package: mozjs102-102.3.0 --- common/shlibs | 1 + srcpkgs/mozjs102-devel | 1 + srcpkgs/mozjs102/patches/001-fix-soname.patch | 26 +++++ .../mozjs102/patches/002-copy-headers.patch | 38 +++++++ .../mozjs102/patches/003-tests-timeout.patch | 26 +++++ .../004-icu-sources-data-py-decouple.patch | 29 ++++++ ...cu-sources-data-write-command-stderr.patch | 44 +++++++++ srcpkgs/mozjs102/patches/006-emitter.patch | 67 +++++++++++++ ...-tests-use-native-temporarydirectory.patch | 66 +++++++++++++ srcpkgs/mozjs102/patches/008-init-patch.patch | 28 ++++++ .../patches/009-sloppy-m4-detection.patch | 29 ++++++ .../011-failing-tests-ppc64-s390x.patch | 36 +++++++ srcpkgs/mozjs102/patches/012-fix-musl.patch | 21 ++++ .../013-disable-spidermonkey-jslint.patch | 26 +++++ .../mozjs102/patches/014-rust-target.patch | 28 ++++++ .../patches/015-drop-rustc-validation.patch | 80 +++++++++++++++ .../mozjs102/patches/017-no-lto-readelf.patch | 35 +++++++ .../mozjs102/patches/MOZ_NO_RUST_LTO.patch | 18 ++++ .../mozjs102/patches/fix-build-ppc32.patch | 18 ++++ .../mozjs102/patches/fix-i386-fdlibm.patch | 18 ++++ ...-fallback-atomic-operations-on-armv6.patch | 79 +++++++++++++++ srcpkgs/mozjs102/template | 99 +++++++++++++++++++ srcpkgs/mozjs102/update | 2 + 23 files changed, 815 insertions(+) create mode 120000 srcpkgs/mozjs102-devel create mode 100644 srcpkgs/mozjs102/patches/001-fix-soname.patch create mode 100644 srcpkgs/mozjs102/patches/002-copy-headers.patch create mode 100644 srcpkgs/mozjs102/patches/003-tests-timeout.patch create mode 100644 srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch create mode 100644 srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch create mode 100644 srcpkgs/mozjs102/patches/006-emitter.patch create mode 100644 srcpkgs/mozjs102/patches/007-tests-use-native-temporarydirectory.patch create mode 100644 srcpkgs/mozjs102/patches/008-init-patch.patch create mode 100644 srcpkgs/mozjs102/patches/009-sloppy-m4-detection.patch create mode 100644 srcpkgs/mozjs102/patches/011-failing-tests-ppc64-s390x.patch create mode 100644 srcpkgs/mozjs102/patches/012-fix-musl.patch create mode 100644 srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch create mode 100644 srcpkgs/mozjs102/patches/014-rust-target.patch create mode 100644 srcpkgs/mozjs102/patches/015-drop-rustc-validation.patch create mode 100644 srcpkgs/mozjs102/patches/017-no-lto-readelf.patch create mode 100644 srcpkgs/mozjs102/patches/MOZ_NO_RUST_LTO.patch create mode 100644 srcpkgs/mozjs102/patches/fix-build-ppc32.patch create mode 100644 srcpkgs/mozjs102/patches/fix-i386-fdlibm.patch create mode 100644 srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch create mode 100644 srcpkgs/mozjs102/template create mode 100644 srcpkgs/mozjs102/update diff --git a/common/shlibs b/common/shlibs index 987cff25f1466..bb401b2dc856d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3476,6 +3476,7 @@ libmaxminddb.so.0 libmaxminddb-1.3.2_1 libmysqlpp.so.3 mysql++-3.2.5_1 libKF5Syndication.so.5 syndication-5.50.0_1 liblqr-1.so.0 liblqr-0.4.2_1 +libmozjs-102.so.0 mozjs102-102.3.0_1 libmozjs-78.so.0 mozjs78-78.1.0_1 libmozjs-91.so.0 mozjs91-91.5.0_1 libebur128.so.1 libebur128-1.2.4_1 diff --git a/srcpkgs/mozjs102-devel b/srcpkgs/mozjs102-devel new file mode 120000 index 0000000000000..97b7e735a4724 --- /dev/null +++ b/srcpkgs/mozjs102-devel @@ -0,0 +1 @@ +mozjs102 \ No newline at end of file diff --git a/srcpkgs/mozjs102/patches/001-fix-soname.patch b/srcpkgs/mozjs102/patches/001-fix-soname.patch new file mode 100644 index 0000000000000..a319d9e975ef9 --- /dev/null +++ b/srcpkgs/mozjs102/patches/001-fix-soname.patch @@ -0,0 +1,26 @@ +From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:21:47 +0200 +Subject: [PATCH] Add soname switch to linker, regardless of Operating System + +Fix backported from Debian: http://bugs.debian.org/746705 +--- + config/rules.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config/rules.mk b/config/rules.mk +index 0f9b2ac..f6b4efe 100644 +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -285,6 +285,8 @@ ifeq ($(OS_ARCH),GNU) + OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 + endif + ++EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 ++ + # + # MINGW32 + # +-- +2.31.1 + diff --git a/srcpkgs/mozjs102/patches/002-copy-headers.patch b/srcpkgs/mozjs102/patches/002-copy-headers.patch new file mode 100644 index 0000000000000..aafe1aa84bd34 --- /dev/null +++ b/srcpkgs/mozjs102/patches/002-copy-headers.patch @@ -0,0 +1,38 @@ +From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:27:39 +0200 +Subject: [PATCH] build: Copy headers on install instead of symlinking + +Patch by Philip Chimento ported forward to mozjs78 +--- + python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py +index d964466..0285ad9 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -1568,9 +1568,9 @@ class RecursiveMakeBackend(MakeBackend): + " of srcdir-relative or absolute paths." + ) + +- install_manifest.add_pattern_link(basepath, wild, dest_dir) ++ install_manifest.add_pattern_copy(basepath, wild, dest_dir) + else: +- install_manifest.add_pattern_link(f.srcdir, f, dest_dir) ++ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir) + elif isinstance(f, AbsolutePath): + if not f.full_path.lower().endswith((".dll", ".pdb", ".so")): + raise Exception( +@@ -1581,7 +1581,7 @@ class RecursiveMakeBackend(MakeBackend): + install_manifest.add_optional_exists(dest_file) + absolute_files.append(f.full_path) + else: +- install_manifest.add_link(f.full_path, dest_file) ++ install_manifest.add_copy(f.full_path, dest_file) + else: + install_manifest.add_optional_exists(dest_file) + objdir_files.append(self._pretty_path(f, backend_file)) +-- +2.31.1 + diff --git a/srcpkgs/mozjs102/patches/003-tests-timeout.patch b/srcpkgs/mozjs102/patches/003-tests-timeout.patch new file mode 100644 index 0000000000000..c86cca403deb0 --- /dev/null +++ b/srcpkgs/mozjs102/patches/003-tests-timeout.patch @@ -0,0 +1,26 @@ +From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:32:44 +0200 +Subject: [PATCH] Increase the test timeout for slower buildds + +Ported forward from Debian: https://bugs.debian.org/878284 +--- + js/src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index b86aeed..d68655a 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -53,7 +53,7 @@ check:: check-js-msg + + check-jstests: + $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \ +- --no-progress --format=automation --timeout 300 \ ++ --no-progress --format=automation --timeout 600 \ + $(JSTESTS_EXTRA_ARGS) \ + $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX) + +-- +2.26.2 + diff --git a/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch new file mode 100644 index 0000000000000..8572c21fd4ec2 --- /dev/null +++ b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch @@ -0,0 +1,29 @@ +From: Simon McVittie +Date: Mon, 9 Oct 2017 09:22:12 +0100 +Subject: icu_sources_data.py: Decouple from Mozilla build system + +mozpack.path is a wrapper around os.path that normalizes path +separators on Windows, but on Unix we only have one path separator +so there's nothing to normalize. Avoid needing to import all of it. +--- + intl/icu_sources_data.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 2936df9..4db52af 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -21,7 +21,9 @@ import subprocess + import sys + import tempfile + +-from mozpack import path as mozpath ++# Close enough ++import os.path as mozpath ++mozpath.normsep = lambda p: p + + # The following files have been determined to be dead/unused by a + # semi-automated analysis. You can just remove any of the files below +-- +2.31.1 + diff --git a/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch new file mode 100644 index 0000000000000..84684250ce4c7 --- /dev/null +++ b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch @@ -0,0 +1,44 @@ +From: Simon McVittie +Date: Mon, 9 Oct 2017 09:23:14 +0100 +Subject: icu_sources_data: Write command output to our stderr + +Saying "See output in /tmp/foobar" is all very well for a developer +build, but on a buildd our /tmp is going to get thrown away after +the build. Just log the usual way instead. +--- + intl/icu_sources_data.py | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 4db52af..d62960d 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -188,21 +188,13 @@ def update_sources(topsrcdir): + + def try_run(name, command, cwd=None, **kwargs): + try: +- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f: +- subprocess.check_call( +- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs +- ) +- except subprocess.CalledProcessError: +- print( +- """Error running "{}" in directory {} +- See output in {}""".format( +- " ".join(command), cwd, f.name +- ), +- file=sys.stderr, ++ subprocess.check_call( ++ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs + ) ++ except subprocess.CalledProcessError: ++ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr) + return False + else: +- os.unlink(f.name) + return True + + +-- +2.31.1 + diff --git a/srcpkgs/mozjs102/patches/006-emitter.patch b/srcpkgs/mozjs102/patches/006-emitter.patch new file mode 100644 index 0000000000000..556bebd257caa --- /dev/null +++ b/srcpkgs/mozjs102/patches/006-emitter.patch @@ -0,0 +1,67 @@ +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 | 10 --------- + .../mozbuild/test/frontend/test_emitter.py | 22 ------------------- + 2 files changed, 32 deletions(-) + +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 44b916e..f2e821d 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -1367,16 +1367,6 @@ class TreeMetadataEmitter(LoggingMixin): + "(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 e53bc5e..c1b9d32 100644 +--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py ++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +@@ -1098,28 +1098,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.31.1 + diff --git a/srcpkgs/mozjs102/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs102/patches/007-tests-use-native-temporarydirectory.patch new file mode 100644 index 0000000000000..054685c1eee2b --- /dev/null +++ b/srcpkgs/mozjs102/patches/007-tests-use-native-temporarydirectory.patch @@ -0,0 +1,66 @@ +From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Tue, 10 Aug 2021 00:00:50 +0200 +Subject: [PATCH] Tests: Use native TemporaryDirectory + +Without ugly wrapper for Py < 3.2 that doesn't work half of the times... +--- + js/src/jit-test/jit_test.py | 2 +- + js/src/tests/jstests.py | 2 +- + js/src/tests/lib/tempfile.py | 17 +---------------- + 3 files changed, 3 insertions(+), 18 deletions(-) + +diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py +index f5d7794..8d443aa 100755 +--- a/js/src/jit-test/jit_test.py ++++ b/js/src/jit-test/jit_test.py +@@ -38,7 +38,7 @@ from lib.tests import ( + get_environment_overlay, + change_env, + ) +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + + + def which(name): +diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py +index 6fa2f5f..53ceff6 100755 +--- a/js/src/tests/jstests.py ++++ b/js/src/tests/jstests.py +@@ -37,7 +37,7 @@ from lib.tests import ( + from lib.results import ResultsSink, TestOutput + from lib.progressbar import ProgressBar + from lib.adaptor import xdr_annotate +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + + if sys.platform.startswith("linux") or sys.platform.startswith("darwin"): + from lib.tasks_unix import run_all_tests +diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py +index ecc21c9..f0a1fa3 100644 +--- a/js/src/tests/lib/tempfile.py ++++ b/js/src/tests/lib/tempfile.py +@@ -2,19 +2,4 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + from __future__ import absolute_import +- +-try: +- # Python 3.2 +- from tempfile import TemporaryDirectory +-except ImportError: +- import tempfile +- import shutil +- from contextlib import contextmanager +- +- @contextmanager +- def TemporaryDirectory(*args, **kwds): +- d = tempfile.mkdtemp(*args, **kwds) +- try: +- yield d +- finally: +- shutil.rmtree(d) ++from tempfile import TemporaryDirectory +-- +2.31.1 + diff --git a/srcpkgs/mozjs102/patches/008-init-patch.patch b/srcpkgs/mozjs102/patches/008-init-patch.patch new file mode 100644 index 0000000000000..1954a55bf3691 --- /dev/null +++ b/srcpkgs/mozjs102/patches/008-init-patch.patch @@ -0,0 +1,28 @@ +From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 9 Aug 2021 14:38:58 +0200 +Subject: [PATCH] Don't throw InvalidOptionError on invalid options + +--- + python/mozbuild/mozbuild/configure/__init__.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py +index f3167f6..c9e1132 100644 +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -553,10 +553,7 @@ class ConfigureSandbox(dict): + for arg in self._helper: + without_value = arg.split("=", 1)[0] + msg = "Unknown option: %s" % without_value +- if self._help: +- self._logger.warning(msg) +- else: +- raise InvalidOptionError(msg) ++ self._logger.warning(msg) + + # Run the execution queue + for func, args in self._execution_queue: +-- +2.31.1 + diff --git a/srcpkgs/mozjs102/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs102/patches/009-sloppy-m4-detection.patch new file mode 100644 index 0000000000000..10b8b16ea7dc9 --- /dev/null +++ b/srcpkgs/mozjs102/patches/009-sloppy-m4-detection.patch @@ -0,0 +1,29 @@ +From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 9 Aug 2021 16:15:37 +0200 +Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf + +--- + build/autoconf/autoconf.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh +index ceb8a25..606c74e 100644 +--- a/build/autoconf/autoconf.sh ++++ b/build/autoconf/autoconf.sh +@@ -114,12 +114,6 @@ fi + + # Use the frozen version of Autoconf if available. + r= f= +-# Some non-GNU m4's don't reject the --help option, so give them /dev/null. +-case `$M4 --help < /dev/null 2>&1` in +-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; +-*traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; +-esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || + { rm -f $tmpin $tmpout; exit 2; } +-- +2.31.1 + diff --git a/srcpkgs/mozjs102/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs102/patches/011-failing-tests-ppc64-s390x.patch new file mode 100644 index 0000000000000..5c286647325cf --- /dev/null +++ b/srcpkgs/mozjs102/patches/011-failing-tests-ppc64-s390x.patch @@ -0,0 +1,36 @@ +From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 3 Aug 2020 10:27:00 +0200 +Subject: [PATCH] Skip failing tests on ppc64 and s390x + +ppc64 and s390x: non262/extensions/clone-errors.js +s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js +s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js +--- + js/src/tests/jstests.list | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list +index 73ce42f..1797646 100644 +--- a/js/src/tests/jstests.list ++++ b/js/src/tests/jstests.list +@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list + skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list + skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list + ++# Crashes on s390x and ppc64, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js ++ ++# Crashes on s390x, ppc64, aarch64 ++skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js ++ ++# Crashes on s390x, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js ++ + ##################################### + # Test262 tests disabled on browser # + ##################################### +-- +2.31.1 + + diff --git a/srcpkgs/mozjs102/patches/012-fix-musl.patch b/srcpkgs/mozjs102/patches/012-fix-musl.patch new file mode 100644 index 0000000000000..814912633217e --- /dev/null +++ b/srcpkgs/mozjs102/patches/012-fix-musl.patch @@ -0,0 +1,21 @@ +commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017 +Author: Daniel Kolesa +Date: Sun Jan 23 21:06:47 2022 +0100 + + fix musl miscompilation + + https://github.com/void-linux/void-packages/issues/2598 + +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 77652f67..ab5e917b 100644 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then + mips*-*) + : + ;; +- *-android*|*-linuxandroid*) ++ *-android*|*-linuxandroid*|*-musl*) + : + ;; + *) diff --git a/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch new file mode 100644 index 0000000000000..93e8c83f9337a --- /dev/null +++ b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch @@ -0,0 +1,26 @@ +commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c +Author: Daniel Kolesa +Date: Sun Jan 23 21:09:42 2022 +0100 + + disable spidermonkey jslint + +diff --git a/js/src/build/moz.build b/js/src/build/moz.build +index 55c66b97..243f7db2 100644 +--- a/js/src/build/moz.build ++++ b/js/src/build/moz.build +@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True + + DIST_INSTALL = True + +-# Run SpiderMonkey style checker after linking the static library. This avoids +-# running the script for no-op builds. +-GeneratedFile( +- "spidermonkey_checks", +- script="/config/run_spidermonkey_checks.py", +- inputs=[ +- "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]), +- "/config/check_spidermonkey_style.py", +- "/config/check_macroassembler_style.py", +- "/config/check_js_opcode.py", +- ], +-) diff --git a/srcpkgs/mozjs102/patches/014-rust-target.patch b/srcpkgs/mozjs102/patches/014-rust-target.patch new file mode 100644 index 0000000000000..4d8918a2a54c5 --- /dev/null +++ b/srcpkgs/mozjs102/patches/014-rust-target.patch @@ -0,0 +1,28 @@ +commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5 +Author: Daniel Kolesa +Date: Sun Jan 23 21:13:38 2022 +0100 + + bypass rust triplet checks and just force ours + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index cd77d72b..0c03cab7 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -261,7 +261,7 @@ def rust_supported_targets(rustc): + data.setdefault(key, []).append(namespace(rust_target=t, target=info)) + return data + +- ++@imports("os") + def detect_rustc_target( + host_or_target, compiler_info, arm_target, rust_supported_targets + ): +@@ -383,7 +383,7 @@ def detect_rustc_target( + + return None + +- rustc_target = find_candidate(candidates) ++ rustc_target = os.environ["RUST_TARGET"] + + if rustc_target is None: + die("Don't know how to translate {} for rustc".format(host_or_target.alias)) diff --git a/srcpkgs/mozjs102/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs102/patches/015-drop-rustc-validation.patch new file mode 100644 index 0000000000000..e2b340cd060e4 --- /dev/null +++ b/srcpkgs/mozjs102/patches/015-drop-rustc-validation.patch @@ -0,0 +1,80 @@ +drop some rust compiler validation + +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name): + return unwrap + + +-rustc = unwrap_rustup(rustc, "rustc") +-cargo = unwrap_rustup(cargo, "cargo") +- + + set_config("CARGO", cargo) + set_config("RUSTC", rustc) +@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): + + os.write(in_fd, ensure_binary(source)) + os.close(in_fd) +- +- cmd = [ +- rustc, +- "--crate-type", +- "staticlib", +- target_arg, +- "-o", +- out_path, +- in_path, +- ] +- +- def failed(): +- die( +- dedent( +- """\ +- Cannot compile for {} with {} +- The target may be unsupported, or you may not have +- a rust std library for that target installed. Try: +- +- rustup target add {} +- """.format( +- host_or_target.alias, rustc, rustc_target +- ) +- ) +- ) +- +- check_cmd_output(*cmd, onerror=failed) +- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: +- failed() + finally: + os.remove(in_path) + os.remove(out_path) +@@ -462,29 +430,6 @@ def rust_host_triple( + rustc_target = detect_rustc_target( + host, compiler_info, arm_target, rust_supported_targets + ) +- if rustc_target != rustc_host: +- if host.alias == rustc_target: +- configure_host = host.alias +- else: +- configure_host = "{}/{}".format(host.alias, rustc_target) +- die( +- dedent( +- """\ +- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}). +- +- You can solve this by: +- * Set your configure host to match the rust compiler host by editing your +- mozconfig and adding "ac_add_options --host={rustc}". +- * Or, install the rust toolchain for {configure}, if supported, by running +- "rustup default stable-{rustc_target}" +- """.format( +- rustc=rustc_host, +- configure=configure_host, +- rustc_target=rustc_target, +- ) +- ) +- ) +- assert_rust_compile(host, rustc_target, rustc) + return rustc_target + + diff --git a/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch new file mode 100644 index 0000000000000..24075c591ff4a --- /dev/null +++ b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch @@ -0,0 +1,35 @@ +commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6 +Author: Daniel Kolesa +Date: Sun Jan 23 21:55:43 2022 +0100 + + drop some library checks + + This calls readelf and won't work with LTO'd setups. + +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +index 401c2933..ade4f1da 100644 +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -405,22 +405,6 @@ force-cargo-library-build: + $(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags) + + $(RUST_LIBRARY_FILE): force-cargo-library-build +-# When we are building in --enable-release mode; we add an additional check to confirm +-# that we are not importing any networking-related functions in rust code. This reduces +-# the chance of proxy bypasses originating from rust code. +-# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS. +-# Sanitizers and sancov also fail because compiler-rt hooks network functions. +-ifndef MOZ_PROFILE_GENERATE +-ifeq ($(OS_ARCH), Linux) +-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) +-ifndef MOZ_LTO_RUST_CROSS +-ifneq (,$(filter -Clto,$(cargo_rustc_flags))) +- $(call py_action,check_binary,--target --networking $@) +-endif +-endif +-endif +-endif +-endif + + force-cargo-library-check: + $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) diff --git a/srcpkgs/mozjs102/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs102/patches/MOZ_NO_RUST_LTO.patch new file mode 100644 index 0000000000000..4a9b0b42a5752 --- /dev/null +++ b/srcpkgs/mozjs102/patches/MOZ_NO_RUST_LTO.patch @@ -0,0 +1,18 @@ +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -64,6 +64,7 @@ endif + # These flags are passed via `cargo rustc` and only apply to the final rustc + # invocation (i.e., only the top-level crate, not its dependencies). + cargo_rustc_flags = $(CARGO_RUSTCFLAGS) ++ifneq (1,$(MOZ_NO_RUST_LTO)) + ifndef DEVELOPER_OPTIONS + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds, but not when linking +@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes + endif + endif + endif ++endif + + ifdef CARGO_INCREMENTAL + export CARGO_INCREMENTAL diff --git a/srcpkgs/mozjs102/patches/fix-build-ppc32.patch b/srcpkgs/mozjs102/patches/fix-build-ppc32.patch new file mode 100644 index 0000000000000..f9f8e0cd7acec --- /dev/null +++ b/srcpkgs/mozjs102/patches/fix-build-ppc32.patch @@ -0,0 +1,18 @@ +From 62780b31095fcd37a5d9218d0393d552bc44149f Mon Sep 17 00:00:00 2001 +From: q66 +Date: Mon Jun 13 14:01:59 2022 +0200 +Subject: fix ftbfs on powerpc32 + +diff --git a/js/src/wasm/WasmDebugFrame.h b/js/src/wasm/WasmDebugFrame.h +index 47652e9..02a13559 100644 +--- a/js/src/wasm/WasmDebugFrame.h ++++ b/js/src/wasm/WasmDebugFrame.h +@@ -112,7 +112,7 @@ class DebugFrame { + + // Avoid -Wunused-private-field warnings. + protected: +-#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_X86) || defined(__wasi__) ++#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(__powerpc__) && !defined(__powerpc64__)) + // See alignmentStaticAsserts(). For ARM32 and X86 DebugFrame is only + // 4-byte aligned, so we add another word to get up to 8-byte + // alignment. diff --git a/srcpkgs/mozjs102/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs102/patches/fix-i386-fdlibm.patch new file mode 100644 index 0000000000000..831e5e03678d8 --- /dev/null +++ b/srcpkgs/mozjs102/patches/fix-i386-fdlibm.patch @@ -0,0 +1,18 @@ +# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double') +# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h +@@ -30,7 +30,12 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#if defined(__linux__) && defined(__i386__) ++// rely on glibc's double_t ++typedef long double __double_t; ++#else + typedef double __double_t; ++#endif + typedef __double_t double_t; + + /* diff --git a/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch new file mode 100644 index 0000000000000..5993b50d8999a --- /dev/null +++ b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch @@ -0,0 +1,79 @@ + +# HG changeset patch +# User Mike Hommey +# Date 1663626084 0 +# Node ID fc934c3360f4bd1a4b4d9dcb0a15dfbd1d6ef881 +# Parent 149d45b6a85b6394a8f6936e54333c6addc4cdc0 +Bug 1786619 - Use fallback atomic operations on ARM < v7. r=jandem + +Differential Revision: https://phabricator.services.mozilla.com/D157612 + +diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py +--- a/js/src/jit/GenerateAtomicOperations.py ++++ b/js/src/jit/GenerateAtomicOperations.py +@@ -716,17 +716,19 @@ namespace jit { + } // namespace js + + #endif // jit_AtomicOperationsGenerated_h + """ + + + def generate_atomics_header(c_out): + contents = "" +- if cpu_arch in ("x86", "x86_64", "arm", "aarch64"): ++ if cpu_arch in ("x86", "x86_64", "aarch64") or ( ++ cpu_arch == "arm" and int(buildconfig.substs["ARM_ARCH"]) >= 7 ++ ): + contents += "#define JS_HAVE_GENERATED_ATOMIC_OPS 1" + + # `fence` performs a full memory barrier. + contents += gen_seqcst("AtomicFenceSeqCst") + + contents += gen_load("AtomicLoad8SeqCst", "uint8_t", 8, True) + contents += gen_load("AtomicLoad16SeqCst", "uint16_t", 16, True) + contents += gen_load("AtomicLoad32SeqCst", "uint32_t", 32, True) +diff --git a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h +--- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h ++++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h +@@ -26,17 +26,18 @@ + #define jit_shared_AtomicOperations_feeling_lucky_gcc_h + + #include "mozilla/Assertions.h" + #include "mozilla/Types.h" + + // Explicitly exclude tier-1 platforms. + + #if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || \ +- defined(_M_IX86) || defined(__arm__) || defined(__aarch64__)) ++ defined(_M_IX86) || (defined(__arm__) && __ARM_ARCH >= 7) || \ ++ defined(__aarch64__)) + # error "Do not use on a tier-1 platform where inline assembly is available" + #endif + + #if !(defined(__clang__) || defined(__GNUC__)) + # error "This file only for gcc/Clang" + #endif + + // 64-bit atomics are not required by the JS spec, and you can compile +@@ -51,16 +52,20 @@ + defined(JS_SIMULATOR_MIPS64) || defined(JS_SIMULATOR_LOONG64) + // On some x86 (32-bit) systems this will not work because the compiler does not + // open-code 64-bit atomics. If so, try linking with -latomic. If that doesn't + // work, you're mostly on your own. + # define HAS_64BIT_ATOMICS + # define HAS_64BIT_LOCKFREE + #endif + ++#if defined(__arm__) ++# define HAS_64BIT_ATOMICS ++#endif ++ + #if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ + defined(__PPC64LE__) + # define HAS_64BIT_ATOMICS + # define HAS_64BIT_LOCKFREE + #endif + + #if defined(__riscv) && __riscv_xlen == 64 + # define HAS_64BIT_ATOMICS + diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template new file mode 100644 index 0000000000000..0140da76ddf37 --- /dev/null +++ b/srcpkgs/mozjs102/template @@ -0,0 +1,99 @@ +# Template file for 'mozjs102' +pkgname=mozjs102 +version=102.3.0 +revision=1 +wrksrc="firefox-${version}" +build_wrksrc=js/src +build_style=gnu-configure +build_helper=rust +make_check_target=check-jit-test +configure_args="--disable-jemalloc --disable-strip --disable-tests \ + --disable-optimize --disable-debug --enable-ctypes --enable-readline \ + --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \ + --with-system-nspr --with-system-zlib --enable-hardening --enable-release" +hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4 + rust cargo llvm12 clang" +makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel + zlib-devel rust-std" +checkdepends="python3" +short_desc="SpiderMonkey JavaScript interpreter and library (102.x)" +maintainer="Michal Vasilek " +license="MPL-2.0" +homepage="https://spidermonkey.dev" +distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" +checksum=308e23b6dcf964e342cf95fd0c8a386127371b620a489ae26e537d728341b55a + +LDFLAGS="-Wl,-z,stack-size=1048576" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" +fi + +if [ "$XBPS_TARGET_MACHINE" = i686 ]; then + # Disable LTO on i686, otherwise compilation of `jsrust` fails with - + # error: ran out of registers during register allocation + # LLVM ERROR: Cannot emit physreg copy instruction + # error: could not compile `jsrust` due to previous error + export MOZ_NO_RUST_LTO=1 +fi + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd" + fi + export M4=m4 + export AWK=awk + export AC_MACRODIR=../../build/autoconf + chmod 0755 ../../build/autoconf/autoconf.sh + sh ../../build/autoconf/autoconf.sh configure.in > configure + chmod 0755 configure +} + +post_install() { + # Remove unneeded static library + rm -f "${DESTDIR}"/usr/lib/*.ajs + + # it has correct soname but not the right file name + mv "${DESTDIR}"/usr/lib/libmozjs-102.so \ + "${DESTDIR}"/usr/lib/libmozjs-102.so.0 + ln -rs "${DESTDIR}"/usr/lib/libmozjs-102.so.0 \ + "${DESTDIR}"/usr/lib/libmozjs-102.so +} + +pre_check() { + if [ "$XBPS_WORDSIZE" = 32 ]; then + vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g + vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g + fi + if [ "$XBPS_TARGET_MACHINE" = i686 ]; then + export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \ + -x basic/fdlibm-for-sin-cos-tan-argument.js \ + -x gc/gcparam.js \ + -x ion/dce-with-rinstructions.js \ + -x sunspider/check-3d-cube.js \ + -x sunspider/check-3d-raytrace.js \ + -x sunspider/check-access-nbody.js \ + -x wasm/nan-semantics.js \ + -x wasm/spec/spec/float_literals.wast.js \ + -x wasm/spec/spec/float_memory.wast.js \ + -x wasm/spec/threads/float_memory.wast.js \ + " + fi + if [ "$XBPS_LIBC" = musl ]; then + export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \ + -x sunspider/check-date-format-tofte.js \ + " + fi +} + +mozjs102-devel_package() { + depends="nspr-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin/js102-config + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/mozjs102/update b/srcpkgs/mozjs102/update new file mode 100644 index 0000000000000..f942fe4f0fc95 --- /dev/null +++ b/srcpkgs/mozjs102/update @@ -0,0 +1,2 @@ +site="${MOZILLA_SITE}/firefox/releases/" +pattern="releases/\K${version%%.*}.*(?=esr/\")" From 38886165df51b53559d5978c4dbcfceced62ee9b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 01:30:26 +0200 Subject: [PATCH 02/46] gjs: update to 1.74.0. --- srcpkgs/gjs/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 682a4f72e4194..1ddc35a718fc2 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,12 +1,12 @@ # Template file for 'gjs' pkgname=gjs -version=1.72.2 +version=1.74.0 revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dprofiler=disabled -Dinstalled_tests=false" hostmakedepends="glib-devel pkg-config" -makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel" +makedepends="dbus-glib-devel mozjs102-devel readline-devel sysprof-devel" checkdepends="xvfb-run cantarell-fonts" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Enno Boland " @@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gjs" changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ddee379bdc5a7d303a5d894be2b281beb8ac54508604e7d3f20781a869da3977 +checksum=7d6418af62cc73556ab2c25b4adf67f45238ab8925888f7a57251359d4ebed1e make_check_pre="xvfb-run" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then @@ -32,7 +32,7 @@ post_install() { } gjs-devel_package() { - depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}" + depends="libgirepository-devel mozjs102-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From ab43562878e0c95d5da01a5403f86c29f4328d4d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 26 Sep 2022 23:00:57 -0700 Subject: [PATCH 03/46] webkit2gtk: update to 2.38.0. This splits webkit2gtk into 3 packages: + webkit2gtk: GTK+3 and libsoup2 + libwebkit2gtk41: GTK+3 and libsoup3 + libwebkit2gtk50: GTK4 and libsoup3 This is necessary since libsoup2 and libsoup3 cannot be used at the same time. Ideally the other packages would eventually be no longer necessary. --- common/shlibs | 4 + srcpkgs/libwebkit2gtk41 | 1 + srcpkgs/libwebkit2gtk41-devel | 1 + srcpkgs/libwebkit2gtk50 | 1 + srcpkgs/libwebkit2gtk50-devel | 1 + srcpkgs/webkit2gtk-common | 1 + .../webkit2gtk/patches/be-typedarray.patch | 60 +++++----- srcpkgs/webkit2gtk/patches/fix_armv6l.patch | 12 +- srcpkgs/webkit2gtk/patches/reproducible.patch | 8 +- srcpkgs/webkit2gtk/template | 109 ++++++++++++++++-- 10 files changed, 147 insertions(+), 51 deletions(-) create mode 120000 srcpkgs/libwebkit2gtk41 create mode 120000 srcpkgs/libwebkit2gtk41-devel create mode 120000 srcpkgs/libwebkit2gtk50 create mode 120000 srcpkgs/libwebkit2gtk50-devel create mode 120000 srcpkgs/webkit2gtk-common diff --git a/common/shlibs b/common/shlibs index bb401b2dc856d..8745fceaae00f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -540,6 +540,10 @@ libgnome-panel.so.0 gnome-panel-3.37.1_1 libuninum.so.5 libuninum-2.7_1 libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1 +libwebkit2gtk-4.1.so.0 libwebkit2gtk41-2.38.0_1 +libjavascriptcoregtk-4.1.so.0 libwebkit2gtk41-2.38.0_1 +libwebkit2gtk-5.0.so.0 libwebkit2gtk50-2.38.0_1 +libjavascriptcoregtk-5.0.so.0 libwebkit2gtk50-2.38.0_1 libgimp-2.0.so.0 libgimp-2.10.0_1 libgimpwidgets-2.0.so.0 libgimp-2.10.0_1 libgimpui-2.0.so.0 libgimp-2.10.0_1 diff --git a/srcpkgs/libwebkit2gtk41 b/srcpkgs/libwebkit2gtk41 new file mode 120000 index 0000000000000..8ae98428991bc --- /dev/null +++ b/srcpkgs/libwebkit2gtk41 @@ -0,0 +1 @@ +webkit2gtk \ No newline at end of file diff --git a/srcpkgs/libwebkit2gtk41-devel b/srcpkgs/libwebkit2gtk41-devel new file mode 120000 index 0000000000000..8ae98428991bc --- /dev/null +++ b/srcpkgs/libwebkit2gtk41-devel @@ -0,0 +1 @@ +webkit2gtk \ No newline at end of file diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkit2gtk50 new file mode 120000 index 0000000000000..8ae98428991bc --- /dev/null +++ b/srcpkgs/libwebkit2gtk50 @@ -0,0 +1 @@ +webkit2gtk \ No newline at end of file diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkit2gtk50-devel new file mode 120000 index 0000000000000..8ae98428991bc --- /dev/null +++ b/srcpkgs/libwebkit2gtk50-devel @@ -0,0 +1 @@ +webkit2gtk \ No newline at end of file diff --git a/srcpkgs/webkit2gtk-common b/srcpkgs/webkit2gtk-common new file mode 120000 index 0000000000000..8ae98428991bc --- /dev/null +++ b/srcpkgs/webkit2gtk-common @@ -0,0 +1 @@ +webkit2gtk \ No newline at end of file diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch index f21c8fb57e450..fe93c27613054 100644 --- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch +++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch @@ -165,42 +165,42 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct index df0435f6..3017563c 100644 --- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h +++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h -@@ -213,9 +213,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl - scope.assertNoExceptionExceptTermination(); +@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType RELEASE_ASSERT(!thisObject->isDetached()); -- if (std::isnan(static_cast(*targetOption))) { -+ double targetOptionLittleEndianAsDouble; + if constexpr (ViewClass::Adaptor::isFloat) { +- if (std::isnan(static_cast(*targetOption))) { ++ double targetOptionLittleEndianAsDouble; +#if CPU(BIG_ENDIAN) -+ switch (ViewClass::TypedArrayStorageType) { -+ case TypeFloat32: -+ case TypeFloat64: -+ targetOptionLittleEndianAsDouble = static_cast(*targetOption); -+ default: -+ // typed array views are commonly expected to be little endian views of the underlying data -+ targetOptionLittleEndianAsDouble = static_cast(flipBytes(*targetOption)); -+ } ++ switch (ViewClass::TypedArrayStorageType) { ++ case TypeFloat32: ++ case TypeFloat64: ++ targetOptionLittleEndianAsDouble = static_cast(*targetOption); ++ default: ++ // typed array views are commonly expected to be little endian views of the underlying data ++ targetOptionLittleEndianAsDouble = static_cast(flipBytes(*targetOption)); ++ } +#else -+ targetOptionLittleEndianAsDouble = static_cast(*targetOption); ++ targetOptionLittleEndianAsDouble = static_cast(*targetOption); +#endif + -+ if (std::isnan(targetOptionLittleEndianAsDouble)) { - for (; index < length; ++index) { -- if (std::isnan(static_cast(array[index]))) -+ double arrayElementLittleEndianAsDouble; ++ if (std::isnan(targetOptionLittleEndianAsDouble)) { + for (; index < length; ++index) { +- if (std::isnan(static_cast(array[index]))) ++ double arrayElementLittleEndianAsDouble; +#if CPU(BIG_ENDIAN) -+ switch (ViewClass::TypedArrayStorageType) { -+ case TypeFloat32: -+ case TypeFloat64: -+ arrayElementLittleEndianAsDouble = static_cast(array[index]); -+ default: -+ // typed array views are commonly expected to be little endian views of the underlying data -+ arrayElementLittleEndianAsDouble = static_cast(flipBytes(array[index])); -+ } ++ switch (ViewClass::TypedArrayStorageType) { ++ case TypeFloat32: ++ case TypeFloat64: ++ arrayElementLittleEndianAsDouble = static_cast(array[index]); ++ default: ++ // typed array views are commonly expected to be little endian views of the underlying data ++ arrayElementLittleEndianAsDouble = static_cast(flipBytes(array[index])); ++ } +#else -+ arrayElementLittleEndianAsDouble = static_cast(array[index]); ++ arrayElementLittleEndianAsDouble = static_cast(array[index]); +#endif -+ if (std::isnan(arrayElementLittleEndianAsDouble)) - return JSValue::encode(jsBoolean(true)); - } - } else { ++ if (std::isnan(arrayElementLittleEndianAsDouble)) + return JSValue::encode(jsBoolean(true)); + } + return JSValue::encode(jsBoolean(false)); diff --git a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch index 859aa9343694c..fdaf19991924b 100644 --- a/srcpkgs/webkit2gtk/patches/fix_armv6l.patch +++ b/srcpkgs/webkit2gtk/patches/fix_armv6l.patch @@ -4,9 +4,9 @@ and https://bugs.webkit.org/show_bug.cgi?id=141288 --- a/Source/JavaScriptCore/offlineasm/arm.rb 2015-07-22 14:37:57.000000000 +0200 +++ b/Source/JavaScriptCore/offlineasm/arm.rb 2015-08-08 00:31:21.011824644 +0200 -@@ -546,8 +546,16 @@ - $asm.puts "mov #{armFlippedOperands(operands)}" - end +@@ -756,8 +756,16 @@ class Instruction + armMoveImmediate(operands[0].value >> 32, operands[1]) + armMoveImmediate(operands[0].value & 0xffffffff, operands[2]) when "mvlbl" + if isARMv7 or isARMv7Traditional $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" @@ -18,6 +18,6 @@ and https://bugs.webkit.org/show_bug.cgi?id=141288 + $asm.puts ".equ #{const_label}, (#{operands[0].value})" + $asm.puts "ldr #{operands[1].armOperand}, =#{const_label}" + end - when "nop" - $asm.puts "nop" - when "bieq", "bpeq", "bbeq" + when "sxb2i" + $asm.puts "sxtb #{armFlippedOperands(operands)}" + when "sxh2i" diff --git a/srcpkgs/webkit2gtk/patches/reproducible.patch b/srcpkgs/webkit2gtk/patches/reproducible.patch index 4d0776c168403..2f3a555cbcfd4 100644 --- a/srcpkgs/webkit2gtk/patches/reproducible.patch +++ b/srcpkgs/webkit2gtk/patches/reproducible.patch @@ -21,10 +21,10 @@ diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore index be5a5d51..becb2b2f 100644 --- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm +++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm -@@ -3163,7 +3163,7 @@ sub GenerateHeader - if (%structureFlags) { - push(@headerContent, "public:\n"); - push(@headerContent, " static constexpr unsigned StructureFlags = Base::StructureFlags"); +@@ -3217,7 +3217,7 @@ sub GenerateHeader + } else { + push(@headerContent, " static constexpr unsigned StructureFlags = Base::StructureFlags"); + } - foreach my $structureFlag (sort (keys %structureFlags)) { + foreach my $structureFlag (sort (sort keys %structureFlags)) { push(@headerContent, " | " . $structureFlag); diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 618dc43ed4eeb..ba02b128b1d15 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,14 +1,13 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.36.7 +version=2.38.0 revision=1 wrksrc="webkitgtk-${version}" build_style=cmake build_helper="gir" configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc -DCMAKE_SKIP_RPATH=ON - -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON -DUSE_SOUP2=ON - -DENABLE_GTKDOC=OFF -DUSE_WPE_RENDERER=ON + -DENABLE_JOURNALD_LOG=OFF -DUSE_WOFF2=ON -DUSE_WPE_RENDERER=ON -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF) -DENABLE_JIT=$(vopt_if jit ON OFF) -DENABLE_C_LOOP=$(vopt_if jit OFF ON) @@ -20,23 +19,24 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF # Don't remove which from hostmakedepends # Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC hostmakedepends="perl python pkg-config gperf flex ruby gettext glib-devel - geoclue2 libharfbuzz which libpsl + geoclue2 libharfbuzz which libpsl gi-docgen $(vopt_if wayland 'wayland-devel libxml2-devel')" makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel - libsoup-devel libxslt-devel gnutls-devel icu-devel enchant2-devel - dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel + libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel + dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel) $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')" +depends="webkit2gtk-common" short_desc="GTK+3 port of the WebKit2 browser engine" maintainer="Orphaned " license="LGPL-2.1-or-later, BSD-2-Clause" homepage="https://webkitgtk.org/" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743 +checksum=f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd make_check=no build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser @@ -132,7 +132,30 @@ pre_configure() { esac } +post_configure() { + mkdir -p webkit2gtk-40 webkit2gtk-50 + ( + cd webkit2gtk-40 && \ + configure_args="${configure_args} -DUSE_SOUP2=ON -DENABLE_WEBDRIVER=OFF" \ + do_configure + ) + + ( + cd webkit2gtk-50 && \ + configure_args="${configure_args} -DUSE_GTK4=ON -DENABLE_WEBDRIVER=OFF" \ + do_configure + ) +} + +post_build() { + (cd webkit2gtk-40 && NINJA_STATUS="[2/3][%f/%t] " do_build) + (cd webkit2gtk-50 && NINJA_STATUS="[3/3][%f/%t] " do_build) +} + post_install() { + (cd webkit2gtk-40 && do_install) + (cd webkit2gtk-50 && do_install) + vlicense Source/WebCore/LICENSE-APPLE vlicense Source/WebCore/LICENSE-LGPL-2.1 vlicense Source/WebCore/LICENSE-LGPL-2 @@ -142,11 +165,75 @@ webkit2gtk-devel_package() { depends="gtk+3-devel libsoup-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig + vmove usr/include/webkitgtk-4.0 + vmove "usr/lib/pkgconfig/*-4.0.pc" + if [ "$build_option_gir" ]; then + vmove "usr/share/gir-1.0/*-4.0.gir" + vmove "usr/share/gtk-doc/html/*-4.0" + fi + vmove "usr/lib/*-4.0.so" + } +} + +webkit2gtk-common_package() { + short_desc+="GTK port of the WebKit2 browser engine - common files" + pkg_install() { + vmove usr/share/locale/ + vmove usr/share/licenses/ + } +} + +libwebkit2gtk41_package() { + depends="${depends}" + short_desc="GTK+3 port of the WebKit2 browser engine (soup3)" + pkg_install() { + vmove usr/bin/WebKitWebDriver + vmove usr/libexec/webkit2gtk-4.1 + vmove usr/lib/webkit2gtk-4.1 + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/*-4.1.typelib" + fi + vmove "usr/lib/*-4.1.so.*" + } +} + +libwebkit2gtk41-devel_package() { + depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}" + short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files" + pkg_install() { + vmove usr/include/webkitgtk-4.1 + vmove "usr/lib/pkgconfig/*-4.1.pc" + if [ "$build_option_gir" ]; then + vmove "usr/share/gir-1.0/*-4.1.gir" + vmove "usr/share/gtk-doc/html/*-4.1" + fi + vmove "usr/lib/*-4.1.so" + } +} + +libwebkit2gtk50_package() { + depends="${depends}" + short_desc="GTK4 port of the WebKit2 browser engine" + pkg_install() { + vmove usr/libexec/webkit2gtk-5.0 + vmove usr/lib/webkit2gtk-5.0 + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/*-5.0.typelib" + fi + vmove "usr/lib/*-5.0.so.*" + } +} + +libwebkit2gtk50-devel_package() { + depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}" + short_desc="GTK4 port of the WebKit2 browser engine - development files" + pkg_install() { + vmove usr/include/webkitgtk-5.0 + vmove "usr/lib/pkgconfig/*-5.0.pc" if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 + vmove "usr/share/gir-1.0/*-5.0.gir" + vmove "usr/share/gtk-doc/html/*-5.0" fi - vmove "usr/lib/*.so" + vmove "usr/lib/*-5.0.so" } } From 22d9276c9cc2bf2b0ecf4fae83daf3cacf710194 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 13 Sep 2022 00:03:12 +0200 Subject: [PATCH 04/46] New package: gcr4-3.92.0 * conflicts with gcr --- common/shlibs | 2 ++ srcpkgs/gcr4-devel | 1 + srcpkgs/gcr4/template | 50 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 120000 srcpkgs/gcr4-devel create mode 100644 srcpkgs/gcr4/template diff --git a/common/shlibs b/common/shlibs index 8745fceaae00f..cf920efda7e2e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1028,6 +1028,8 @@ libudisks2.so.0 udisks2-1.93.0_1 libgcr-base-3.so.1 gcr-3.3.92_1 libgck-1.so.0 gcr-3.8.0_1 libgcr-ui-3.so.1 gcr-3.8.0_1 +libgck-2.so.0 gcr4-3.90.0_1 +libgcr-4.so.0 gcr4-3.90.0_1 libcld2.so cld2-0.0.1.20150821_1 libcld2_full.so cld2-full-0.0.1.20150821_1 libwacom.so.2 libwacom-0.3_1 diff --git a/srcpkgs/gcr4-devel b/srcpkgs/gcr4-devel new file mode 120000 index 0000000000000..e85b363d95de7 --- /dev/null +++ b/srcpkgs/gcr4-devel @@ -0,0 +1 @@ +gcr4 \ No newline at end of file diff --git a/srcpkgs/gcr4/template b/srcpkgs/gcr4/template new file mode 100644 index 0000000000000..6ee1a367c4af4 --- /dev/null +++ b/srcpkgs/gcr4/template @@ -0,0 +1,50 @@ +# Template file for 'gcr4' +pkgname=gcr4 +version=3.92.0 +revision=1 +build_style=meson +build_helper="gir" +wrksrc="gcr-${version}" +configure_args="$(vopt_bool gir introspection) $(vopt_bool gir gtk_doc)" +hostmakedepends="gettext glib-devel gnupg gi-docgen gettext pkg-config openssh + libxslt $(vopt_if gir vala)" +makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel gtk4-devel" +depends="desktop-file-utils hicolor-icon-theme gnupg" +checkdepends="dbus" +short_desc="GNOME crypto package" +maintainer="Orphaned " +license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/gcr" +changelog="https://gitlab.gnome.org/GNOME/gcr/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" +checksum=896abf8e1db0f40eb28073f364f36a72385ac8abf8cd1362b1016e97721ff518 +make_check_pre="dbus-run-session" +make_check=no # Gcr:ERROR:../gcr/test-gnupg-collection.c:203:test_load: assertion failed: (record) + +# Package build options +build_options="gir" +build_options_default="gir" + +post_patch() { + vsed -e "s/gcr_soversion = .*/gcr_soversion = '0'/" -i meson.build + vsed -e "s/gck_soversion = .*/gck_soversion = '0'/" -i meson.build +} + +post_install() { + rm ${DESTDIR}/usr/libexec/gcr-ssh-agent +} + +gcr4-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + vmove usr/share/doc + vmove usr/share/vala + fi + } +} From 18413eae39c7a6ef7120e95f9ca8458a5cf78542 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 13 Sep 2022 00:36:08 +0200 Subject: [PATCH 05/46] mutter: update to 43.0. --- common/shlibs | 8 ++++---- srcpkgs/mutter/template | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index cf920efda7e2e..97b282a34addd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2966,10 +2966,10 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-10.so.0 mutter-42.0_1 -libmutter-clutter-10.so.0 mutter-42.0_1 -libmutter-cogl-10.so.0 mutter-42.0_1 -libmutter-cogl-pango-10.so.0 mutter-42.0_1 +libmutter-11.so.0 mutter-43.rc_1 +libmutter-clutter-11.so.0 mutter-43.rc_1 +libmutter-cogl-11.so.0 mutter-43.rc_1 +libmutter-cogl-pango-11.so.0 mutter-43.rc_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.6 slop-7.6_1 diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 1861675a621e6..dd6e4aac56002 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=42.4 +version=43.0 revision=1 build_helper="gir" build_style=meson @@ -20,9 +20,9 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c22c7fa3d187061dbf280c3850e118b7b5009065d01de31616acd500c4982a40 -shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so - libmutter-cogl-pango-10.so" +checksum=8d9ba528ed99ef6799642e147b3fe9f2bcbeca9beced2845c1cadb331cd3e525 +shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so + libmutter-cogl-pango-11.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -34,8 +34,8 @@ pre_build() { post_install() { # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are # meant to be called with 'pkg-config --variable' - vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-11|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc } mutter-devel_package() { @@ -45,7 +45,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-10/*.gir" + vmove "usr/lib/mutter-11/*.gir" vmove "usr/lib/*.so" } } From bcfe61bb2e3be87f3878e20b2ceab73c1c04d961 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 13 Sep 2022 00:32:21 +0200 Subject: [PATCH 06/46] gnome-shell: update to 43.0. --- srcpkgs/gnome-shell/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 886d388d8abad..144e7da1aa656 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,17 +1,17 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=42.4 +version=43.0 revision=1 build_style=meson build_helper=gir configure_args="-Dsystemd=false -Dtests=false" -hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc +hostmakedepends="libxslt pkg-config python3 sassc asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache" makedepends="gnome-control-center-devel at-spi2-atk-devel evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel - gnome-bluetooth-devel pipewire-devel gstreamer1-devel" + gnome-bluetooth-devel pipewire-devel gstreamer1-devel gcr4-devel" depends="elogind gnome-control-center gsettings-desktop-schemas upower gstreamer1-pipewire gst-plugins-good1" checkdepends="xvfb-run mesa-dri $depends" @@ -21,7 +21,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz" -checksum=875ff2970ea9fb7a05506e32a0d50dc917f41b4ca37134b41377f9c82873c54e +checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41 do_check() { mkdir /tmp/gnome-shell-xdg From 508fafd4dcf992aff7d5fbb38b6565505ba93bc6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 20 Sep 2022 00:03:27 +0200 Subject: [PATCH 07/46] evolution-data-server: update to 3.46.0. --- common/shlibs | 19 ++++++++++--------- srcpkgs/evolution-data-server/template | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/common/shlibs b/common/shlibs index 97b282a34addd..accee47608b24 100644 --- a/common/shlibs +++ b/common/shlibs @@ -598,21 +598,22 @@ libicalss.so.3 libical-3.0.4_1 libicalss_cxx.so.3 libical-3.0.4_1 libicalvcal.so.3 libical-3.0.4_1 libical-glib.so.3 libical-3.0.4_1 -libcamel-1.2.so.63 evolution-data-server-3.42.0_1 -libedataserver-1.2.so.26 evolution-data-server-3.40.0_1 -libebackend-1.2.so.10 evolution-data-server-3.17.90_1 -libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1 -libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1 -libedata-book-1.2.so.26 evolution-data-server-3.34.0_1 -libebook-1.2.so.20 evolution-data-server-3.34.0_1 -libecal-2.0.so.1 evolution-data-server-3.34.0_1 +libcamel-1.2.so.64 evolution-data-server-3.46.0_1 +libebackend-1.2.so.11 evolution-data-server-3.46.0_1 +libebook-1.2.so.21 evolution-data-server-3.46.0_1 +libebook-contacts-1.2.so.4 evolution-data-server-3.46.0_1 +libecal-2.0.so.2 evolution-data-server-3.46.0_1 +libedata-book-1.2.so.27 evolution-data-server-3.46.0_1 +libedataserver-1.2.so.27 evolution-data-server-3.46.0_1 +libedataserverui-1.2.so.4 evolution-data-server-3.46.0_1 +libedataserverui4-1.0.so.0 evolution-data-server-3.46.0_1 libevolution-calendar.so evolution-3.28.0_1 libevolution-util.so evolution-3.28.0_1 libemail-engine.so evolution-3.28.0_1 libevolution-mail.so evolution-3.28.0_1 libevolution-mail-formatter.so evolution-3.40.0_1 libevolution-shell.so evolution-3.28.0_1 -libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1 +libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1 libgdata.so.22 libgdata-0.17.9_1 libpcap.so.1 libpcap-1.1.1_1 libiptc.so.0 iptables-1.4.7_1 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 6304e8cc5b345..a6fc89cfdb1dd 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,26 +1,26 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.44.4 +version=3.46.0 revision=1 build_style=cmake build_helper="gir qemu" configure_args=" -DSYSCONF_INSTALL_DIR=/etc - -DWITH_GWEATHER4=ON -DWITH_PHONENUMBER=ON - $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')" + -DWITH_PHONENUMBER=ON + $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON') + -DENABLE_WEATHER=OFF" hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel $(vopt_if gir vala)" makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel - libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel - libsoup-devel libphonenumber-devel $(vopt_if gir vala-devel)" -depends="libgweather libsoup-gnome" + libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkit2gtk50-devel + libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel" checkdepends="dbus" short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb +changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz" +checksum=e5fa28095a183f7ab5a928e35a828379b481ddef83ed4c7b51a2e3c4aef5cdab build_options="gir" build_options_default="gir" @@ -36,7 +36,7 @@ pre_build() { evolution-data-server-devel_package() { depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel libgdata-devel>=0.15 libsecret-devel libglib-devel - libsoup-devel gtk+3-devel libxml2-devel + libsoup3-devel gtk4-devel libxml2-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From b6b4eb05463924c1f08c659588ff850a0a5a6eb3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:01 +0200 Subject: [PATCH 08/46] evolution: update to 3.46.0. --- srcpkgs/evolution/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index a2d7f527c1d86..ef10334fdb4d2 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,31 +1,31 @@ # Template file for 'evolution' pkgname=evolution -version=3.44.4 +version=3.46.0 revision=1 build_style=cmake build_helper="qemu" configure_args="-DSYSCONF_INSTALL_DIR=/etc -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF - -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2" + -DENABLE_WEATHER=OFF -DWITH_ENCHANT_VERSION=2" hostmakedepends="intltool itstool pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel libcanberra-devel - libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel - gnome-desktop-devel libsoup-devel cmark-devel" + libnotify-devel libwebkit2gtk41-devel ytnef-devel + gnome-desktop-devel libsoup3-devel cmark-devel" depends="gnome-keyring" short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f0b16e7abad3c7945a29c322f17dab4a08d61e99bd7cc91b8df35053c5c12e8c +changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz" +checksum=e09e9276bc6b9abf0dad3a4e813eea1d025f4f6aaf1fac3b7b0f88895742913f shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" evolution-devel_package() { - depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel + depends="libwebkit2gtk41-devel gtk+3-devel libglib-devel evolution-data-server-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From fb1a6ad978e127916669e057b6456f6997fc8ab2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 00:05:51 +0200 Subject: [PATCH 09/46] sushi: update to 43.0. --- srcpkgs/sushi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 4b9b2fbe1c0bc..530d5eac4a2a2 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,20 +1,20 @@ # Template file for 'sushi' pkgname=sushi -version=42.0 +version=43.0 revision=1 build_helper="gir" build_style=meson hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir 'gobject-introspection') gjs" makedepends="clutter-gst3-devel clutter-gtk-devel evince-devel gjs-devel - gtksourceview4-devel libmusicbrainz5-devel libsoup-gnome-devel webkit2gtk-devel" + gtksourceview4-devel libmusicbrainz5-devel libsoup3-devel libwebkit2gtk41-devel" depends="evince nautilus" short_desc="Quick image previewer over DBus for Nautilus" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/sushi" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820 +checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b lib32disabled=yes build_options="gir" From 4e7c832e3fa203a06f25579a45f54bac7274662f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:01 +0200 Subject: [PATCH 10/46] evolution-ews: update to 3.46.0. --- srcpkgs/evolution-ews/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 2446b3edd159b..9cc0b9809f69a 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,16 +1,16 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.44.4 +version=3.46.0 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" hostmakedepends="cmake glib-devel intltool libmspack pkg-config" -makedepends="evolution-devel libmspack-devel webkit2gtk-devel - gnome-desktop-devel libsoup-devel" +makedepends="evolution-devel libmspack-devel libwebkit2gtk41-devel + gnome-desktop-devel libsoup3-devel" short_desc="MS Exchange integration through Exchange Web Services" maintainer="Peter Kuchar " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3 +checksum=bd97ba205cc45bad12997bee1348a2f91d8b02d714583d79f4fae1794dac1b80 From e94005a9f38abb2eb7679d072b4a8d3d8dabd236 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:01 +0200 Subject: [PATCH 11/46] folks: revbump for evolution-data-server 3.46 --- srcpkgs/folks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index fbc56862bde71..acc873462be6b 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,7 +1,7 @@ # Template file for 'folks' pkgname=folks version=0.15.5 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Db_lto=false" From 30ffd0b424206a9d68955dc8cbdc6ca07ce51200 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:02 +0200 Subject: [PATCH 12/46] pidgin: revbump for evolution-data-server 3.46 --- srcpkgs/pidgin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index d9010fb67b46c..1c45e275fba9b 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -1,7 +1,7 @@ # Template file for 'pidgin' pkgname=pidgin version=2.14.9 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-install --disable-meanwhile --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv From ad040537e39ac946f82c93399d1637b3dbd9b0de Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 20:24:06 +0200 Subject: [PATCH 13/46] gnome-control-center: update to 43.0. --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 84ff92b93ae8f..d6a5662e0b582 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=42.3 +version=43.0 revision=1 build_style=meson build_helper="gir" @@ -23,7 +23,7 @@ license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ce0ae3650de2af7ebcb0a7e1fc9912eddb6eff8d257f3fe50ff8b29c19341c7e +checksum=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48 make_check=no # needs X11 and requires altered filesystem pre_build() { From 781285c350669937f405a9de492c0667a0b6e5e7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 20:24:08 +0200 Subject: [PATCH 14/46] gdm: update to 43.0. --- srcpkgs/gdm/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 3686c70b7404e..37e7cb828f449 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=42.0 +version=43.0 revision=1 build_helper="gir" build_style=meson @@ -10,7 +10,8 @@ configure_args=" -Dplymouth=enabled -Dxauth-dir=/run/gdm -Dpid-file=/run/gdm/gdm.pid -Dsystemd-journal=false -Dinitial-vt=7 -Dwayland-support=true -Dselinux=disabled -Dlibaudit=disabled - -Dsystemdsystemunitdir=/tmp -Dsystemduserunitdir=/tmp" + -Dsystemdsystemunitdir=/usr/lib/systemd/system + -Dsystemduserunitdir=/usr/lib/systemd/user" hostmakedepends="dconf gettext itstool pkg-config" makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel @@ -23,7 +24,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855 +checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294 conf_files=" /etc/gdm/custom.conf @@ -32,6 +33,9 @@ conf_files=" /etc/pam.d/gdm-launch-environment /etc/pam.d/gdm-password /etc/pam.d/gdm-smartcard" +make_dirs=" + /usr/share/gdm/env.d 0755 root root + /etc/gdm/env.d 0755 root root" # Create the 'gdm' system user/group. system_accounts="gdm" gdm_homedir="/var/lib/gdm" @@ -52,7 +56,6 @@ post_install() { vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f" fi done - rm -rf ${DESTDIR}/tmp # runit service vsv gdm From e58990a6edb6182dae80845fcc85909bc75999b9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 20:51:14 +0200 Subject: [PATCH 15/46] gnome-session: update to 43.0. --- srcpkgs/gnome-session/template | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 76b1f49f1cdcc..af3335442a04d 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,23 +1,18 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=42.0 -revision=2 +version=43.0 +revision=1 build_style=meson configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" -hostmakedepends="glib-devel intltool pkg-config xmlto" +hostmakedepends="glib-devel gettext pkg-config xmlto" makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel - libglib-devel libICE-devel libSM-devel libXtst-devel startup-notification-devel - upower-devel xtrans" -depends="dconf desktop-file-utils bash - gsettings-desktop-schemas hicolor-icon-theme polkit" + libglib-devel libICE-devel libSM-devel xtrans" +depends="dconf desktop-file-utils bash gsettings-desktop-schemas + hicolor-icon-theme polkit" short_desc="GNOME session management utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa - -post_install() { - rm -rf ${DESTDIR}/tmp -} +checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2 From 12e3b62b2af361a9b05cb1d3b80e7920968c7293 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 21:10:24 +0200 Subject: [PATCH 16/46] gnome-desktop: update to 43. --- common/shlibs | 8 +- .../patches/optional_introspection.patch | 93 ------------------- srcpkgs/gnome-desktop/template | 9 +- 3 files changed, 9 insertions(+), 101 deletions(-) delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch diff --git a/common/shlibs b/common/shlibs index accee47608b24..c5aa30443551b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1130,10 +1130,10 @@ libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 -libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 -libgnome-desktop-4.so.1 gnome-desktop-42.0_1 -libgnome-bg-4.so.1 gnome-desktop-42.0_1 -libgnome-rr-4.so.1 gnome-desktop-42.0_1 +libgnome-desktop-3.so.20 gnome-desktop-43.0_1 +libgnome-desktop-4.so.2 gnome-desktop-43.0_1 +libgnome-bg-4.so.2 gnome-desktop-43.0_1 +libgnome-rr-4.so.2 gnome-desktop-43.0_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch deleted file mode 100644 index b960ef27c5880..0000000000000 --- a/srcpkgs/gnome-desktop/patches/optional_introspection.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Wed, 18 Sep 2019 22:28:21 +0300 -Subject: [PATCH] meson: Add optionality for introspection - ---- - libgnome-desktop/meson.build | 48 +++++++++++++++++++----------------- - meson_options.txt | 4 +++ - 2 files changed, 30 insertions(+), 22 deletions(-) - -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index a0fb11f8..375cf57c 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -125,17 +125,19 @@ if get_option('build_gtk4') - ], - ) - -- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -- export_packages: 'gnome-desktop-4', -- namespace: 'GnomeDesktop', -- nsversion: '4.0', -- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true, -- ) -+ if get_option('introspection') -+ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -+ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -+ export_packages: 'gnome-desktop-4', -+ namespace: 'GnomeDesktop', -+ nsversion: '4.0', -+ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true, -+ ) -+ endif - - pkg.generate( - libgnome_desktop_base, -@@ -255,17 +257,19 @@ if get_option('legacy_library') - ], - ) - -- gnome.generate_gir(libgnome_desktop, -- sources: introspection_sources + libgnome_desktop_headers, -- export_packages: 'gnome-desktop-3.0', -- namespace: 'GnomeDesktop', -- nsversion: '3.0', -- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true -- ) -+ if get_option('introspection') -+ gnome.generate_gir(libgnome_desktop, -+ sources: introspection_sources + libgnome_desktop_headers, -+ export_packages: 'gnome-desktop-3.0', -+ namespace: 'GnomeDesktop', -+ nsversion: '3.0', -+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true -+ ) -+ endif - - pkg.generate( - libraries: libgnome_desktop, -diff --git a/meson_options.txt b/meson_options.txt -index e17e7330..c4db6eaf 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,10 @@ option('debug_tools', - type: 'boolean', value: true, description: 'Build debug tools' - ) - -+option('introspection', -+ type: 'boolean', value: true, description: 'Whether to build introspection files' -+) -+ - option('udev', - type: 'feature', description: 'Udev support' - ) --- -GitLab diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index d157e14baffb7..0622908753aa8 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,10 +1,10 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=42.4 +version=43 revision=1 build_style=meson build_helper="gir" -configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled +configure_args="-Dudev=enabled -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel @@ -15,9 +15,10 @@ short_desc="GNOME desktop management utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" -changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1ce2c9d5067969dbe0b282ea5a9acfb8698751f03cd07e2c730240f85dc9ad25 +checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69 build_options="gir" build_options_default="gir" From ef4eef3713cbba1a03175afa8496670880adb642 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 21:54:44 +0200 Subject: [PATCH 17/46] gnome-settings-daemon: update to 43.0. --- srcpkgs/gnome-settings-daemon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 24af1a5094b7f..66c4714ec9d0b 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,12 +1,12 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=42.2 +version=43.0 revision=1 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt perl pkg-config" -makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel +makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr4-devel geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel upower-devel @@ -20,7 +20,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00 +checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0 CFLAGS="-UG_DISABLE_ASSERT" if [ "$CROSS_BUILD" ]; then From 1df383ba9b22aca16fa4b8d27e63363a05970771 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:00:07 +0200 Subject: [PATCH 18/46] gnome-contacts: revbump for gnome-desktop 43 --- srcpkgs/gnome-contacts/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 64ecf75826b7f..4ee3cbced47fd 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts version=42.0 -revision=2 +revision=3 build_style=meson hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala" makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-devel From 14d00a4fef4f56597432cd152cc7b6ebb690ff16 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:03:56 +0200 Subject: [PATCH 19/46] cheese: update to 43.alpha. --- srcpkgs/cheese/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 066828c022079..8842089b11ec3 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,6 +1,6 @@ # Template file for 'cheese' pkgname=cheese -version=41.1 +version=43.alpha revision=1 build_style=meson build_helper="gir" @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Cheese" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547 +checksum=badae9f7bda6fa5721dab7a08b8237a75e5325c0c9a669498ff54f772146e4cf build_options="gir gtk_doc" build_options_default="gir" From d63f842c68b3f1faea73f314775423ec731cc232 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 22:23:43 +0200 Subject: [PATCH 20/46] New package: geocode-glib3-3.26.4 --- common/shlibs | 1 + srcpkgs/geocode-glib3-devel | 1 + srcpkgs/geocode-glib3/template | 40 ++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 120000 srcpkgs/geocode-glib3-devel create mode 100644 srcpkgs/geocode-glib3/template diff --git a/common/shlibs b/common/shlibs index c5aa30443551b..de2dc44550f0a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1429,6 +1429,7 @@ libupnp.so.17 libupnp-1.14.0_1 libixml.so.11 libupnp-1.14.0_1 libupnpp.so.12 libupnpp-0.22.2_1 libgeocode-glib.so.0 geocode-glib-3.10.0_1 +libgeocode-glib-2.so.0 geocode-glib3-3.26.4_1 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1 libpotrace.so.0 libpotrace-1.11_1 libSDL2-2.0.so.0 SDL2-2.0.0_1 diff --git a/srcpkgs/geocode-glib3-devel b/srcpkgs/geocode-glib3-devel new file mode 120000 index 0000000000000..bd21975ea3eb8 --- /dev/null +++ b/srcpkgs/geocode-glib3-devel @@ -0,0 +1 @@ +geocode-glib3 \ No newline at end of file diff --git a/srcpkgs/geocode-glib3/template b/srcpkgs/geocode-glib3/template new file mode 100644 index 0000000000000..45c620ee3a259 --- /dev/null +++ b/srcpkgs/geocode-glib3/template @@ -0,0 +1,40 @@ +# Template file for 'geocode-glib3' +# keep in sync with geocode-glib +pkgname=geocode-glib3 +version=3.26.4 +revision=1 +wrksrc="geocode-glib-$version" +build_style=meson +build_helper="gir" +configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection) + -Denable-installed-tests=false -Dsoup2=false" +hostmakedepends="pkg-config glib-devel" +makedepends="json-glib-devel libsoup3-devel" +depends="geocode-glib-common" +short_desc="GLib library for geocoding and reverse geocoding" +maintainer="Enno Boland " +license="LGPL-2.1-or-later" +homepage="https://developer.gnome.org/geocode-glib" +distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz" +checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa + +# Package build options +build_options="gir" +build_options_default="gir" + +post_install() { + rm -r ${DESTDIR}/usr/share/icons +} + +geocode-glib3-devel_package() { + depends="libglib-devel ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + } +} From dc35bf5e9c84212f17a512c8bd09001ef88d258a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 22:24:42 +0200 Subject: [PATCH 21/46] geocode-glib: split -common for geocode-glib3 --- srcpkgs/geocode-glib-common | 1 + srcpkgs/geocode-glib/template | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/geocode-glib-common diff --git a/srcpkgs/geocode-glib-common b/srcpkgs/geocode-glib-common new file mode 120000 index 0000000000000..45ec1fe82f875 --- /dev/null +++ b/srcpkgs/geocode-glib-common @@ -0,0 +1 @@ +geocode-glib \ No newline at end of file diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template index 29571876a43ca..625977898d88d 100644 --- a/srcpkgs/geocode-glib/template +++ b/srcpkgs/geocode-glib/template @@ -1,4 +1,5 @@ # Template file for 'geocode-glib' +# keep in sync with geocode-glib3 pkgname=geocode-glib version=3.26.4 revision=1 @@ -12,7 +13,7 @@ short_desc="GLib library for geocoding and reverse geocoding" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://developer.gnome.org/geocode-glib" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz" checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa # Package build options @@ -31,3 +32,10 @@ geocode-glib-devel_package() { fi } } + +geocode-glib-common_package() { + short_desc+=" - development files" + pkg_install() { + vmove usr/share/icons + } +} From 42a48ed7075af1bda092f286fc5b76823086cbf0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 22:37:58 +0200 Subject: [PATCH 22/46] gnome-calendar: update to 43.0. --- srcpkgs/gnome-calendar/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index cd1d201d2dfb1..ad860186635c5 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,20 +1,21 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=42.2 +version=43.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache $(vopt_if gir 'gobject-introspection')" -makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel +makedepends="evolution-data-server-devel geoclue2-devel geocode-glib3-devel gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel" short_desc="Calendar application designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" -changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-42/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd +checksum=09e5c0f9360f3f856deaa7c0db30f5dab0151180df4183807c6cf3602992f5cc build_options="gir" build_options_default="gir" From 68866d683e6efb254f8667cb3f698d8b2e875790 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:09:38 +0200 Subject: [PATCH 23/46] geocode-glib: update to 3.26.4. --- srcpkgs/geocode-glib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template index 625977898d88d..bc98027bf9e19 100644 --- a/srcpkgs/geocode-glib/template +++ b/srcpkgs/geocode-glib/template @@ -2,7 +2,7 @@ # keep in sync with geocode-glib3 pkgname=geocode-glib version=3.26.4 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection) From 1f6bea525f780c2f3cdc28e277b5f6dea0761a97 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 24/46] eog: revbump for gnome-desktop 43 --- srcpkgs/eog/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 0b7aae2e9efc6..83ea29b5a485b 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,7 +1,7 @@ # Template file for 'eog' pkgname=eog version=43.0 -revision=1 +revision=2 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" From 8ce6d0d52cd82eb9da03cec1609f659ae3e04af5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 25/46] evince: revbump for gnome-desktop 43 --- srcpkgs/evince/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 730fb3c5f6d1e..43ab670861c9c 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,7 +1,7 @@ # Template file for 'evince' pkgname=evince version=43.0 -revision=1 +revision=2 build_helper="gir" build_style=meson configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) From 178935399860c444418c00eeb05ab66de0892503 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 26/46] totem: revbump for gnome-desktop 43 --- srcpkgs/totem/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 0eb8af318ac2c..b481d520e2a2e 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,7 +1,7 @@ # Template file for 'totem' pkgname=totem version=43.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Denable-python=no" From 101a9b3f3922873aba8ef0c574a464f0e220ef81 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 27/46] nautilus: revbump for gnome-desktop 43 --- srcpkgs/nautilus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index 571013b24c7d6..ea8f2ad81d476 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,7 +1,7 @@ # Template file for 'nautilus' pkgname=nautilus version=42.2 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" From 8f1967b16ed17c2d1c2574a140af796e6c30296a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 28/46] gnome-clocks: revbump for gnome-desktop 43 --- srcpkgs/gnome-clocks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index c2f76af5604a0..e5ad3713e387b 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,7 +1,7 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks version=42.0 -revision=1 +revision=2 build_helper="gir" build_style=meson hostmakedepends="pkg-config gettext itstool glib-devel vala From c2846ea77e7b9df8d3a847bff1a22cc592bdc104 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 2 Oct 2022 13:23:42 +0200 Subject: [PATCH 29/46] gnome-clocks: update to 42.0. --- srcpkgs/gnome-clocks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index e5ad3713e387b..667739bbc138b 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,7 +1,7 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks version=42.0 -revision=2 +revision=3 build_helper="gir" build_style=meson hostmakedepends="pkg-config gettext itstool glib-devel vala From ef95a632327c8e32777630df327a2582b61e3650 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 30/46] gnome-initial-setup: revbump for gnome-desktop 43 --- srcpkgs/gnome-initial-setup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 9e8a2c3824f99..6ae8ed8c7f6f9 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,7 +1,7 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup version=42.2 -revision=1 +revision=2 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" hostmakedepends="pkg-config glib-devel gettext" From bf7575222f226dfffedb2ccbc830a5c79ead0283 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:16:58 +0200 Subject: [PATCH 31/46] nautilus: update to 43.0. --- common/shlibs | 2 +- srcpkgs/nautilus/template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index de2dc44550f0a..2996552afb46c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -669,7 +669,7 @@ libgvfscommon.so.0 gvfs-1.7.2_1 libgvfscommon-dnssd.so.0 gvfs-1.7.2_1 libgvfsdaemon.so gvfs-1.20_1 libgvfscommon.so gvfs-1.20_1 -libnautilus-extension.so.1 libnautilus-3.2.1_1 +libnautilus-extension.so.4 libnautilus-43.0_1 libmpc.so.3 libmpc-1.0.1_1 libsigc-2.0.so.0 libsigc++-1.1_1 libsigc-3.0.so.0 libsigc++3-3.0.3_1 diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index ea8f2ad81d476..624c02ead8cb0 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,15 +1,15 @@ # Template file for 'nautilus' pkgname=nautilus -version=42.2 -revision=2 +version=43.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" -hostmakedepends="gettext glib-devel libxslt pkg-config tracker" -makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel +hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils" +makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel - libhandy1-devel libportal-gtk3-devel" + libadwaita-devel libportal-gtk4-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tracker-miners tracker" checkdepends="tracker tracker-miners python3-gobject dbus" @@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" -checksum=99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2 +checksum=3cf54fac0a8abee090e155417f7b16f63ea0ac0c264ef4f54574af345801a911 # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s make_check=extended @@ -40,7 +40,7 @@ libnautilus_package() { } } nautilus-devel_package() { - depends="gtk+3-devel libnautilus>=${version}_${revision}" + depends="gtk4-devel libnautilus>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 7cf5668583578d83f912591f037739b011b4d966 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:25:11 +0200 Subject: [PATCH 32/46] evince: disable nautilus extension * the extension doesn't support nautilus 43 --- srcpkgs/evince/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 43ab670861c9c..7ffa8e3a33b06 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,16 +1,17 @@ # Template file for 'evince' pkgname=evince version=43.0 -revision=2 +revision=3 build_helper="gir" build_style=meson configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) - -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled" + -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled + -Dnautilus=false" hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen) glib-devel itstool pkg-config perl-XML-Parser appstream-glib" # XXX missing packages for DVI backend. makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel - libgxps-devel libsecret-devel libspectre-devel nautilus-devel + libgxps-devel libsecret-devel libspectre-devel poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME Document viewer for multiple document formats" From a4070aae0a601d84ebe93ed32b2bd6683a42429c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:35:02 +0200 Subject: [PATCH 33/46] file-roller: revbump for nautilus 43 --- srcpkgs/file-roller/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 1baaf1e1922f4..0c929aa19e702 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,7 +1,7 @@ # Template file for 'file-roller' pkgname=file-roller version=3.42.0 -revision=1 +revision=3 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel From e4be3db8930b91f9247fecdf444e70cac6759c49 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 00:41:55 +0200 Subject: [PATCH 34/46] New package: rest1-0.9.1 --- common/shlibs | 2 ++ srcpkgs/rest1-devel | 1 + srcpkgs/rest1/template | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 120000 srcpkgs/rest1-devel create mode 100644 srcpkgs/rest1/template diff --git a/common/shlibs b/common/shlibs index 2996552afb46c..047045c047872 100644 --- a/common/shlibs +++ b/common/shlibs @@ -876,7 +876,9 @@ libcogl-gles2.so.20 cogl-1.18.0_1 libcogl-path.so.20 cogl-1.18.0_1 libp11-kit.so.0 p11-kit-0.7_1 librest-0.7.so.0 rest-0.7_1 +librest-1.0.so.0 rest1-0.9.1_1 librest-extras-0.7.so.0 rest-0.7_1 +librest-extras-1.0.so.0 rest1-0.9.1_1 libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1 libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1 liboauth.so.0 liboauth-0.9.4_1 diff --git a/srcpkgs/rest1-devel b/srcpkgs/rest1-devel new file mode 120000 index 0000000000000..9f3b48034de53 --- /dev/null +++ b/srcpkgs/rest1-devel @@ -0,0 +1 @@ +rest1 \ No newline at end of file diff --git a/srcpkgs/rest1/template b/srcpkgs/rest1/template new file mode 100644 index 0000000000000..d5ba5709e9608 --- /dev/null +++ b/srcpkgs/rest1/template @@ -0,0 +1,37 @@ +# Template file for 'rest1' +pkgname=rest1 +version=0.9.1 +revision=1 +wrksrc="rest-$version" +build_style=meson +build_helper="gir" +configure_args="$(vopt_bool gir introspection) -Dexamples=false -Dsoup2=false + -Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt" +hostmakedepends="pkg-config glib-devel gi-docgen" +makedepends="libsoup3-devel json-glib-devel libxml2-devel" +depends="ca-certificates" +short_desc="RESTful library" +maintainer="Orphaned " +license="GPL-2.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/librest" +changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz" +checksum=9266a5c10ece383e193dfb7ffb07b509cc1f51521ab8dad76af96ed14212c2e3 + +# Package build options +build_options="gir" +build_options_default="gir" + +rest1-devel_package() { + depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup3-devel + libxml2-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + } +} From 75dc28d3a82e0538fa03b0a01b5d37b317bbc17c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 00:24:44 +0200 Subject: [PATCH 35/46] gnome-online-accounts: update to 3.46.0. --- srcpkgs/gnome-online-accounts/template | 27 +++++++++++--------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 47085810e534d..d9f03780a7b9c 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,27 +1,22 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.44.0 +version=3.46.0 revision=1 -build_style=gnu-configure +build_style=meson build_helper="gir" -configure_args="$(vopt_enable gir introspection) - --enable-documentation --enable-backend - --enable-google --enable-kerberos --enable-flickr - --enable-facebook --disable-static --enable-exchange --enable-imap-smtp - --enable-owncloud --enable-windows-live - --enable-lastfm --enable-media-server" -hostmakedepends="docbook-xsl gettext glib-devel - libxslt pkg-config $(vopt_if gir vala)" -makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel - libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel" +configure_args="$(vopt_bool gir introspection) $(vopt_bool gir vapi) + -Dmedia_server=true -Dman=true" +hostmakedepends="pkg-config gettext glib-devel docbook-xsl" +makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel + rest1-devel gcr-devel mit-krb5-devel libsoup3-devel" depends="hicolor-icon-theme" short_desc="GNOME service to access online accounts" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" -changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342 +changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz" +checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa build_options="gir" build_options_default="gir" From 05980d68ceba0bc6fd0bb1d13551f628b71b342f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 30 Sep 2022 21:44:30 +0200 Subject: [PATCH 36/46] gnome-console: update to 43.0. console nautilus plugin is now included in nautilus --- srcpkgs/gnome-console/template | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template index 7e09b6cc99458..3b3d80f4f538a 100644 --- a/srcpkgs/gnome-console/template +++ b/srcpkgs/gnome-console/template @@ -1,26 +1,23 @@ # Template file for 'gnome-console' pkgname=gnome-console -version=42.2 +version=43.0 revision=1 build_style=meson -configure_args="-Dnautilus=enabled" -hostmakedepends="pkg-config desktop-file-utils gettext sassc +hostmakedepends="pkg-config desktop-file-utils gettext gobject-introspection glib-devel gtk-update-icon-cache" -makedepends="libhandy1-devel vte3-devel libgtop-devel nautilus-devel +makedepends="libadwaita-devel vte3-gtk4-devel libgtop-devel gsettings-desktop-schemas-devel pcre2-devel" depends="gsettings-desktop-schemas" short_desc="Simple user-friendly terminal emulator for the GNOME desktop" maintainer="oreo639 " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/console" -changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7d26e6c18744c575a787293263f60ceff630107098e9e58a7765b00ac7437049 +changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/gnome-console/${version%.*}/gnome-console-${version}.tar.xz" +checksum=b9642485a37a70e82cc10553b0e2681756ba361ff5e4cbf3182f150231fea99e nautilus-gnome-console-extension_package() { depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - nautilus integration" - pkg_install() { - vmove usr/lib/nautilus/extensions-3.0 - } + short_desc+=" - transitional package" + build_style=meta } From b020e4f656ff6b19be016416a60d14afd1d90775 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:37:19 +0200 Subject: [PATCH 37/46] libgweather: update to 4.2.0. --- .../patches/fix-cross-introspection.patch | 14 ----- ...metar-test-dont-use-known-duplicates.patch | 51 ------------------- srcpkgs/libgweather/template | 13 ++--- 3 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch delete mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch deleted file mode 100644 index fbec0c3317fa9..0000000000000 --- a/srcpkgs/libgweather/patches/fix-cross-introspection.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgweather/meson.build b/libgweather/meson.build -index 08311af4..ef554f2e 100644 ---- a/libgweather/meson.build -+++ b/libgweather/meson.build -@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', - ) - - g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) --build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() -+build_gir = get_option('introspection') and g_ir_scanner.found() - - enable_vala = get_option('enable_vala') - vapigen = find_program('vapigen', required: enable_vala == 'true') - diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch deleted file mode 100644 index 5646cd24cc21d..0000000000000 --- a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001 -From: Pierre Labastie -Date: Sun, 10 Apr 2022 22:24:47 +0200 -Subject: [PATCH] metar test: Don't use "known" duplicates - -The metar list provided by NOAA contains duplicate ICAO codes. -Those duplicates may change over time, so it does not make sense -to use an array of known duplicates. Presently a duplicate is rejected -when it is known, and inserted if it is not, leading to a difference -in the number of insertions and the number of keys, so that the test -fails. If any duplicate is rejected, the number of insertions is -always equal to the number of keys (unless something goes wrong -in g_hash_table_insert). And this is the default behavior for known -duplicates anyway. - -Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168 ---- - libgweather/tests/metar.c | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c -index 7d6c7c04..a6fa7e79 100644 ---- a/libgweather/tests/metar.c -+++ b/libgweather/tests/metar.c -@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents) - continue; - } - -+ /* If it is a duplicate discard it */ - if (g_hash_table_lookup (stations_ht, station)) { -- const char * const known_duplicates[] = { -- "VOGO", -- "KHQG", -- "KOEL", -- "KTQK", -- "KX26", -- NULL -- }; -- if (g_strv_contains (known_duplicates, station)) { -- g_free (station); -- continue; -- } - g_test_message ("Weather station '%s' already defined\n", station); -+ g_free (station); -+ continue; - } - - g_hash_table_insert (stations_ht, station, g_strdup (line)); --- -GitLab - diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index cd14de2d4b7b5..84cf22c6624cc 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,22 +1,23 @@ # Template file for 'libgweather' pkgname=libgweather reverts="40.0_1" -version=4.0.0 -revision=2 +version=4.2.0 +revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo" -hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala) +hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel + json-glib-devel $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)" -makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" +makedepends="geocode-glib3-devel gtk+3-devel libsoup3-devel" depends="tzdata" short_desc="GNOME Weather information access library" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c +distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz" +checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203 build_options="gir gtk_doc" build_options_default="gir gtk_doc" From 87fa0640b1d8ff067f28c93db45286a66dc05d05 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:43:06 +0200 Subject: [PATCH 38/46] geary: update to 43.0. --- srcpkgs/geary/patches/vala-0.56a.patch | 25 ---------------- srcpkgs/geary/patches/vala-0.56b.patch | 40 -------------------------- srcpkgs/geary/template | 13 +++++---- 3 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/geary/patches/vala-0.56a.patch delete mode 100644 srcpkgs/geary/patches/vala-0.56b.patch diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch deleted file mode 100644 index df2c3902db14d..0000000000000 --- a/srcpkgs/geary/patches/vala-0.56a.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Sun, 30 Jan 2022 19:54:11 +0100 -Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument - ---- - src/client/util/util-cache.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala -index f054e32e5..ecc275e84 100644 ---- a/src/client/util/util-cache.vala -+++ b/src/client/util/util-cache.vala -@@ -12,7 +12,7 @@ public class Util.Cache.Lru : Geary.BaseObject { - private class CacheEntry { - - -- public static int lru_compare(CacheEntry a, CacheEntry b) { -+ public static int lru_compare(CacheEntry a, CacheEntry b) { - if (a.key == b.key) { - return 0; - } --- -GitLab - diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch deleted file mode 100644 index 2d071a1337519..0000000000000 --- a/srcpkgs/geary/patches/vala-0.56b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Tue, 30 Nov 2021 15:31:31 +0100 -Subject: [PATCH] Fix accessibility issues with initializer of constants - ---- - src/client/application/application-client.vala | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala -index 6ce19ce2a..e6ba85331 100644 ---- a/src/client/application/application-client.vala -+++ b/src/client/application/application-client.vala -@@ -8,16 +8,16 @@ - - // Defined by CMake build script. - extern const string GETTEXT_PACKAGE; --extern const string _APP_ID; --extern const string _BUILD_ROOT_DIR; --extern const string _GSETTINGS_DIR; --extern const string _INSTALL_PREFIX; --extern const string _NAME_SUFFIX; -+public extern const string _APP_ID; -+public extern const string _BUILD_ROOT_DIR; -+public extern const string _GSETTINGS_DIR; -+public extern const string _INSTALL_PREFIX; -+public extern const string _NAME_SUFFIX; - extern const string _PLUGINS_DIR; - extern const string _PROFILE; - extern const string _REVNO; --extern const string _SOURCE_ROOT_DIR; --extern const string _VERSION; -+public extern const string _SOURCE_ROOT_DIR; -+public extern const string _VERSION; - extern const string _WEB_EXTENSIONS_DIR; - - --- -GitLab - diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index ecca2367f1f60..3f9ba248c197f 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -1,14 +1,14 @@ # Template file for 'geary' pkgname=geary -version=40.0 -revision=5 +version=43.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Dprofile=release -Dcontractor=enabled" hostmakedepends="desktop-file-utils iso-codes pkg-config itstool gobject-introspection vala glib-devel gettext" -makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel - libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel +makedepends="enchant2-devel gcr-devel gmime3-devel libsoup3-devel libglib-devel + libgee08-devel libsecret-devel libwebkit2gtk41-devel libxml2-devel gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel libpeas-devel gsound-devel libstemmer-devel" @@ -17,8 +17,9 @@ short_desc="Lightweight email program for the GNOME desktop" maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Geary" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz" -checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0 +changelog="https://gitlab.gnome.org/GNOME/geary/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/geary/${version%.*}/geary-${version}.tar.xz" +checksum=489166f87dd9d29011f5e5b79694f2588b473f7e191c59ce9013c8c8e0e363e7 make_check=no # tests fail with a webkit process crash post_patch() { From 089d2e21c4623c73a1b3391af69f604d16442a16 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:43:12 +0200 Subject: [PATCH 39/46] gnome-initial-setup: update to 43.0. --- srcpkgs/gnome-initial-setup/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 6ae8ed8c7f6f9..0fed249383968 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,7 +1,7 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=42.2 -revision=2 +version=43.0 +revision=1 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" hostmakedepends="pkg-config glib-devel gettext" @@ -9,13 +9,13 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel gnome-online-accounts-devel gdm-devel libpwquality-devel mit-krb5-devel vala-devel libnma-devel polkit-devel - rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel - pango-devel libhandy1-devel" + rest1-devel libsecret-devel ibus-devel iso-codes geoclue2-devel + pango-devel libadwaita-devel" depends="iso-codes" short_desc="GNOME initial setup" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" -checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b +distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz" +checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955 From 7f3eca3ea713935c4ec719ed21264efe398fbfc8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:56:44 +0200 Subject: [PATCH 40/46] gnome-recipes: remove package * doesn't work with libsoup2 and rest 1.0 --- .../patches/gnome-recipes-fix-cross.patch | 9 --------- srcpkgs/gnome-recipes/template | 14 -------------- srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch delete mode 100644 srcpkgs/gnome-recipes/template diff --git a/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch b/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch deleted file mode 100644 index 7792b5c2bc03a..0000000000000 --- a/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/tools/meson.build -+++ b/tools/meson.build -@@ -1,3 +1,5 @@ - recipe_extract = executable('recipe-extract', 'recipe-extract.c', - include_directories : top_inc, -- dependencies: deps) -+ native: true, -+ dependencies: dependency('glib-2.0', native: true), -+) diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template deleted file mode 100644 index 5b87bb4ff935d..0000000000000 --- a/srcpkgs/gnome-recipes/template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'gnome-recipes' -pkgname=gnome-recipes -version=2.0.4 -revision=1 -build_style=meson -hostmakedepends="gettext glib-devel itstool pkg-config git" -makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel - libsoup-devel gnome-online-accounts-devel rest-devel json-glib-devel" -short_desc="GNOME app for sharing and finding recipes" -maintainer="Enno Boland " -license="GPL-2.0-or-later" -homepage="https://wiki.gnome.org/Apps/Recipes" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 02b43cdad8b6b..f16a5aeafee8f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -117,6 +117,7 @@ replaces=" gnome-games<=40.0_1 gnome-getting-started-docs<=3.38.1_1 gnome-online-miners<=3.34.0_3 + gnome-recipes<=2.0.4_1 gnome-shell-mousewheel-zoom<=0.8.0_2 gnome-twitch<=0.4.2_1 go-gdm<=1.4_7 From 34461f7f7f9f4e4864bd0053ea37a9478eaeb716 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 16:18:46 +0200 Subject: [PATCH 41/46] gnome-photos: update to 43.0. --- srcpkgs/gnome-photos/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index dbdbf6850a6f3..8f6c5ef95f53a 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -1,15 +1,16 @@ # Template file for 'gnome-photos' pkgname=gnome-photos -version=42.0 +version=43.0 revision=1 build_helper="gir" build_style=meson configure_args="-Ddogtail=false -Dmanuals=true" hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt" makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel - gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel + tracker-devel libexif-devel librsvg-devel grilo-devel libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel - geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel" + geocode-glib3-devel libdazzle-devel gegl-devel libhandy1-devel + libportal-gtk3-devel" depends="desktop-file-utils tracker tracker-miners" short_desc="Access, organize, and share your photos on GNOME" maintainer="Enno Boland " @@ -17,7 +18,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Photos" changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz" -checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551 +checksum=c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1 build_options="gir" build_options_default="gir" From 75592c0929da7299d491f0d19b1c9c4efccb1ad1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 16:20:55 +0200 Subject: [PATCH 42/46] gfbgraph: remove package * uses libsoup2, not regularly maintained, unused --- common/shlibs | 1 - srcpkgs/gfbgraph-devel | 1 - srcpkgs/gfbgraph/template | 43 ------------------------------- srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 120000 srcpkgs/gfbgraph-devel delete mode 100644 srcpkgs/gfbgraph/template diff --git a/common/shlibs b/common/shlibs index 047045c047872..d46fc06855bd6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1577,7 +1577,6 @@ libslim.so.1.3.6 slim-1.3.6_1 libmediaart-2.0.so.0 libmediaart-1.9.1_1 libinput.so.10 libinput-1.2.0_1 libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1 -libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1 libgtkhex-4.so.0 libgtkhex-42.1_1 libgdlmm-3.0.so.2 libgdlmm-3.7.3_1 libdmraid.so.1 dmraid-1.0.0.rc16.3_5 diff --git a/srcpkgs/gfbgraph-devel b/srcpkgs/gfbgraph-devel deleted file mode 120000 index d66938286a0c1..0000000000000 --- a/srcpkgs/gfbgraph-devel +++ /dev/null @@ -1 +0,0 @@ -gfbgraph \ No newline at end of file diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template deleted file mode 100644 index 63c6376122a25..0000000000000 --- a/srcpkgs/gfbgraph/template +++ /dev/null @@ -1,43 +0,0 @@ -# Template file for 'gfbgraph' -pkgname=gfbgraph -version=0.2.5 -revision=1 -build_style=gnu-configure -build_helper="gir" -configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)" -hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)" -makedepends="rest-devel json-glib-devel gnome-online-accounts-devel" -short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://wiki.gnome.org/Projects/GFBGraph" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3 -make_check=no # needs facebook credentials - -build_options="gir gtk_doc" -build_options_default="gir" - -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gtk_doc" -fi - -post_install() { - rm -rf ${DESTDIR}/usr/doc -} - -gfbgraph-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${makedepends}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc - fi - vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index f16a5aeafee8f..55e1db7c3dca3 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -105,6 +105,7 @@ replaces=" geoip-data<=20171002_2 gespeaker<=0.8.6_3 getmail<=5.14_2 + gfbgraph<=0.2.5_1 giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 From 0158ddccfa89c5d6f02a43b7daaab773b5b9f33a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 16:23:29 +0200 Subject: [PATCH 43/46] gnome-core: remove gfbgraph unused and removed package --- srcpkgs/gnome-core/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index d4a852d1ea88e..41c9d75d8bee7 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,7 +1,7 @@ # Template file for 'gnome-core' pkgname=gnome-core version=42.0 -revision=2 +revision=3 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" maintainer="Orphaned " @@ -20,7 +20,6 @@ depends=" gcr>=3.41.0 gdm>=${version} geocode-glib>=3.26.2 - gfbgraph>=0.2.4 gjs>=1.72.0 glib>=2.72.0 glib-networking>=2.72.0 From fd444d840a3026c876de75690dc1a2dc1d05054c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 18:40:02 +0200 Subject: [PATCH 44/46] grilo-plugins: disable goa --- srcpkgs/grilo-plugins/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 65d0eb1640df7..fedca6c57e94c 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -1,14 +1,15 @@ # Template file for 'grilo-plugins' pkgname=grilo-plugins version=0.3.14 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3" +configure_args="-Dgoa=disabled" +hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker" # XXX missing plugins: fakemetadata. makedepends="grilo-devel gom-devel json-glib-devel libquvi-devel rest-devel sqlite-devel libgcrypt-devel - tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel - gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel + tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel + gstreamer1-devel libdmapsharing-devel lua53-devel avahi-glib-libs-devel" checkdepends="python3-gobject gst-plugins-bad1 dbus" short_desc="Plugins for Grilo" From fd8675f937616334354bd59db1a07d04a0bd72ed Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 2 Oct 2022 12:59:30 +0200 Subject: [PATCH 45/46] shotwell: update to 0.31.5, use libsoup3 --- srcpkgs/shotwell/patches/meson-0.61.patch | 27 -- .../patches/shotwell-0.31.3-vapi_fixes.patch | 368 ------------------ .../patches/shotwell-0.54.1-vapi_fixes.patch | 67 ---- srcpkgs/shotwell/template | 8 +- 4 files changed, 4 insertions(+), 466 deletions(-) delete mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch deleted file mode 100644 index f33fa2af16377..0000000000000 --- a/srcpkgs/shotwell/patches/meson-0.61.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Tue, 11 Jan 2022 21:57:26 -0500 -Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out - -It tried to create multiple targets with the same name and generating -the same file. On older versions of meson, this was a run_target and -just ran twice, but was still wrong. ---- - help/LINGUAS | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/help/LINGUAS b/help/LINGUAS -index 68f089c4..5352eecd 100644 ---- a/help/LINGUAS -+++ b/help/LINGUAS -@@ -6,7 +6,6 @@ es - fr - hu - id --id - lv - pt_BR - sv --- -GitLab - diff --git a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch deleted file mode 100644 index 908e615f08495..0000000000000 --- a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch +++ /dev/null @@ -1,368 +0,0 @@ -From 9a9876e27076f5939525023eb8c7f24d48c8ff25 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sun, 14 Mar 2021 11:21:10 +0100 -Subject: [PATCH 1/6] vapis: Plug memory leak in GPhoto2 - -Caller was supposed to free the StorageInfo, which with the old binding -we never did ---- - src/camera/GPhoto.vala | 5 +++-- - src/camera/ImportPage.vala | 14 ++++++-------- - vapi/libgphoto2.vapi | 2 +- - 3 files changed, 10 insertions(+), 11 deletions(-) - -diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala -index aa2fcf2b..64ff7ca0 100644 ---- a/src/camera/GPhoto.vala -+++ b/src/camera/GPhoto.vala -@@ -135,9 +135,10 @@ namespace GPhoto { - // filesystem. In these cases shotwell can access the file directly. See: - // https://bugzilla.gnome.org/show_bug.cgi?id=716915 - public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) { -- GPhoto.CameraStorageInformation *sifs = null; -+ // Fixme: Why do we need to query get_storageinfo here first? -+ GPhoto.CameraStorageInformation[] sifs = null; - int count = 0; -- camera.get_storageinfo(&sifs, out count, context); -+ camera.get_storageinfo(out sifs, context); - - GPhoto.PortInfo port_info; - camera.get_port_info(out port_info); -diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala -index ab24df61..c424de88 100644 ---- a/src/camera/ImportPage.vala -+++ b/src/camera/ImportPage.vala -@@ -1179,9 +1179,9 @@ public class ImportPage : CheckerboardPage { - - Gee.ArrayList import_list = new Gee.ArrayList(); - -- GPhoto.CameraStorageInformation *sifs = null; -+ GPhoto.CameraStorageInformation[] sifs = null; - int count = 0; -- refresh_result = dcamera.gcamera.get_storageinfo(&sifs, out count, spin_idle_context.context); -+ refresh_result = dcamera.gcamera.get_storageinfo(out sifs, spin_idle_context.context); - if (refresh_result == GPhoto.Result.OK) { - for (int fsid = 0; fsid < count; fsid++) { - // Check well-known video and image paths first to prevent accidental -@@ -1324,18 +1324,16 @@ public class ImportPage : CheckerboardPage { - // Need to do this because some phones (iPhone, in particular) changes the name of their filesystem - // between each mount - public static string? get_fs_basedir(GPhoto.Camera camera, int fsid) { -- GPhoto.CameraStorageInformation *sifs = null; -+ GPhoto.CameraStorageInformation[] sifs = null; - int count = 0; -- GPhoto.Result res = camera.get_storageinfo(&sifs, out count, null_context.context); -+ GPhoto.Result res = camera.get_storageinfo(out sifs, null_context.context); - if (res != GPhoto.Result.OK) - return null; - -- if (fsid >= count) -+ if (fsid >= sifs.length) - return null; - -- GPhoto.CameraStorageInformation *ifs = sifs + fsid; -- -- return (ifs->fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? ifs->basedir : "/"; -+ return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/"; - } - - public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) { -diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi -index 22f70eed..7e569823 100644 ---- a/vapi/libgphoto2.vapi -+++ b/vapi/libgphoto2.vapi -@@ -64,7 +64,7 @@ namespace GPhoto { - public Result set_port_info(PortInfo info); - public Result get_abilities(out CameraAbilities abilities); - public Result set_abilities(CameraAbilities abilities); -- public Result get_storageinfo(CameraStorageInformation **sifs, out int count, Context context); -+ public Result get_storageinfo([CCode (array_length_pos=1)]out CameraStorageInformation[] sifs, Context context); - - // Folders - [CCode (cname="gp_camera_folder_list_folders")] --- -2.31.1 - -From e1f53784dd7475388470a30683df34b5ca7784eb Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sat, 13 Mar 2021 23:22:50 +0100 -Subject: [PATCH 2/6] More GPhoto2 vapi fixes - ---- - vapi/libgphoto2.vapi | 25 ++++++++++++------------- - 1 file changed, 12 insertions(+), 13 deletions(-) - -diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi -index 7e569823..607a644f 100644 ---- a/vapi/libgphoto2.vapi -+++ b/vapi/libgphoto2.vapi -@@ -53,7 +53,7 @@ namespace GPhoto { - ref_function="GPHOTO_REF_CAMERA", - unref_function="gp_camera_unref", - free_function="gp_camera_free", -- cheader_filename="gphoto2/gphoto2-camera.h,gphoto.h" -+ cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h" - )] - public class Camera { - [CCode (cname="gp_camera_new")] -@@ -74,7 +74,7 @@ namespace GPhoto { - [CCode (cname="gp_camera_folder_delete_all")] - public Result delete_all_files(string folder, Context context); - [CCode (cname="gp_camera_folder_put_file")] -- public Result put_file(string folder, CameraFile file, Context context); -+ public Result put_file(string folder, string filename, CameraFileType type, CameraFile file, Context context); - [CCode (cname="gp_camera_folder_make_dir")] - public Result make_dir(string folder, string name, Context context); - [CCode (cname="gp_camera_folder_remove_dir")] -@@ -99,7 +99,7 @@ namespace GPhoto { - ref_function="GPHOTO_REF_FILE", - unref_function="gp_file_unref", - free_function="gp_file_free", -- cheader_filename="gphoto2/gphoto2-file.h,gphoto.h" -+ cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h" - )] - public class CameraFile { - [CCode (cname="gp_file_new")] -@@ -140,7 +140,6 @@ namespace GPhoto { - public enum CameraFileInfoFields { - NONE, - TYPE, -- NAME, - SIZE, - WIDTH, - HEIGHT, -@@ -159,7 +158,7 @@ namespace GPhoto { - public CameraFileInfoFields fields; - public CameraFileStatus status; - public ulong size; -- public string type; -+ public char type[64]; - public uint width; - public uint height; - public string name; -@@ -176,7 +175,7 @@ namespace GPhoto { - public CameraFileInfoFields fields; - public CameraFileStatus status; - public ulong size; -- public string type; -+ public char type[64]; - public uint width; - public uint height; - public string name; -@@ -257,7 +256,7 @@ namespace GPhoto { - ref_function="GPHOTO_REF_LIST", - unref_function="gp_list_unref", - free_function="gp_list_free", -- cheader_filename="gphoto2/gphoto2-list.h,gphoto.h" -+ cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h" - )] - public class CameraList { - [CCode (cname="gp_list_new")] -@@ -266,7 +265,7 @@ namespace GPhoto { - public Result append(string name, string value); - public Result reset(); - public Result sort(); -- public Result find_by_name(out int? index, string name); -+ public Result find_by_name(out int index, string name); - public Result get_name(int index, out unowned string name); - public Result get_value(int index, out unowned string value); - public Result set_name(int index, string name); -@@ -314,9 +313,9 @@ namespace GPhoto { - )] - public struct CameraStorageInformation { - public CameraStorageInfoFields fields; -- public string basedir; -- public string label; -- public string description; -+ public char basedir[256]; -+ public char label[256]; -+ public char description[256]; - public int type; - public int fstype; - public int access; -@@ -329,7 +328,7 @@ namespace GPhoto { - [CCode ( - ref_function="GPHOTO_REF_CONTEXT", - unref_function="gp_context_unref", -- cheader_filename="gphoto2/gphoto2-context.h,gphoto.h" -+ cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h" - )] - public class Context { - [CCode (cname="gp_context_new")] -@@ -485,7 +484,7 @@ namespace GPhoto { - - [CCode ( - cheader_filename="gphoto2/gphoto2-version.h", -- cprefix="GP_VERSION" -+ cprefix="GP_VERSION_" - )] - public enum VersionVerbosity { - SHORT, --- -2.31.1 - -From 754520638beafa997d81fdbff58a9d07a48f7cfd Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sat, 13 Mar 2021 22:31:32 +0100 -Subject: [PATCH 3/6] vapis: Fix gphoto2 vapi - -There was some copy-paste going on there that didn't actually match the -C structs ---- - vapi/libgphoto2.vapi | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi -index 607a644f..adcef5c5 100644 ---- a/vapi/libgphoto2.vapi -+++ b/vapi/libgphoto2.vapi -@@ -161,7 +161,6 @@ namespace GPhoto { - public char type[64]; - public uint width; - public uint height; -- public string name; - public CameraFilePermissions permissions; - public time_t mtime; - } -@@ -178,9 +177,6 @@ namespace GPhoto { - public char type[64]; - public uint width; - public uint height; -- public string name; -- public CameraFilePermissions permissions; -- public time_t mtime; - } - - [CCode ( --- -2.31.1 - -From f7d044e7a72b80a550fd1907a2d56053caab1ae3 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sat, 13 Mar 2021 22:32:17 +0100 -Subject: [PATCH 4/6] Fix strings in [SimpleType] structs - ---- - src/camera/ImportPage.vala | 5 +++-- - vapi/libraw.vapi | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala -index c424de88..f5e98955 100644 ---- a/src/camera/ImportPage.vala -+++ b/src/camera/ImportPage.vala -@@ -1408,12 +1408,13 @@ public class ImportPage : CheckerboardPage { - import_list.add(video_source); - } else { - // determine file format from type, and then from file extension -- PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(info.file.type); -+ string file_type = (string)info.file.type; -+ PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(file_type); - if (file_format == PhotoFileFormat.UNKNOWN) { - file_format = PhotoFileFormat.get_by_basename_extension(filename); - if (file_format == PhotoFileFormat.UNKNOWN) { - message("Skipping %s/%s: Not a supported file extension (%s)", fulldir, -- filename, info.file.type); -+ filename, file_type); - - continue; - } -diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi -index b1b5875b..146f447e 100644 ---- a/vapi/libraw.vapi -+++ b/vapi/libraw.vapi -@@ -248,7 +248,7 @@ public struct Thumbnail { - public uint tlength; - public int tcolors; - [CCode (array_length_cname="tlength")] -- public uint8[] thumb; -+ public unowned uint8[] thumb; - } - - [CCode (cname="enum LibRaw_thumbnail_formats", cprefix="LIBRAW_THUMBNAIL_")] --- -2.31.1 - -From a035ff6ee39dc47c6051f7b29c7da83d3ecde52e Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sun, 14 Mar 2021 11:21:10 +0100 -Subject: [PATCH 5/6] Fix compile error after GPhoto vapi change - ---- - src/camera/ImportPage.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala -index f5e98955..7dbe9d42 100644 ---- a/src/camera/ImportPage.vala -+++ b/src/camera/ImportPage.vala -@@ -1333,7 +1333,7 @@ public class ImportPage : CheckerboardPage { - if (fsid >= sifs.length) - return null; - -- return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/"; -+ return (GPhoto.CameraStorageInfoFields.BASE in sifs[fsid].fields) ? (string) sifs[fsid].basedir : "/"; - } - - public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) { --- -2.31.1 - -From 44dae743da462742f1acdeb599f0a10afa43e629 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sun, 14 Mar 2021 12:22:55 +0100 -Subject: [PATCH 6/6] Fix and clarify the helper header for GPhoto - ---- - vapi/libgphoto2.vapi | 8 ++++---- - vapi/{gphoto.h => shotwell-gphoto-helper.h} | 0 - 2 files changed, 4 insertions(+), 4 deletions(-) - rename vapi/{gphoto.h => shotwell-gphoto-helper.h} (100%) - -diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi -index adcef5c5..aeab7255 100644 ---- a/vapi/libgphoto2.vapi -+++ b/vapi/libgphoto2.vapi -@@ -53,7 +53,7 @@ namespace GPhoto { - ref_function="GPHOTO_REF_CAMERA", - unref_function="gp_camera_unref", - free_function="gp_camera_free", -- cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h" -+ cheader_filename="gphoto2/gphoto2-camera.h,shotwell-gphoto-helper.h" - )] - public class Camera { - [CCode (cname="gp_camera_new")] -@@ -99,7 +99,7 @@ namespace GPhoto { - ref_function="GPHOTO_REF_FILE", - unref_function="gp_file_unref", - free_function="gp_file_free", -- cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h" -+ cheader_filename="gphoto2/gphoto2-file.h,shotwell-gphoto-helper.h" - )] - public class CameraFile { - [CCode (cname="gp_file_new")] -@@ -252,7 +252,7 @@ namespace GPhoto { - ref_function="GPHOTO_REF_LIST", - unref_function="gp_list_unref", - free_function="gp_list_free", -- cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h" -+ cheader_filename="gphoto2/gphoto2-list.h,shotwell-gphoto-helper.h" - )] - public class CameraList { - [CCode (cname="gp_list_new")] -@@ -324,7 +324,7 @@ namespace GPhoto { - [CCode ( - ref_function="GPHOTO_REF_CONTEXT", - unref_function="gp_context_unref", -- cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h" -+ cheader_filename="gphoto2/gphoto2-context.h,shotwell-gphoto-helper.h" - )] - public class Context { - [CCode (cname="gp_context_new")] -diff --git a/vapi/gphoto.h b/vapi/shotwell-gphoto-helper.h -similarity index 100% -rename from vapi/gphoto.h -rename to vapi/shotwell-gphoto-helper.h --- -2.31.1 - diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch deleted file mode 100644 index f39f988f96459..0000000000000 --- a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Tue, 30 Nov 2021 15:09:17 +0100 -Subject: [PATCH] Fix accessibility issues with initializer of constants - ---- - src/International.vala | 2 -- - src/Resources.vala | 7 ------- - vapi/version.vapi | 17 ++++++++++++++--- - 3 files changed, 14 insertions(+), 12 deletions(-) - -diff --git a/src/International.vala b/src/International.vala -index 555a91f8..73f07639 100644 ---- a/src/International.vala -+++ b/src/International.vala -@@ -4,8 +4,6 @@ - * See the COPYING file in this distribution. - */ - --extern const string _LANG_SUPPORT_DIR; -- - public const string TRANSLATABLE = "translatable"; - - namespace InternationalSupport { -diff --git a/src/Resources.vala b/src/Resources.vala -index 6d2b8851..86f0eb65 100644 ---- a/src/Resources.vala -+++ b/src/Resources.vala -@@ -4,13 +4,6 @@ - * See the COPYING file in this distribution. - */ - --// defined by ./configure or Makefile and included by gcc -D --extern const string _PREFIX; --extern const string _VERSION; --extern const string GETTEXT_PACKAGE; --extern const string _LIB; --extern const string _LIBEXECDIR; -- - namespace Resources { - public const string APP_TITLE = "Shotwell"; - public const string APP_LIBRARY_ROLE = _("Photo Manager"); -diff --git a/vapi/version.vapi b/vapi/version.vapi -index 06974c84..e191f2f7 100644 ---- a/vapi/version.vapi -+++ b/vapi/version.vapi -@@ -1,3 +1,14 @@ --[CCode (cheader_filename="version.h")] --extern const string? _GIT_VERSION; -- -+[CCode (cheader_filename = "version.h")] -+public const string? _GIT_VERSION; -+[CCode (cheader_filename = "config.h")] -+public const string _PREFIX; -+[CCode (cheader_filename = "config.h")] -+public const string _VERSION; -+[CCode (cheader_filename = "config.h")] -+public const string GETTEXT_PACKAGE; -+[CCode (cheader_filename = "config.h")] -+public const string _LIB; -+[CCode (cheader_filename = "config.h")] -+public const string _LIBEXECDIR; -+[CCode (cheader_filename = "config.h")] -+public const string _LANG_SUPPORT_DIR; --- -GitLab - diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index fa533f27b1677..1c20d2fa9e7df 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -1,14 +1,14 @@ # Template file for 'shotwell' pkgname=shotwell -version=0.31.3 -revision=2 +version=0.31.5 +revision=1 build_style=meson hostmakedepends="gcr-devel gettext glib-devel itstool libgee08-devel libgexiv2-devel pkg-config vala-devel" makedepends="gst-plugins-base1-devel libgdata-devel libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel libraw-devel libsecret-devel libchamplain-devel libwebp-devel - rest-devel vala-devel webkit2gtk-devel" + rest1-devel vala-devel libwebkit2gtk41-devel libsoup3-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Open source photo manager for GNOME" maintainer="Enno Boland " @@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0" homepage="https://wiki.gnome.org/Apps/Shotwell" changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" -checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2 +checksum=3b048fc6ce99b232d1e0ea9b8db074083c86c88d3b6d63136a2cf8217aa45c19 lib32disabled=yes post_extract() { From 000fe2cc4f398bbc94fea3faeaeee872d622b596 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 2 Oct 2022 13:22:19 +0200 Subject: [PATCH 46/46] epiphany: update to 43.0. --- srcpkgs/epiphany/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 435daf6485d11..7e129c596bcce 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,20 +1,20 @@ # Template file for 'epiphany' pkgname=epiphany -version=42.4 +version=43.0 revision=1 build_style=meson configure_args="-Dunit_tests=disabled" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel - libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel - nettle-devel nss-devel webkit2gtk-devel libportal-gtk3-devel libsoup-devel + libnotify-devel libsecret-devel libwnck-devel libxslt-devel + nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel libsoup3-devel libarchive-devel" -depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk" +depends="desktop-file-utils hicolor-icon-theme iso-codes libwebkit2gtk41" short_desc="Intuitive GNOME web browser" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" -changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860 +changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz" +checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227