* [PR PATCH] [WIP]: GNOME 43
@ 2022-09-28 21:39 paper42
2022-09-28 22:10 ` [PR PATCH] [Updated] " paper42
` (57 more replies)
0 siblings, 58 replies; 59+ messages in thread
From: paper42 @ 2022-09-28 21:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1388 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 102576 bytes --]
From 9c383da015fcbc07c90bb78fe61161c356f09806 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Sep 2022 18:58:40 +0200
Subject: [PATCH 01/33] New package: mozjs102-102.3.0
---
common/shlibs | 1 +
srcpkgs/mozjs102-devel | 1 +
srcpkgs/mozjs102/patches/001-fix-soname.patch | 26 +++++
| 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 c962f0ab7622..5a3110949373 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3475,6 +3475,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 000000000000..97b7e735a472
--- /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 000000000000..a319d9e975ef
--- /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?= <fzatlouk@redhat.com>
+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
+
--git a/srcpkgs/mozjs102/patches/002-copy-headers.patch b/srcpkgs/mozjs102/patches/002-copy-headers.patch
new file mode 100644
index 000000000000..aafe1aa84bd3
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..c86cca403deb
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..8572c21fd4ec
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..84684250ce4c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch
@@ -0,0 +1,44 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..556bebd257ca
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..054685c1eee2
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..1954a55bf369
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..10b8b16ea7dc
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..5c286647325c
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..814912633217
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/012-fix-musl.patch
@@ -0,0 +1,21 @@
+commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..93e8c83f9337
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch
@@ -0,0 +1,26 @@
+commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4d8918a2a54c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/014-rust-target.patch
@@ -0,0 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..e2b340cd060e
--- /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 000000000000..24075c591ff4
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch
@@ -0,0 +1,35 @@
+commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4a9b0b42a575
--- /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 000000000000..f9f8e0cd7ace
--- /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 <daniel@octaforge.org>
+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 000000000000..831e5e03678d
--- /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 000000000000..5993b50d8999
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch
@@ -0,0 +1,79 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# 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 000000000000..0140da76ddf3
--- /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 <michal@vasilek.cz>"
+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 000000000000..f942fe4f0fc9
--- /dev/null
+++ b/srcpkgs/mozjs102/update
@@ -0,0 +1,2 @@
+site="${MOZILLA_SITE}/firefox/releases/"
+pattern="releases/\K${version%%.*}.*(?=esr/\")"
From 8658ea2e32a0529fd538fa2ed818d1275b436f13 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 02/33] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 95edaf43baac95a117249f84625b7a7e2449c970 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Sep 2022 23:00:57 -0700
Subject: [PATCH 03/33] 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 5a3110949373..d7fa3b53c534 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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 f21c8fb57e45..fe93c2761305 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<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
+ if constexpr (ViewClass::Adaptor::isFloat) {
+- if (std::isnan(static_cast<double>(*targetOption))) {
++ double targetOptionLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
++ }
+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
+#endif
+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
++ if (std::isnan(targetOptionLittleEndianAsDouble)) {
+ for (; index < length; ++index) {
+- if (std::isnan(static_cast<double>(array[index])))
++ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
++ }
+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ arrayElementLittleEndianAsDouble = static_cast<double>(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 859aa9343694..fdaf19991924 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 4d0776c16840..2f3a555cbcfd 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 618dc43ed4ee..ba02b128b1d1 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 <orphan@voidlinux.org>"
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 c3a761fc48a155c16b6b97ded9cde044be7270ba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 04/33] 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 d7fa3b53c534..577cf4820c37 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1027,6 +1027,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 000000000000..e85b363d95de
--- /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 000000000000..6ee1a367c4af
--- /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 <orphan@voidlinux.org>"
+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 b3db6fef52b11a6dd52e9019f2896b002e630650 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/33] 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 577cf4820c37..56cea3597bd0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2965,10 +2965,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 1861675a621e..dd6e4aac5600 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 049149c906a338fc96d78743bbafc6fd86b8a3d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 06/33] 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 886d388d8aba..144e7da1aa65 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 ae33aa3b6b39820541311de7bcb7ec7fda1d7e99 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 07/33] evolution-data-server: update to 3.46.0.
---
common/shlibs | 19 ++++++++++---------
srcpkgs/evolution-data-server/template | 18 +++++++++---------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 56cea3597bd0..3e8524e9ad97 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 6304e8cc5b34..efb26682bb54 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 <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
+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 32a6e2ca61d31194c42305a34529b9e5dd20269a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/33] evolution: revbump for evolution-data-server 3.46
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index a2d7f527c1d8..fd9d12a73e74 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From b7548a51f2f1696109e8bb5b26a3a14bb7483b09 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/33] evolution-ews: revbump for evolution-data-server 3.46
---
srcpkgs/evolution-ews/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..41947673139e 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,7 +1,7 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
version=3.44.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
hostmakedepends="cmake glib-devel intltool libmspack pkg-config"
From 605ac44d0155cc9ffe65165b800960f2c7c9d4f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 10/33] 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 fbc56862bde7..acc873462be6 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 a543ba196481c447ecdf97d82b9972fa80c2727c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 11/33] 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 d9010fb67b46..1c45e275fba9 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 a6c676e1972d5577d422b6d194cfd647ac302d1b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 12/33] 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 84ff92b93ae8..d6a5662e0b58 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 105647f8f9286553fcd531046632e85985f6c3df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 13/33] gdm: update to 43.0.
---
srcpkgs/gdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..9a330205f092 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
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 65c98e1d05ee65457e7ed5ecaba190764494d756 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 14/33] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 92683b74d962efbd49d9681032aaa24c65752aef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 15/33] 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 3e8524e9ad97..f7b96d5ce942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1129,10 +1129,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 d157e14baffb..51f318cc0850 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 <gottox@voidlinux.org>"
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"
+chabgelog="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 4904c538cbc371f4c28bc336cf9cc6818b3edee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 16/33] 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 24af1a5094b7..66c4714ec9d0 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 cc6a9536d1540e2b30a55a18cf67d4113538b018 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:58:37 +0200
Subject: [PATCH 17/33] xdg-desktop-portal-gnome: revbump for
evolution-data-server 3.46
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 8002ddcc399c..40fe242269a7 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=42.3
-revision=1
+revision=3
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From a83db73ade2dae05764a14e2c2ef41c9a65cf010 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 18/33] 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 ac49f9c98db4..1ef169a9fbb4 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=1
+revision=2
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
From 9f13f4770b3b2c44a2bc829d34640a69fe00cc02 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 19/33] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 470263e79f664dbb519565677303ed9b1748ea2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:23:43 +0200
Subject: [PATCH 20/33] 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 f7b96d5ce942..05602a58a354 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,6 +1428,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 000000000000..bd21975ea3eb
--- /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 000000000000..45c620ee3a25
--- /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 <gottox@voidlinux.org>"
+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 24b3030b0465dc115e41d1175df18459be219cb5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:24:42 +0200
Subject: [PATCH 21/33] 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 000000000000..45ec1fe82f87
--- /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 29571876a43c..625977898d88 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 <gottox@voidlinux.org>"
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 b97024eaacbe3c762cdac50c1c24a096d7bbc860 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 22/33] 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 cd1d201d2dfb..ad860186635c 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 <gottox@voidlinux.org>"
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 a17051fe1e3f2976f2d400678441c13ee91a3a51 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:09:38 +0200
Subject: [PATCH 23/33] 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 625977898d88..bc98027bf9e1 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 3d48ab5e416e2d3d388f196fa716eee56ddd133d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 24/33] 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 0b7aae2e9efc..83ea29b5a485 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 b3982a086b2f1bf607f70d1e76110cc53fb62a1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 25/33] 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 228f202a23b2..d146860639b3 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From f4698b745a9c66d3dea3057244b5fb5f0838e84a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 26/33] 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 aed625f2f65a..a7b4bda4fa94 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
version=42.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
From 998c21bc1120629f5a2bdb26165fe9a0326c2bdc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/33] 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 571013b24c7d..ea8f2ad81d47 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 e923db0fbaa2c287a95d72f6a06c78f115333dbd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/33] 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 c2f76af5604a..e5ad3713e387 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 f4c4a9c1cd527b5c21115f080c428ca75376b13d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 29/33] 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 9e8a2c3824f9..6ae8ed8c7f6f 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 b80d26c5afbde68b3b80c5680f503a2a20f5f5de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 30/33] 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 05602a58a354..37fc0d0aa96f 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 ea8f2ad81d47..624c02ead8cb 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 af0e3a62b69dc95de902070de2d2004f5a77fa9f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 31/33] evince: update to 43.0.
* nautilus extension doesn't support nautilus 43
---
srcpkgs/evince/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index d146860639b3..58fac0ca3d4f 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
-version=42.3
-revision=2
+version=43.0
+revision=1
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"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evince"
changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
+checksum=66be0de4b47b1130486103988cc152c04aea95950ba3ef16dc20c2ef6b681d47
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 28d156dd23148cf97e1d985d5429a0f14228b0af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:28:08 +0200
Subject: [PATCH 32/33] totem: update to 43.0.
---
srcpkgs/totem/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index a7b4bda4fa94..9355803fd539 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
-version=42.0
-revision=2
+version=43.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
@@ -19,7 +19,7 @@ license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Videos"
changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab
+checksum=b36d3655928b5896462a4d39f83b6ad66d37dbc9c99dceb02ea8a2e37394a41e
make_check_pre="xvfb-run"
# XXX xulrunner plugin.
From 8a8bcbca711e343ed96001efe83d294dde2a024d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 33/33] 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 1baaf1e1922f..0c929aa19e70 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
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
@ 2022-09-28 22:10 ` paper42
2022-09-28 22:47 ` paper42
` (56 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-09-28 22:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [ ] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [ ] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [ ] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [ ] evince 43 https://github.com/void-linux/void-packages/pull/39514
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 108056 bytes --]
From 9c383da015fcbc07c90bb78fe61161c356f09806 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Sep 2022 18:58:40 +0200
Subject: [PATCH 01/36] New package: mozjs102-102.3.0
---
common/shlibs | 1 +
srcpkgs/mozjs102-devel | 1 +
srcpkgs/mozjs102/patches/001-fix-soname.patch | 26 +++++
| 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 c962f0ab7622..5a3110949373 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3475,6 +3475,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 000000000000..97b7e735a472
--- /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 000000000000..a319d9e975ef
--- /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?= <fzatlouk@redhat.com>
+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
+
--git a/srcpkgs/mozjs102/patches/002-copy-headers.patch b/srcpkgs/mozjs102/patches/002-copy-headers.patch
new file mode 100644
index 000000000000..aafe1aa84bd3
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..c86cca403deb
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..8572c21fd4ec
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..84684250ce4c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch
@@ -0,0 +1,44 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..556bebd257ca
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..054685c1eee2
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..1954a55bf369
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..10b8b16ea7dc
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..5c286647325c
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..814912633217
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/012-fix-musl.patch
@@ -0,0 +1,21 @@
+commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..93e8c83f9337
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch
@@ -0,0 +1,26 @@
+commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4d8918a2a54c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/014-rust-target.patch
@@ -0,0 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..e2b340cd060e
--- /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 000000000000..24075c591ff4
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch
@@ -0,0 +1,35 @@
+commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4a9b0b42a575
--- /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 000000000000..f9f8e0cd7ace
--- /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 <daniel@octaforge.org>
+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 000000000000..831e5e03678d
--- /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 000000000000..5993b50d8999
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch
@@ -0,0 +1,79 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# 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 000000000000..0140da76ddf3
--- /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 <michal@vasilek.cz>"
+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 000000000000..f942fe4f0fc9
--- /dev/null
+++ b/srcpkgs/mozjs102/update
@@ -0,0 +1,2 @@
+site="${MOZILLA_SITE}/firefox/releases/"
+pattern="releases/\K${version%%.*}.*(?=esr/\")"
From 8658ea2e32a0529fd538fa2ed818d1275b436f13 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 02/36] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 95edaf43baac95a117249f84625b7a7e2449c970 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Sep 2022 23:00:57 -0700
Subject: [PATCH 03/36] 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 5a3110949373..d7fa3b53c534 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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 f21c8fb57e45..fe93c2761305 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<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
+ if constexpr (ViewClass::Adaptor::isFloat) {
+- if (std::isnan(static_cast<double>(*targetOption))) {
++ double targetOptionLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
++ }
+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
+#endif
+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
++ if (std::isnan(targetOptionLittleEndianAsDouble)) {
+ for (; index < length; ++index) {
+- if (std::isnan(static_cast<double>(array[index])))
++ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
++ }
+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ arrayElementLittleEndianAsDouble = static_cast<double>(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 859aa9343694..fdaf19991924 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 4d0776c16840..2f3a555cbcfd 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 618dc43ed4ee..ba02b128b1d1 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 <orphan@voidlinux.org>"
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 c3a761fc48a155c16b6b97ded9cde044be7270ba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 04/36] 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 d7fa3b53c534..577cf4820c37 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1027,6 +1027,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 000000000000..e85b363d95de
--- /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 000000000000..6ee1a367c4af
--- /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 <orphan@voidlinux.org>"
+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 b3db6fef52b11a6dd52e9019f2896b002e630650 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/36] 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 577cf4820c37..56cea3597bd0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2965,10 +2965,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 1861675a621e..dd6e4aac5600 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 049149c906a338fc96d78743bbafc6fd86b8a3d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 06/36] 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 886d388d8aba..144e7da1aa65 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 ae33aa3b6b39820541311de7bcb7ec7fda1d7e99 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 07/36] evolution-data-server: update to 3.46.0.
---
common/shlibs | 19 ++++++++++---------
srcpkgs/evolution-data-server/template | 18 +++++++++---------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 56cea3597bd0..3e8524e9ad97 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 6304e8cc5b34..efb26682bb54 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 <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
+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 32a6e2ca61d31194c42305a34529b9e5dd20269a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/36] evolution: revbump for evolution-data-server 3.46
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index a2d7f527c1d8..fd9d12a73e74 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From b7548a51f2f1696109e8bb5b26a3a14bb7483b09 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/36] evolution-ews: revbump for evolution-data-server 3.46
---
srcpkgs/evolution-ews/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..41947673139e 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,7 +1,7 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
version=3.44.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
hostmakedepends="cmake glib-devel intltool libmspack pkg-config"
From 605ac44d0155cc9ffe65165b800960f2c7c9d4f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 10/36] 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 fbc56862bde7..acc873462be6 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 a543ba196481c447ecdf97d82b9972fa80c2727c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 11/36] 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 d9010fb67b46..1c45e275fba9 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 a6c676e1972d5577d422b6d194cfd647ac302d1b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 12/36] 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 84ff92b93ae8..d6a5662e0b58 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 105647f8f9286553fcd531046632e85985f6c3df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 13/36] gdm: update to 43.0.
---
srcpkgs/gdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..9a330205f092 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
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 65c98e1d05ee65457e7ed5ecaba190764494d756 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 14/36] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 92683b74d962efbd49d9681032aaa24c65752aef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 15/36] 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 3e8524e9ad97..f7b96d5ce942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1129,10 +1129,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 d157e14baffb..51f318cc0850 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 <gottox@voidlinux.org>"
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"
+chabgelog="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 4904c538cbc371f4c28bc336cf9cc6818b3edee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 16/36] 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 24af1a5094b7..66c4714ec9d0 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 cc6a9536d1540e2b30a55a18cf67d4113538b018 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:58:37 +0200
Subject: [PATCH 17/36] xdg-desktop-portal-gnome: revbump for
evolution-data-server 3.46
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 8002ddcc399c..40fe242269a7 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=42.3
-revision=1
+revision=3
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From a83db73ade2dae05764a14e2c2ef41c9a65cf010 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 18/36] 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 ac49f9c98db4..1ef169a9fbb4 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=1
+revision=2
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
From 9f13f4770b3b2c44a2bc829d34640a69fe00cc02 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 19/36] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 470263e79f664dbb519565677303ed9b1748ea2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:23:43 +0200
Subject: [PATCH 20/36] 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 f7b96d5ce942..05602a58a354 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,6 +1428,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 000000000000..bd21975ea3eb
--- /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 000000000000..45c620ee3a25
--- /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 <gottox@voidlinux.org>"
+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 24b3030b0465dc115e41d1175df18459be219cb5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:24:42 +0200
Subject: [PATCH 21/36] 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 000000000000..45ec1fe82f87
--- /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 29571876a43c..625977898d88 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 <gottox@voidlinux.org>"
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 b97024eaacbe3c762cdac50c1c24a096d7bbc860 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 22/36] 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 cd1d201d2dfb..ad860186635c 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 <gottox@voidlinux.org>"
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 a17051fe1e3f2976f2d400678441c13ee91a3a51 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:09:38 +0200
Subject: [PATCH 23/36] 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 625977898d88..bc98027bf9e1 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 3d48ab5e416e2d3d388f196fa716eee56ddd133d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 24/36] 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 0b7aae2e9efc..83ea29b5a485 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 b3982a086b2f1bf607f70d1e76110cc53fb62a1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 25/36] 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 228f202a23b2..d146860639b3 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From f4698b745a9c66d3dea3057244b5fb5f0838e84a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 26/36] 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 aed625f2f65a..a7b4bda4fa94 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
version=42.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
From 998c21bc1120629f5a2bdb26165fe9a0326c2bdc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/36] 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 571013b24c7d..ea8f2ad81d47 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 e923db0fbaa2c287a95d72f6a06c78f115333dbd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/36] 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 c2f76af5604a..e5ad3713e387 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 f4c4a9c1cd527b5c21115f080c428ca75376b13d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 29/36] 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 9e8a2c3824f9..6ae8ed8c7f6f 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 b80d26c5afbde68b3b80c5680f503a2a20f5f5de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 30/36] 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 05602a58a354..37fc0d0aa96f 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 ea8f2ad81d47..624c02ead8cb 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 af0e3a62b69dc95de902070de2d2004f5a77fa9f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 31/36] evince: update to 43.0.
* nautilus extension doesn't support nautilus 43
---
srcpkgs/evince/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index d146860639b3..58fac0ca3d4f 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
-version=42.3
-revision=2
+version=43.0
+revision=1
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"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evince"
changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
+checksum=66be0de4b47b1130486103988cc152c04aea95950ba3ef16dc20c2ef6b681d47
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 28d156dd23148cf97e1d985d5429a0f14228b0af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:28:08 +0200
Subject: [PATCH 32/36] totem: update to 43.0.
---
srcpkgs/totem/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index a7b4bda4fa94..9355803fd539 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
-version=42.0
-revision=2
+version=43.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
@@ -19,7 +19,7 @@ license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Videos"
changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab
+checksum=b36d3655928b5896462a4d39f83b6ad66d37dbc9c99dceb02ea8a2e37394a41e
make_check_pre="xvfb-run"
# XXX xulrunner plugin.
From 8a8bcbca711e343ed96001efe83d294dde2a024d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 33/36] 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 1baaf1e1922f..0c929aa19e70 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 a7996d0008625320abaf56972ab397e7a638b5a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:03:45 +0200
Subject: [PATCH 34/36] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 cb28e0809169d2f2e286519a62704473cca2cd4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 35/36] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 1ab7e51f7caeea444a3277be62e7534ecb473751 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:09:49 +0200
Subject: [PATCH 36/36] evolution-ews: update to 3.46.0.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 41947673139e..9cc0b9809f69 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
-revision=2
+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 <masaj@gmx.com>"
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
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
2022-09-28 22:10 ` [PR PATCH] [Updated] " paper42
@ 2022-09-28 22:47 ` paper42
2022-09-28 22:57 ` [PR REVIEW] " oreo639
` (55 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-09-28 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [ ] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [ ] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [ ] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [ ] evince 43 https://github.com/void-linux/void-packages/pull/39514
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 119787 bytes --]
From 9c383da015fcbc07c90bb78fe61161c356f09806 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Sep 2022 18:58:40 +0200
Subject: [PATCH 01/45] New package: mozjs102-102.3.0
---
common/shlibs | 1 +
srcpkgs/mozjs102-devel | 1 +
srcpkgs/mozjs102/patches/001-fix-soname.patch | 26 +++++
| 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 c962f0ab7622..5a3110949373 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3475,6 +3475,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 000000000000..97b7e735a472
--- /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 000000000000..a319d9e975ef
--- /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?= <fzatlouk@redhat.com>
+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
+
--git a/srcpkgs/mozjs102/patches/002-copy-headers.patch b/srcpkgs/mozjs102/patches/002-copy-headers.patch
new file mode 100644
index 000000000000..aafe1aa84bd3
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..c86cca403deb
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..8572c21fd4ec
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..84684250ce4c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch
@@ -0,0 +1,44 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..556bebd257ca
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..054685c1eee2
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..1954a55bf369
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..10b8b16ea7dc
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..5c286647325c
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..814912633217
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/012-fix-musl.patch
@@ -0,0 +1,21 @@
+commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..93e8c83f9337
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch
@@ -0,0 +1,26 @@
+commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4d8918a2a54c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/014-rust-target.patch
@@ -0,0 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..e2b340cd060e
--- /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 000000000000..24075c591ff4
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch
@@ -0,0 +1,35 @@
+commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4a9b0b42a575
--- /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 000000000000..f9f8e0cd7ace
--- /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 <daniel@octaforge.org>
+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 000000000000..831e5e03678d
--- /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 000000000000..5993b50d8999
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch
@@ -0,0 +1,79 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# 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 000000000000..0140da76ddf3
--- /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 <michal@vasilek.cz>"
+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 000000000000..f942fe4f0fc9
--- /dev/null
+++ b/srcpkgs/mozjs102/update
@@ -0,0 +1,2 @@
+site="${MOZILLA_SITE}/firefox/releases/"
+pattern="releases/\K${version%%.*}.*(?=esr/\")"
From 8658ea2e32a0529fd538fa2ed818d1275b436f13 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 02/45] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 95edaf43baac95a117249f84625b7a7e2449c970 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Sep 2022 23:00:57 -0700
Subject: [PATCH 03/45] 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 5a3110949373..d7fa3b53c534 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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 f21c8fb57e45..fe93c2761305 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<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
+ if constexpr (ViewClass::Adaptor::isFloat) {
+- if (std::isnan(static_cast<double>(*targetOption))) {
++ double targetOptionLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
++ }
+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
+#endif
+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
++ if (std::isnan(targetOptionLittleEndianAsDouble)) {
+ for (; index < length; ++index) {
+- if (std::isnan(static_cast<double>(array[index])))
++ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
++ }
+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ arrayElementLittleEndianAsDouble = static_cast<double>(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 859aa9343694..fdaf19991924 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 4d0776c16840..2f3a555cbcfd 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 618dc43ed4ee..ba02b128b1d1 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 <orphan@voidlinux.org>"
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 c3a761fc48a155c16b6b97ded9cde044be7270ba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 04/45] 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 d7fa3b53c534..577cf4820c37 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1027,6 +1027,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 000000000000..e85b363d95de
--- /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 000000000000..6ee1a367c4af
--- /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 <orphan@voidlinux.org>"
+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 b3db6fef52b11a6dd52e9019f2896b002e630650 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/45] 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 577cf4820c37..56cea3597bd0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2965,10 +2965,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 1861675a621e..dd6e4aac5600 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 049149c906a338fc96d78743bbafc6fd86b8a3d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 06/45] 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 886d388d8aba..144e7da1aa65 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 ae33aa3b6b39820541311de7bcb7ec7fda1d7e99 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 07/45] evolution-data-server: update to 3.46.0.
---
common/shlibs | 19 ++++++++++---------
srcpkgs/evolution-data-server/template | 18 +++++++++---------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 56cea3597bd0..3e8524e9ad97 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 6304e8cc5b34..efb26682bb54 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 <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
+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 2efd73f269a6624c7627320c5e38f2fd01059414 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/45] 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 a2d7f527c1d8..ef10334fdb4d 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 <gottox@voidlinux.org>"
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 f44278efcec5f064ddf5184584ad6c5a6eef7741 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 09/45] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 74ee092cfadc5a9a12c19cc80ef479edcaa9460a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 10/45] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 959825485fce18a855c4ef0df7299643e2e9107b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 11/45] 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 fbc56862bde7..acc873462be6 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 71b5e5a527c05a3863cc8d9b9c2eec7767b4243e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 12/45] 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 d9010fb67b46..1c45e275fba9 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 eb5eda6e2a9d5f62e75d393ae8b057b3f17f6a43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 13/45] 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 84ff92b93ae8..d6a5662e0b58 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 fee95119d1f6f9d66a8b4240c1ff28fa2f00a8ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 14/45] gdm: update to 43.0.
---
srcpkgs/gdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..9a330205f092 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
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From abada7ea580285eda4a949383cca8dd1dd36f269 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 15/45] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 48e4586be8fc2c878caba11bcd04f143a866ef8e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 16/45] 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 3e8524e9ad97..f7b96d5ce942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1129,10 +1129,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 d157e14baffb..51f318cc0850 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 <gottox@voidlinux.org>"
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"
+chabgelog="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 36d383955cdb75b6a4aca7e5eb4014cb95c34b1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 17/45] 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 24af1a5094b7..66c4714ec9d0 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 ea6c786c82a356ce24ab7bac98c580d4ffd17bd0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:58:37 +0200
Subject: [PATCH 18/45] xdg-desktop-portal-gnome: revbump for
evolution-data-server 3.46
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 8002ddcc399c..40fe242269a7 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=42.3
-revision=1
+revision=3
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From be5d8ffba02137eb68dc8eb7723f42c9d00ed294 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 19/45] 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 ac49f9c98db4..1ef169a9fbb4 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=1
+revision=2
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
From 26014d447183e925cc53cb7ed82a81f8c58b3244 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 20/45] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 90b1444aa6a4f6130f83f75aa86937dc0d970e85 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:23:43 +0200
Subject: [PATCH 21/45] 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 f7b96d5ce942..05602a58a354 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,6 +1428,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 000000000000..bd21975ea3eb
--- /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 000000000000..45c620ee3a25
--- /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 <gottox@voidlinux.org>"
+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 130d689323ccbb1331dfd35c15ef7107a6899830 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:24:42 +0200
Subject: [PATCH 22/45] 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 000000000000..45ec1fe82f87
--- /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 29571876a43c..625977898d88 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 <gottox@voidlinux.org>"
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 77b32e82fac4f018cc8c6641080a8474ad24b3fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 23/45] 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 cd1d201d2dfb..ad860186635c 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 <gottox@voidlinux.org>"
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 b5f7dc57f188173d5909c86020229bfe0fcfa95c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:09:38 +0200
Subject: [PATCH 24/45] 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 625977898d88..bc98027bf9e1 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 7d04c6694f8caf299264dc6b9458c23ff8a42d9d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 25/45] 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 0b7aae2e9efc..83ea29b5a485 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 868f9233305b6b6f092b221de3e3bde7408686fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 26/45] 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 228f202a23b2..d146860639b3 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 588fd22a477d9db83992e42ce51b2ae3b1cca4c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/45] 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 aed625f2f65a..a7b4bda4fa94 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
version=42.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
From 5d8eb2a431e1d1ede282add9cc7a50af877f0994 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/45] 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 571013b24c7d..ea8f2ad81d47 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 fba8df4c1a1b9bfe5c9ffaccdf766f3c8b37ef55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 29/45] 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 c2f76af5604a..e5ad3713e387 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 08db84fef7e5e80c99f2419ee857a85cddbe5dac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 30/45] 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 9e8a2c3824f9..6ae8ed8c7f6f 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 f1b9c5babde4bf76987890b30e78ff427fa7f9ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 31/45] 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 05602a58a354..37fc0d0aa96f 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 ea8f2ad81d47..624c02ead8cb 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 35a1ca782baeda76adc4890e962eedfdb41a3ced Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 32/45] evince: update to 43.0.
* nautilus extension doesn't support nautilus 43
---
srcpkgs/evince/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index d146860639b3..58fac0ca3d4f 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
-version=42.3
-revision=2
+version=43.0
+revision=1
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"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evince"
changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
+checksum=66be0de4b47b1130486103988cc152c04aea95950ba3ef16dc20c2ef6b681d47
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 7d339e48f06e62c589714b36da1c8e43c6dd593d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:28:08 +0200
Subject: [PATCH 33/45] totem: update to 43.0.
---
srcpkgs/totem/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index a7b4bda4fa94..9355803fd539 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
-version=42.0
-revision=2
+version=43.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
@@ -19,7 +19,7 @@ license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Videos"
changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab
+checksum=b36d3655928b5896462a4d39f83b6ad66d37dbc9c99dceb02ea8a2e37394a41e
make_check_pre="xvfb-run"
# XXX xulrunner plugin.
From 15a9fcdf8d36ea69c9d9bebbe937b47614e0c08a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 34/45] 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 1baaf1e1922f..0c929aa19e70 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 76a55b91616326e251edcf2b796fb379afea9e56 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:31:09 +0200
Subject: [PATCH 35/45] rest: update to 0.9.1.
---
srcpkgs/rest/template | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index aa4299c8ffd3..0f575bf41f49 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -1,31 +1,29 @@
# Template file for 'rest'
+# keep in sync with rest3
pkgname=rest
-version=0.8.1
-revision=3
-build_style=gnu-configure
+version=0.9.1
+revision=1
+build_style=meson
build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-static
- --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
-hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
-makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+configure_args="$(vopt_bool gir introspection) -Dexamples=false -Dsoup2=true
+ -Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="pkg-config glib-devel gi-docgen"
+makedepends="libsoup-devel json-glib-devel libxml2-devel"
depends="ca-certificates"
short_desc="RESTful library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+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"
-pre_configure() {
- autoreconf -fi
-}
-
rest-devel_package() {
- depends="rest-${version}_${revision} libglib-devel libsoup-devel
+ depends="rest>=${version}_${revision} libglib-devel libsoup-devel
libxml2-devel"
short_desc+=" - development files"
pkg_install() {
From 2cb41c9793ecaac1e045158901beda5d29e3291c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:41:55 +0200
Subject: [PATCH 36/45] New package: rest3-0.9.1
TODO: solve conflicts with rest
---
common/shlibs | 2 ++
srcpkgs/rest3-devel | 1 +
srcpkgs/rest3/template | 38 ++++++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+)
create mode 120000 srcpkgs/rest3-devel
create mode 100644 srcpkgs/rest3/template
diff --git a/common/shlibs b/common/shlibs
index 37fc0d0aa96f..58858267987e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -875,7 +875,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 rest3-0.9.1_1
librest-extras-0.7.so.0 rest-0.7_1
+librest-extras-1.0.so.0 rest3-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/rest3-devel b/srcpkgs/rest3-devel
new file mode 120000
index 000000000000..07efd50ccfaa
--- /dev/null
+++ b/srcpkgs/rest3-devel
@@ -0,0 +1 @@
+rest3
\ No newline at end of file
diff --git a/srcpkgs/rest3/template b/srcpkgs/rest3/template
new file mode 100644
index 000000000000..22015a264330
--- /dev/null
+++ b/srcpkgs/rest3/template
@@ -0,0 +1,38 @@
+# Template file for 'rest3'
+# keep in sync with rest
+pkgname=rest3
+version=0.9.1
+revision=1
+wrksrc="rest-$version"
+build_style=meson
+build_helper="gir"
+configure_args="$(vopt_bool gir introspection) -Dexamples=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 <orphan@voidlinux.org>"
+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"
+
+rest3-devel_package() {
+ depends="rest>=${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 d9af0693ba0cd03c65c1b6992bb559c97d9dcd5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 37/45] gnome-online-accounts: update to 3.46.0.
---
srcpkgs/gnome-online-accounts/template | 31 +++++++++++++-------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 47085810e534..2797c675d7c3 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,27 +1,26 @@
# 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
+ rest3-devel gcr-devel mit-krb5-devel"
+#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
+# libsoup3-devel mit-krb5-devel rest-devel telepathy-glib-devel libwebkit2gtk41-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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 631fbde3e19ddb71ae265571bfc5b02959772871 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:41 +0200
Subject: [PATCH 38/45] FeedReader: revbump for rest 0.9
---
srcpkgs/FeedReader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/FeedReader/template b/srcpkgs/FeedReader/template
index ab71a0c6f042..c4abf9e04d09 100644
--- a/srcpkgs/FeedReader/template
+++ b/srcpkgs/FeedReader/template
@@ -1,7 +1,7 @@
# Template file for 'FeedReader'
pkgname=FeedReader
version=2.11.0
-revision=2
+revision=3
build_style=meson
hostmakedepends="glib-devel intltool itstool pkg-config vala"
makedepends="gnome-online-accounts-devel gst-plugins-base1-devel json-glib-devel
From 948715cfe1f5ca5cbf7792caa964c06606a7f3d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:41 +0200
Subject: [PATCH 39/45] cawbird: revbump for rest 0.9
---
srcpkgs/cawbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index 85c5d621bcc0..64acf0bdd213 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -1,7 +1,7 @@
# Template file for 'cawbird'
pkgname=cawbird
version=1.3.2
-revision=2
+revision=3
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
From 4ffa788925066ed8c75029709e2eeb44ac07bfd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:41 +0200
Subject: [PATCH 40/45] gfbgraph: revbump for rest 0.9
---
srcpkgs/gfbgraph/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 63c6376122a2..25cf38148f1a 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,7 +1,7 @@
# Template file for 'gfbgraph'
pkgname=gfbgraph
version=0.2.5
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
From a1a746e40950c4a431e42c7d1c5332ae119b224a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:41 +0200
Subject: [PATCH 41/45] gnome-initial-setup: revbump for rest 0.9
---
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 6ae8ed8c7f6f..2183f70404f6 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
+revision=3
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
From 16ab3d528b6d34b0225065842ce45117795970d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:41 +0200
Subject: [PATCH 42/45] gnome-maps: revbump for rest 0.9
---
srcpkgs/gnome-maps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 2aa746f680de..c7fdd489a983 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
version=42.3
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
From 4697e8f9eb9106aeac5e7a0e4ba3db6d086f63e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:42 +0200
Subject: [PATCH 43/45] gnome-recipes: revbump for rest 0.9
---
srcpkgs/gnome-recipes/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template
index 5b87bb4ff935..546388ed6de5 100644
--- a/srcpkgs/gnome-recipes/template
+++ b/srcpkgs/gnome-recipes/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-recipes'
pkgname=gnome-recipes
version=2.0.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config git"
makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel
From af73d77b5c00b3bf16c695c1f1ed2b96a6a561d7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:42 +0200
Subject: [PATCH 44/45] io.elementary.photos: revbump for rest 0.9
---
srcpkgs/io.elementary.photos/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 370f6f5a0ce9..0f620e018a10 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,7 +1,7 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
version=2.7.5
-revision=1
+revision=2
wrksrc="photos-${version}"
build_style=meson
hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
From 221ee931d0a9db811837484808b5af8671c26333 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:43:42 +0200
Subject: [PATCH 45/45] libzapojit: revbump for rest 0.9
---
srcpkgs/libzapojit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template
index c1c1c6091529..703df32ea504 100644
--- a/srcpkgs/libzapojit/template
+++ b/srcpkgs/libzapojit/template
@@ -1,7 +1,7 @@
# Template file for 'libzapojit'
pkgname=libzapojit
version=0.0.3
-revision=9
+revision=10
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
2022-09-28 22:10 ` [PR PATCH] [Updated] " paper42
2022-09-28 22:47 ` paper42
@ 2022-09-28 22:57 ` oreo639
2022-09-28 22:57 ` oreo639
` (54 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-09-28 22:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r982916860
Comment:
Typo
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (2 preceding siblings ...)
2022-09-28 22:57 ` [PR REVIEW] " oreo639
@ 2022-09-28 22:57 ` oreo639
2022-09-28 23:15 ` paper42
` (53 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-09-28 22:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r982917890
Comment:
xdg-desktop-portal-gnome 43.0 is avaliable. (will require xdg-desktop-portal 1.15)
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (3 preceding siblings ...)
2022-09-28 22:57 ` oreo639
@ 2022-09-28 23:15 ` paper42
2022-09-28 23:29 ` oreo639
` (52 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-09-28 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r982933478
Comment:
Can we update it separately or does it need gnome 43?
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (4 preceding siblings ...)
2022-09-28 23:15 ` paper42
@ 2022-09-28 23:29 ` oreo639
2022-09-29 1:41 ` oreo639
` (51 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-09-28 23:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r982939824
Comment:
Ah, you're right, my bad.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (5 preceding siblings ...)
2022-09-28 23:29 ` oreo639
@ 2022-09-29 1:41 ` oreo639
2022-09-29 15:48 ` [PR PATCH] [Updated] " paper42
` (50 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-09-29 1:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r982990092
Comment:
Can you add gdm.d like here:
https://github.com/void-linux/void-packages/pull/39265/commits/6f25ed384ff82aa670571c6759b76e59c4c81a1a
Also, we probably don't need to delete the systemd service files.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (6 preceding siblings ...)
2022-09-29 1:41 ` oreo639
@ 2022-09-29 15:48 ` paper42
2022-09-29 15:48 ` [PR REVIEW] " paper42
` (49 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-09-29 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [ ] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [ ] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [ ] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [ ] evince 43 https://github.com/void-linux/void-packages/pull/39514
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 114044 bytes --]
From 9ffa9f92e6f52c5f654a0a48f28a5adcdd42682f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Sep 2022 18:58:40 +0200
Subject: [PATCH 01/38] New package: mozjs102-102.3.0
---
common/shlibs | 1 +
srcpkgs/mozjs102-devel | 1 +
srcpkgs/mozjs102/patches/001-fix-soname.patch | 26 +++++
| 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 c962f0ab7622..5a3110949373 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3475,6 +3475,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 000000000000..97b7e735a472
--- /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 000000000000..a319d9e975ef
--- /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?= <fzatlouk@redhat.com>
+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
+
--git a/srcpkgs/mozjs102/patches/002-copy-headers.patch b/srcpkgs/mozjs102/patches/002-copy-headers.patch
new file mode 100644
index 000000000000..aafe1aa84bd3
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..c86cca403deb
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..8572c21fd4ec
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..84684250ce4c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch
@@ -0,0 +1,44 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..556bebd257ca
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..054685c1eee2
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..1954a55bf369
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..10b8b16ea7dc
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..5c286647325c
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..814912633217
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/012-fix-musl.patch
@@ -0,0 +1,21 @@
+commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..93e8c83f9337
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch
@@ -0,0 +1,26 @@
+commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4d8918a2a54c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/014-rust-target.patch
@@ -0,0 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..e2b340cd060e
--- /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 000000000000..24075c591ff4
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch
@@ -0,0 +1,35 @@
+commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4a9b0b42a575
--- /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 000000000000..f9f8e0cd7ace
--- /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 <daniel@octaforge.org>
+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 000000000000..831e5e03678d
--- /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 000000000000..5993b50d8999
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch
@@ -0,0 +1,79 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# 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 000000000000..0140da76ddf3
--- /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 <michal@vasilek.cz>"
+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 000000000000..f942fe4f0fc9
--- /dev/null
+++ b/srcpkgs/mozjs102/update
@@ -0,0 +1,2 @@
+site="${MOZILLA_SITE}/firefox/releases/"
+pattern="releases/\K${version%%.*}.*(?=esr/\")"
From 2bede0be55b1574837ffa98dffdda41b50813983 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 02/38] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 61b85dba96b3289a2d80742f57a13b15da59fdba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Sep 2022 23:00:57 -0700
Subject: [PATCH 03/38] 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 5a3110949373..d7fa3b53c534 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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 f21c8fb57e45..fe93c2761305 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<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
+ if constexpr (ViewClass::Adaptor::isFloat) {
+- if (std::isnan(static_cast<double>(*targetOption))) {
++ double targetOptionLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
++ }
+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
+#endif
+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
++ if (std::isnan(targetOptionLittleEndianAsDouble)) {
+ for (; index < length; ++index) {
+- if (std::isnan(static_cast<double>(array[index])))
++ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
++ }
+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ arrayElementLittleEndianAsDouble = static_cast<double>(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 859aa9343694..fdaf19991924 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 4d0776c16840..2f3a555cbcfd 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 618dc43ed4ee..ba02b128b1d1 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 <orphan@voidlinux.org>"
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 443489843acf2b21809ba7fd7e574dafcef90c2c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 04/38] 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 d7fa3b53c534..577cf4820c37 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1027,6 +1027,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 000000000000..e85b363d95de
--- /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 000000000000..6ee1a367c4af
--- /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 <orphan@voidlinux.org>"
+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 752718b49cdc0c7422678386cd5cfe7e75483ae9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/38] 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 577cf4820c37..56cea3597bd0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2965,10 +2965,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 1861675a621e..dd6e4aac5600 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 7738a04d4314dcfc39e71d4315df6c197ba22f1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 06/38] 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 886d388d8aba..144e7da1aa65 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 1b8748661c396e4647eb7eebc3594cdce8a6d28f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 07/38] evolution-data-server: update to 3.46.0.
---
common/shlibs | 19 ++++++++++---------
srcpkgs/evolution-data-server/template | 18 +++++++++---------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 56cea3597bd0..3e8524e9ad97 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 6304e8cc5b34..efb26682bb54 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 <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
+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 e8fb9b73b9423a10286d1d030c262cf171335a80 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/38] 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 a2d7f527c1d8..ef10334fdb4d 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 <gottox@voidlinux.org>"
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 7b5183db71db8642674d1e97b837c6bc237dfa64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 09/38] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 94afc324164c62034c774ccf662142fbeb80493c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 10/38] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 39e5e70e7c81be61f25b9a30ba1896748fad5fb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 11/38] 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 fbc56862bde7..acc873462be6 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 08c4680e0c9a2a2d4a20748b2bfa9c883a0f2601 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 12/38] 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 d9010fb67b46..1c45e275fba9 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 4f82c0f1d745a873307dd4d8908111bd9b6dd59d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 13/38] 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 84ff92b93ae8..d6a5662e0b58 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 3243e96f31b844313d68aa0f94c97294176a4ec0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 14/38] gdm: update to 43.0.
---
srcpkgs/gdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..9a330205f092 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
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 38bd5f79afa2c5232912345fe8e2b508f2ead194 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 15/38] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 beef9b3caa418c46c6c72d0dccdb01081f131355 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 16/38] 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 3e8524e9ad97..f7b96d5ce942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1129,10 +1129,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 d157e14baffb..51f318cc0850 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 <gottox@voidlinux.org>"
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"
+chabgelog="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 2eba4667d9eb366322a937b1b2e92e11fd9f6105 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 17/38] 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 24af1a5094b7..66c4714ec9d0 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 bee2fc16e56902eebafc69079f33238c5d922727 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:58:37 +0200
Subject: [PATCH 18/38] xdg-desktop-portal-gnome: revbump for
evolution-data-server 3.46
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 8002ddcc399c..40fe242269a7 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=42.3
-revision=1
+revision=3
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 0e53e84c5aee4172ba24af48c709e2307771ef50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 19/38] 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 ac49f9c98db4..1ef169a9fbb4 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=1
+revision=2
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
From 1dcd50411ffbd63ec13852d420f5e727d474050b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 20/38] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 afeb65749c6b2d71f9bdcf37e4c78a61a86b60ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:23:43 +0200
Subject: [PATCH 21/38] 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 f7b96d5ce942..05602a58a354 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,6 +1428,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 000000000000..bd21975ea3eb
--- /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 000000000000..45c620ee3a25
--- /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 <gottox@voidlinux.org>"
+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 2db5fcc6f461a1ffb0001bbb64bfffd4d728e77c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:24:42 +0200
Subject: [PATCH 22/38] 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 000000000000..45ec1fe82f87
--- /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 29571876a43c..625977898d88 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 <gottox@voidlinux.org>"
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 1427034fd7df5c328a9ac261346843a8dce8ea38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 23/38] 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 cd1d201d2dfb..ad860186635c 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 <gottox@voidlinux.org>"
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 5e6a96911d188c3779886035d76f850727a5eaeb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:09:38 +0200
Subject: [PATCH 24/38] 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 625977898d88..bc98027bf9e1 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 466719c9565cc987973fb3db66c1c748351b7c8d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 25/38] 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 0b7aae2e9efc..83ea29b5a485 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 23fea3c4dc04ed85c38326e5e540ffbb35840996 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 26/38] 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 228f202a23b2..d146860639b3 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 1a0a37d46471440ed4c616b61520f2319d9795ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/38] 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 aed625f2f65a..a7b4bda4fa94 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
version=42.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
From aac2eba213e59be295c6c8ad542e39145cf4b9de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/38] 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 571013b24c7d..ea8f2ad81d47 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 b32f73d2a5082c58cf6f43cd97c319378741b6f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 29/38] 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 c2f76af5604a..e5ad3713e387 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 f5eb971d1700119ea9b6352084756f5c070ca0e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 30/38] 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 9e8a2c3824f9..6ae8ed8c7f6f 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 10ed3e87b24a0f2f8913f924820a87c59f4b7434 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 31/38] 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 05602a58a354..37fc0d0aa96f 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 ea8f2ad81d47..624c02ead8cb 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 137bfbae4fe23b5a3bd338304fee738e7430c34f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 32/38] evince: update to 43.0.
* nautilus extension doesn't support nautilus 43
---
srcpkgs/evince/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index d146860639b3..58fac0ca3d4f 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
-version=42.3
-revision=2
+version=43.0
+revision=1
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"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evince"
changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
+checksum=66be0de4b47b1130486103988cc152c04aea95950ba3ef16dc20c2ef6b681d47
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From dc943c69dff5701e6368fe2a87b855deeb0129ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:28:08 +0200
Subject: [PATCH 33/38] totem: update to 43.0.
---
srcpkgs/totem/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index a7b4bda4fa94..9355803fd539 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
-version=42.0
-revision=2
+version=43.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
@@ -19,7 +19,7 @@ license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Videos"
changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab
+checksum=b36d3655928b5896462a4d39f83b6ad66d37dbc9c99dceb02ea8a2e37394a41e
make_check_pre="xvfb-run"
# XXX xulrunner plugin.
From c6f373c0f16c5e6203f99531efaaeaa2a3d07d40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 34/38] 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 1baaf1e1922f..0c929aa19e70 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 3e538f2ce9d60f10446d2090ada6c54f7ad41be4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:41:55 +0200
Subject: [PATCH 35/38] 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 37fc0d0aa96f..58858267987e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -875,7 +875,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 rest3-0.9.1_1
librest-extras-0.7.so.0 rest-0.7_1
+librest-extras-1.0.so.0 rest3-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 000000000000..9f3b48034de5
--- /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 000000000000..c113e902e241
--- /dev/null
+++ b/srcpkgs/rest1/template
@@ -0,0 +1,37 @@
+# Template file for 'rest3'
+pkgname=rest3
+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 <orphan@voidlinux.org>"
+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"
+
+rest3-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 2841c201f7088a473e8d9313a907a4d5d3442d4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 36/38] 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 47085810e534..d9f03780a7b9 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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 fe8fbf9508f50feb41708572bc5042d2352fc1e4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 10:57:38 +0200
Subject: [PATCH 37/38] gdm: fixup
---
srcpkgs/gdm/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 9a330205f092..37e7cb828f44 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -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
@@ -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 b9780bb328176ff6e2cfaee7378fdb19ed1d828a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 10:57:42 +0200
Subject: [PATCH 38/38] gnome-desktop: fix typo
---
srcpkgs/gnome-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 51f318cc0850..0622908753aa 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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-43/NEWS"
-chabgelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (7 preceding siblings ...)
2022-09-29 15:48 ` [PR PATCH] [Updated] " paper42
@ 2022-09-29 15:48 ` paper42
2022-09-29 15:48 ` paper42
` (48 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-09-29 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r983719823
Comment:
fixed
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (8 preceding siblings ...)
2022-09-29 15:48 ` [PR REVIEW] " paper42
@ 2022-09-29 15:48 ` paper42
2022-09-30 20:17 ` [PR PATCH] [Updated] " paper42
` (47 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-09-29 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r983719980
Comment:
applied, thanks
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (9 preceding siblings ...)
2022-09-29 15:48 ` paper42
@ 2022-09-30 20:17 ` paper42
2022-10-12 10:04 ` paper42
` (46 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-09-30 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [ ] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [ ] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 118447 bytes --]
From 9ffa9f92e6f52c5f654a0a48f28a5adcdd42682f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Sep 2022 18:58:40 +0200
Subject: [PATCH 01/40] New package: mozjs102-102.3.0
---
common/shlibs | 1 +
srcpkgs/mozjs102-devel | 1 +
srcpkgs/mozjs102/patches/001-fix-soname.patch | 26 +++++
| 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 c962f0ab7622..5a3110949373 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3475,6 +3475,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 000000000000..97b7e735a472
--- /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 000000000000..a319d9e975ef
--- /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?= <fzatlouk@redhat.com>
+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
+
--git a/srcpkgs/mozjs102/patches/002-copy-headers.patch b/srcpkgs/mozjs102/patches/002-copy-headers.patch
new file mode 100644
index 000000000000..aafe1aa84bd3
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..c86cca403deb
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..8572c21fd4ec
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..84684250ce4c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch
@@ -0,0 +1,44 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..556bebd257ca
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..054685c1eee2
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..1954a55bf369
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..10b8b16ea7dc
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..5c286647325c
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..814912633217
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/012-fix-musl.patch
@@ -0,0 +1,21 @@
+commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..93e8c83f9337
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch
@@ -0,0 +1,26 @@
+commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4d8918a2a54c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/014-rust-target.patch
@@ -0,0 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..e2b340cd060e
--- /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 000000000000..24075c591ff4
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch
@@ -0,0 +1,35 @@
+commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4a9b0b42a575
--- /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 000000000000..f9f8e0cd7ace
--- /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 <daniel@octaforge.org>
+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 000000000000..831e5e03678d
--- /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 000000000000..5993b50d8999
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch
@@ -0,0 +1,79 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# 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 000000000000..0140da76ddf3
--- /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 <michal@vasilek.cz>"
+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 000000000000..f942fe4f0fc9
--- /dev/null
+++ b/srcpkgs/mozjs102/update
@@ -0,0 +1,2 @@
+site="${MOZILLA_SITE}/firefox/releases/"
+pattern="releases/\K${version%%.*}.*(?=esr/\")"
From 2bede0be55b1574837ffa98dffdda41b50813983 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 02/40] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 61b85dba96b3289a2d80742f57a13b15da59fdba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Sep 2022 23:00:57 -0700
Subject: [PATCH 03/40] 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 5a3110949373..d7fa3b53c534 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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 000000000000..8ae98428991b
--- /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 f21c8fb57e45..fe93c2761305 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<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
+ if constexpr (ViewClass::Adaptor::isFloat) {
+- if (std::isnan(static_cast<double>(*targetOption))) {
++ double targetOptionLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
++ }
+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
+#endif
+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
++ if (std::isnan(targetOptionLittleEndianAsDouble)) {
+ for (; index < length; ++index) {
+- if (std::isnan(static_cast<double>(array[index])))
++ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
++ }
+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ arrayElementLittleEndianAsDouble = static_cast<double>(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 859aa9343694..fdaf19991924 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 4d0776c16840..2f3a555cbcfd 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 618dc43ed4ee..ba02b128b1d1 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 <orphan@voidlinux.org>"
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 443489843acf2b21809ba7fd7e574dafcef90c2c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 04/40] 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 d7fa3b53c534..577cf4820c37 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1027,6 +1027,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 000000000000..e85b363d95de
--- /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 000000000000..6ee1a367c4af
--- /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 <orphan@voidlinux.org>"
+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 752718b49cdc0c7422678386cd5cfe7e75483ae9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/40] 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 577cf4820c37..56cea3597bd0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2965,10 +2965,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 1861675a621e..dd6e4aac5600 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 7738a04d4314dcfc39e71d4315df6c197ba22f1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 06/40] 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 886d388d8aba..144e7da1aa65 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 1b8748661c396e4647eb7eebc3594cdce8a6d28f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 07/40] evolution-data-server: update to 3.46.0.
---
common/shlibs | 19 ++++++++++---------
srcpkgs/evolution-data-server/template | 18 +++++++++---------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 56cea3597bd0..3e8524e9ad97 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 6304e8cc5b34..efb26682bb54 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 <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
+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 e8fb9b73b9423a10286d1d030c262cf171335a80 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/40] 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 a2d7f527c1d8..ef10334fdb4d 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 <gottox@voidlinux.org>"
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 7b5183db71db8642674d1e97b837c6bc237dfa64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 09/40] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 94afc324164c62034c774ccf662142fbeb80493c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 10/40] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 39e5e70e7c81be61f25b9a30ba1896748fad5fb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 11/40] 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 fbc56862bde7..acc873462be6 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 08c4680e0c9a2a2d4a20748b2bfa9c883a0f2601 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 12/40] 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 d9010fb67b46..1c45e275fba9 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 4f82c0f1d745a873307dd4d8908111bd9b6dd59d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 13/40] 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 84ff92b93ae8..d6a5662e0b58 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 3243e96f31b844313d68aa0f94c97294176a4ec0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 14/40] gdm: update to 43.0.
---
srcpkgs/gdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 3686c70b7404..9a330205f092 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
@@ -23,7 +23,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 38bd5f79afa2c5232912345fe8e2b508f2ead194 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 15/40] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 beef9b3caa418c46c6c72d0dccdb01081f131355 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 16/40] 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 3e8524e9ad97..f7b96d5ce942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1129,10 +1129,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 d157e14baffb..51f318cc0850 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 <gottox@voidlinux.org>"
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"
+chabgelog="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 2eba4667d9eb366322a937b1b2e92e11fd9f6105 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 17/40] 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 24af1a5094b7..66c4714ec9d0 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 bee2fc16e56902eebafc69079f33238c5d922727 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:58:37 +0200
Subject: [PATCH 18/40] xdg-desktop-portal-gnome: revbump for
evolution-data-server 3.46
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 8002ddcc399c..40fe242269a7 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=42.3
-revision=1
+revision=3
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 0e53e84c5aee4172ba24af48c709e2307771ef50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 19/40] 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 ac49f9c98db4..1ef169a9fbb4 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=1
+revision=2
build_style=meson
hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala"
makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel
From 1dcd50411ffbd63ec13852d420f5e727d474050b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 20/40] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 afeb65749c6b2d71f9bdcf37e4c78a61a86b60ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:23:43 +0200
Subject: [PATCH 21/40] 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 f7b96d5ce942..05602a58a354 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,6 +1428,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 000000000000..bd21975ea3eb
--- /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 000000000000..45c620ee3a25
--- /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 <gottox@voidlinux.org>"
+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 2db5fcc6f461a1ffb0001bbb64bfffd4d728e77c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:24:42 +0200
Subject: [PATCH 22/40] 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 000000000000..45ec1fe82f87
--- /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 29571876a43c..625977898d88 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 <gottox@voidlinux.org>"
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 1427034fd7df5c328a9ac261346843a8dce8ea38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 23/40] 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 cd1d201d2dfb..ad860186635c 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 <gottox@voidlinux.org>"
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 5e6a96911d188c3779886035d76f850727a5eaeb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:09:38 +0200
Subject: [PATCH 24/40] 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 625977898d88..bc98027bf9e1 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 466719c9565cc987973fb3db66c1c748351b7c8d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 25/40] 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 0b7aae2e9efc..83ea29b5a485 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 23fea3c4dc04ed85c38326e5e540ffbb35840996 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 26/40] 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 228f202a23b2..d146860639b3 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 1a0a37d46471440ed4c616b61520f2319d9795ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/40] 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 aed625f2f65a..a7b4bda4fa94 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
version=42.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
From aac2eba213e59be295c6c8ad542e39145cf4b9de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/40] 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 571013b24c7d..ea8f2ad81d47 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 b32f73d2a5082c58cf6f43cd97c319378741b6f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 29/40] 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 c2f76af5604a..e5ad3713e387 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 f5eb971d1700119ea9b6352084756f5c070ca0e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 30/40] 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 9e8a2c3824f9..6ae8ed8c7f6f 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 10ed3e87b24a0f2f8913f924820a87c59f4b7434 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 31/40] 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 05602a58a354..37fc0d0aa96f 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 ea8f2ad81d47..624c02ead8cb 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 137bfbae4fe23b5a3bd338304fee738e7430c34f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 32/40] evince: update to 43.0.
* nautilus extension doesn't support nautilus 43
---
srcpkgs/evince/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index d146860639b3..58fac0ca3d4f 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
-version=42.3
-revision=2
+version=43.0
+revision=1
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"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evince"
changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e
+checksum=66be0de4b47b1130486103988cc152c04aea95950ba3ef16dc20c2ef6b681d47
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From dc943c69dff5701e6368fe2a87b855deeb0129ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:28:08 +0200
Subject: [PATCH 33/40] totem: update to 43.0.
---
srcpkgs/totem/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index a7b4bda4fa94..9355803fd539 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,7 +1,7 @@
# Template file for 'totem'
pkgname=totem
-version=42.0
-revision=2
+version=43.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Denable-python=no"
@@ -19,7 +19,7 @@ license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Videos"
changelog="https://gitlab.gnome.org/GNOME/totem/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4af0491ddb95df8b33aee399d3a50f9c7ab17de88d3af63356567cf88f57e6ab
+checksum=b36d3655928b5896462a4d39f83b6ad66d37dbc9c99dceb02ea8a2e37394a41e
make_check_pre="xvfb-run"
# XXX xulrunner plugin.
From c6f373c0f16c5e6203f99531efaaeaa2a3d07d40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 34/40] 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 1baaf1e1922f..0c929aa19e70 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 3e538f2ce9d60f10446d2090ada6c54f7ad41be4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:41:55 +0200
Subject: [PATCH 35/40] 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 37fc0d0aa96f..58858267987e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -875,7 +875,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 rest3-0.9.1_1
librest-extras-0.7.so.0 rest-0.7_1
+librest-extras-1.0.so.0 rest3-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 000000000000..9f3b48034de5
--- /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 000000000000..c113e902e241
--- /dev/null
+++ b/srcpkgs/rest1/template
@@ -0,0 +1,37 @@
+# Template file for 'rest3'
+pkgname=rest3
+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 <orphan@voidlinux.org>"
+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"
+
+rest3-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 2841c201f7088a473e8d9313a907a4d5d3442d4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 36/40] 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 47085810e534..d9f03780a7b9 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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 fe8fbf9508f50feb41708572bc5042d2352fc1e4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 10:57:38 +0200
Subject: [PATCH 37/40] gdm: fixup
---
srcpkgs/gdm/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 9a330205f092..37e7cb828f44 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -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
@@ -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 b9780bb328176ff6e2cfaee7378fdb19ed1d828a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 10:57:42 +0200
Subject: [PATCH 38/40] gnome-desktop: fix typo
---
srcpkgs/gnome-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 51f318cc0850..0622908753aa 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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-43/NEWS"
-chabgelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
From fdc5f871faf8b4e393703d54b93f8e3934d6611b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:42:51 +0200
Subject: [PATCH 39/40] vte3: update to 0.70.0, build gtk4 library
---
common/shlibs | 1 +
srcpkgs/vte3/template | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 58858267987e..590188c1d67e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -828,6 +828,7 @@ libXevie.so.1 libXevie-1.0.2_1
libatspi.so.0 at-spi2-core-1.91.91_1
libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
libvte-2.91.so.0 vte3-0.68.0_1
+libvte-2.91-gtk4.so.0 vte3-0.70.0_1
libpipeline.so.1 libpipeline-1.2.0_1
libosp.so.5 opensp-1.5.2_1
libogrove.so.0 openjade-1.3.2_1
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index aaaa69bfe51f..da79eaecc861 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,21 +1,21 @@
# Template file for 'vte3'
pkgname=vte3
-version=0.68.0
-revision=2
+version=0.70.0
+revision=1
wrksrc="vte-${version}"
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
- $(vopt_bool gir gir) $(vopt_bool gir vapi)"
-hostmakedepends="glib-devel gperf intltool pkg-config
+ $(vopt_bool gir gir) $(vopt_bool gir vapi) -Dgtk4=true"
+hostmakedepends="glib-devel gperf gettext pkg-config
$(vopt_if gir vala)"
-makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if gir vala-devel)"
+makedepends="gnutls-devel gtk4-devel gtk+3-devel pcre2-devel $(vopt_if gir vala-devel)"
short_desc="Terminal widget with improved accessibility and I18N support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
+checksum=93e0dd4a1bc2a7a1a62da64160a274cce456976ea1567d98591da96e2d265ae6
# Suppress warnings as errors for NULL format strings (musl libc)
CXXFLAGS="-Wno-error=format="
@@ -29,7 +29,7 @@ pre_build() {
}
vte3-devel_package() {
- depends="gnutls-devel gtk+3-devel pcre2-devel vte3>=${version}_${revision}"
+ depends="libglib-devel gtk4-devel gtk+3-devel pango-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From df025b6484aa2001d3b25238e437215cb7e720da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 40/40] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..b0efbe4a436e 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-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 <oreo6391@gmail.org>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/console"
-changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-42/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7d26e6c18744c575a787293263f60ceff630107098e9e58a7765b00ac7437049
+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
}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (10 preceding siblings ...)
2022-09-30 20:17 ` [PR PATCH] [Updated] " paper42
@ 2022-10-12 10:04 ` paper42
2022-10-26 19:06 ` paper42
` (45 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-10-12 10:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [ ] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [ ] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 157440 bytes --]
From fd417a42ad2a2dfe0477c1d072f4926a9cd20e74 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 +++++
| 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?= <fzatlouk@redhat.com>
+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
+
--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?= <fzatlouk@redhat.com>
+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?= <fzatlouk@redhat.com>
+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 <smcv@debian.org>
+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 <smcv@debian.org>
+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?= <fzatlouk@redhat.com>
+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?= <fzatlouk@redhat.com>
+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?= <fzatlouk@redhat.com>
+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?= <fzatlouk@redhat.com>
+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?= <fzatlouk@redhat.com>
+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 <daniel@octaforge.org>
+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 <daniel@octaforge.org>
+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 <daniel@octaforge.org>
+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 <daniel@octaforge.org>
+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 <daniel@octaforge.org>
+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 <mh+mozilla@glandium.org>
+# 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 <michal@vasilek.cz>"
+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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
@@ -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 <oreo6391@gmail.com>
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<double>(*targetOption))) {
-+ double targetOptionLittleEndianAsDouble;
+ if constexpr (ViewClass::Adaptor::isFloat) {
+- if (std::isnan(static_cast<double>(*targetOption))) {
++ double targetOptionLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ targetOptionLittleEndianAsDouble = static_cast<double>(flipBytes(*targetOption));
++ }
+#else
-+ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
++ targetOptionLittleEndianAsDouble = static_cast<double>(*targetOption);
+#endif
+
-+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
-- if (std::isnan(static_cast<double>(array[index])))
-+ double arrayElementLittleEndianAsDouble;
++ if (std::isnan(targetOptionLittleEndianAsDouble)) {
+ for (; index < length; ++index) {
+- if (std::isnan(static_cast<double>(array[index])))
++ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
-+ switch (ViewClass::TypedArrayStorageType) {
-+ case TypeFloat32:
-+ case TypeFloat64:
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
-+ default:
-+ // typed array views are commonly expected to be little endian views of the underlying data
-+ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
-+ }
++ switch (ViewClass::TypedArrayStorageType) {
++ case TypeFloat32:
++ case TypeFloat64:
++ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ default:
++ // typed array views are commonly expected to be little endian views of the underlying data
++ arrayElementLittleEndianAsDouble = static_cast<double>(flipBytes(array[index]));
++ }
+#else
-+ arrayElementLittleEndianAsDouble = static_cast<double>(array[index]);
++ arrayElementLittleEndianAsDouble = static_cast<double>(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 <orphan@voidlinux.org>"
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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
+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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <masaj@gmx.com>"
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <leio@gentoo.org>
-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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
+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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
+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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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 <michal@vasilek.cz>
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 <oreo6391@gmail.org>"
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 <michal@vasilek.cz>
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 <pierre.labastie@neuf.fr>
-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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 <ricotz@ubuntu.com>
-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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
-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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
@@ -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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
-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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
@@ -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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <eschwartz@archlinux.org>
-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 <mail@jensge.org>
-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<ImportSource> import_list = new Gee.ArrayList<ImportSource>();
-
-- 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 <mail@jensge.org>
-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 <mail@jensge.org>
-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 <mail@jensge.org>
-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 <mail@jensge.org>
-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 <mail@jensge.org>
-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 <ricotz@ubuntu.com>
-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 <gottox@voidlinux.org>"
@@ -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 <michal@vasilek.cz>
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 <gottox@voidlinux.org>"
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
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (11 preceding siblings ...)
2022-10-12 10:04 ` paper42
@ 2022-10-26 19:06 ` paper42
2022-11-03 21:38 ` [PR REVIEW] " oreo639
` (44 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-10-26 19:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1717 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [ ] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [ ] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 102723 bytes --]
From 2c704985d4121d69659e3a052664a1280531e47d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Sep 2022 18:58:40 +0200
Subject: [PATCH 01/34] New package: mozjs102-102.3.0
---
common/shlibs | 1 +
srcpkgs/mozjs102-devel | 1 +
srcpkgs/mozjs102/patches/001-fix-soname.patch | 26 +++++
| 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 0ecf4f7437f7..9e6326b8bb87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3484,6 +3484,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 000000000000..97b7e735a472
--- /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 000000000000..a319d9e975ef
--- /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?= <fzatlouk@redhat.com>
+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
+
--git a/srcpkgs/mozjs102/patches/002-copy-headers.patch b/srcpkgs/mozjs102/patches/002-copy-headers.patch
new file mode 100644
index 000000000000..aafe1aa84bd3
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..c86cca403deb
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..8572c21fd4ec
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/004-icu-sources-data-py-decouple.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..84684250ce4c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/005-icu-sources-data-write-command-stderr.patch
@@ -0,0 +1,44 @@
+From: Simon McVittie <smcv@debian.org>
+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 000000000000..556bebd257ca
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..054685c1eee2
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..1954a55bf369
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..10b8b16ea7dc
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..5c286647325c
--- /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?= <fzatlouk@redhat.com>
+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 000000000000..814912633217
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/012-fix-musl.patch
@@ -0,0 +1,21 @@
+commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..93e8c83f9337
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/013-disable-spidermonkey-jslint.patch
@@ -0,0 +1,26 @@
+commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4d8918a2a54c
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/014-rust-target.patch
@@ -0,0 +1,28 @@
+commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..e2b340cd060e
--- /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 000000000000..24075c591ff4
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/017-no-lto-readelf.patch
@@ -0,0 +1,35 @@
+commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
+Author: Daniel Kolesa <daniel@octaforge.org>
+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 000000000000..4a9b0b42a575
--- /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 000000000000..f9f8e0cd7ace
--- /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 <daniel@octaforge.org>
+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 000000000000..831e5e03678d
--- /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 000000000000..5993b50d8999
--- /dev/null
+++ b/srcpkgs/mozjs102/patches/use-fallback-atomic-operations-on-armv6.patch
@@ -0,0 +1,79 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# 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 000000000000..0140da76ddf3
--- /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 <michal@vasilek.cz>"
+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 000000000000..f942fe4f0fc9
--- /dev/null
+++ b/srcpkgs/mozjs102/update
@@ -0,0 +1,2 @@
+site="${MOZILLA_SITE}/firefox/releases/"
+pattern="releases/\K${version%%.*}.*(?=esr/\")"
From 12c86b6d2bdae6f5cf6ffff26f09c8ad75f694f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 02/34] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 6349cb4586fc7108efa81aa43b02351ae81253ba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 03/34] 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 9e6326b8bb87..1536f89e6dd9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1031,6 +1031,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 000000000000..e85b363d95de
--- /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 000000000000..6ee1a367c4af
--- /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 <orphan@voidlinux.org>"
+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 8cd8b76caf0cdd78922fe52d2c7430e040d6305b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 04/34] 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 1536f89e6dd9..a14774e09e60 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2971,10 +2971,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 1861675a621e..dd6e4aac5600 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 d7755617ad562b7f50279d59f4db0bf8cc87433c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 05/34] 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 886d388d8aba..144e7da1aa65 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 d30fafbc152c9c964c30edfd816461a19827ee22 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 06/34] 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 a14774e09e60..5c42d3719e0d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -599,21 +599,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 6304e8cc5b34..a6fc89cfdb1d 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 <gottox@voidlinux.org>"
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 ebb0cc9e162122cda0a84581910a601fc3eca2e4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 07/34] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 b50f214a901e416c97915de25b1864cfadb59fcc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 08/34] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 b481f95f0c531a9aa933f55cac96377b234b126a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/34] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 22ec3b3936c6bf9d9d764b8bb0e0720f07755725 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 10/34] 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 fbc56862bde7..acc873462be6 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 bbf465fc4e8a371989cb7492306904c8e048016f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 11/34] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 3a417a1da6b8fb17e02d4185b7598bc1ba3e13c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 12/34] 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 84ff92b93ae8..d6a5662e0b58 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 48c3747a876035d5c7ff4929054a2009497ccb32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 13/34] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 3d59c240623a7675fddfc41b41541d679b5eb22f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 14/34] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 ac682c5bfc8387050bec21428f5059d4f6273e8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 15/34] 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 5c42d3719e0d..785e26f1bf53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,10 +1133,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 d157e14baffb..0622908753aa 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 <gottox@voidlinux.org>"
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 67bc619936f5f17b0f77c2082f5c9669345af5fe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 16/34] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 250acf8b39dd36f96fcca44952fe8a4ed37f3628 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 17/34] 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 64ecf75826b7..4ee3cbced47f 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 10ee57c42a96260695cf80a7734827194b0bb564 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 18/34] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 af13e5fce8e65eea66ba62a01c22fdb6e468dc74 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 19/34] 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 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 7bdc688dc513b2f647d5cda664b8953aaa07a047 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/34] 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 0b7aae2e9efc..83ea29b5a485 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 07416730a3065e635dc6aa8e121d45d252a8332b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/34] 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 730fb3c5f6d1..43ab670861c9 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 aee218022e6e823cd2b6eed3ae991f2bc9a98b33 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 22/34] 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 0eb8af318ac2..b481d520e2a2 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 9f35b3d54611d484987e438d5b9d69bb647462e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 23/34] 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 571013b24c7d..ea8f2ad81d47 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 00e4faa98ef8f15ef485ce861bd381f4de0620e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 24/34] 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 9197dbbcbd46..7ce5da3a10cb 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 562ea05eefe2577652dfff3d6df9fba7060bdbc6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 25/34] 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 785e26f1bf53..712fe8c955f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -670,7 +670,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 ea8f2ad81d47..624c02ead8cb 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 0088020ed36f230f31a4e8d54a8453707f6ed398 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 26/34] 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 43ab670861c9..7ffa8e3a33b0 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 71688c479386c7fd2bc0335987a6a6a9f106bcfc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 27/34] 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 1baaf1e1922f..0c929aa19e70 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 1386dbb83fb673904df9ac8737030e725af14054 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 28/34] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 49a218c4ab17b48dd44f70845f8116b8bf636e7d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 29/34] 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 7e09b6cc9945..3b3d80f4f538 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 <oreo6391@gmail.org>"
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 0430e3a3dbc53cfbf8e1b73356234dd7356fec37 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 30/34] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From cf1d80855b5cb5930663eaa1ac33af41fd8079bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 31/34] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 8dc271f412e81881c4f65eb97994ae4cefe3e500 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 32/34] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From 4164ffe04fbe2f9abea368f0db27c165bde8f9aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 33/34] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 c412c4d121d8053f8eb5ffe9b6fdba635bef4fa7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:22:19 +0200
Subject: [PATCH 34/34] 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 435daf6485d1..7e129c596bcc 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 <gottox@voidlinux.org>"
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
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (12 preceding siblings ...)
2022-10-26 19:06 ` paper42
@ 2022-11-03 21:38 ` oreo639
2022-11-03 21:38 ` oreo639
` (43 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-03 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r1013420063
Comment:
Can you change this to oreo639@gmail.com.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (13 preceding siblings ...)
2022-11-03 21:38 ` [PR REVIEW] " oreo639
@ 2022-11-03 21:38 ` oreo639
2022-11-22 19:17 ` oreo639
` (42 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-03 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r1013420063
Comment:
Can you change this to gmail.com.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (14 preceding siblings ...)
2022-11-03 21:38 ` oreo639
@ 2022-11-22 19:17 ` oreo639
2022-11-22 19:19 ` oreo639
` (41 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-22 19:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r1029734173
Comment:
gcr 4.0.0 is out now https://gitlab.gnome.org/GNOME/gcr/-/tree/4.0.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (15 preceding siblings ...)
2022-11-22 19:17 ` oreo639
@ 2022-11-22 19:19 ` oreo639
2022-11-22 21:11 ` [PR PATCH] [Updated] " paper42
` (40 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-22 19:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r1029734173
Comment:
gcr 4.0.0 is out https://gitlab.gnome.org/GNOME/gcr/-/tree/4.0.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (16 preceding siblings ...)
2022-11-22 19:19 ` oreo639
@ 2022-11-22 21:11 ` paper42
2022-11-22 21:54 ` paper42
` (39 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-11-22 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1784 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [x] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [x] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
- [ ] gcr4 https://github.com/void-linux/void-packages/pull/40701
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 62834 bytes --]
From be19f5f36a7d2dbd0c5f574ed00fe7ac9ea991b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 01/33] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 451c35bc173f82f484a975d926381b45d5746773 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 02/33] New package: gcr4-4.0.0
---
common/shlibs | 2 ++
srcpkgs/gcr4-devel | 1 +
srcpkgs/gcr4/template | 43 +++++++++++++++++++++++++++++++++++++++++++
srcpkgs/gcr4/update | 1 +
4 files changed, 47 insertions(+)
create mode 120000 srcpkgs/gcr4-devel
create mode 100644 srcpkgs/gcr4/template
create mode 100644 srcpkgs/gcr4/update
diff --git a/common/shlibs b/common/shlibs
index 37895879b1ba..0338579188c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1036,6 +1036,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.0.0 gcr4-4.0.0_1
+libgcr-4.so.0.0.0 gcr4-4.0.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 000000000000..e85b363d95de
--- /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 000000000000..c088e87bc16f
--- /dev/null
+++ b/srcpkgs/gcr4/template
@@ -0,0 +1,43 @@
+# Template file for 'gcr4'
+pkgname=gcr4
+version=4.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+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="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 <orphan@voidlinux.org>"
+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=c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
+make_check_pre="dbus-run-session"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+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
+ }
+}
diff --git a/srcpkgs/gcr4/update b/srcpkgs/gcr4/update
new file mode 100644
index 000000000000..81e9823e570d
--- /dev/null
+++ b/srcpkgs/gcr4/update
@@ -0,0 +1 @@
+pkgname="gcr"
From 2e6f2ba2db011656de4954b1e6374d2151a1387b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 03/33] 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 0338579188c7..15f873d92491 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2978,10 +2978,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 1861675a621e..dd6e4aac5600 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 0f22187eab314b594771aeac212e7550e912ad17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 04/33] 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 886d388d8aba..144e7da1aa65 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 283d05235273b862fe8eb747293a7c7e863b319a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 05/33] 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 15f873d92491..b7c5a1335b2f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..a6fc89cfdb1d 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 <gottox@voidlinux.org>"
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 1b69a79d914f29fa2140ac4ddad4131baa2c24e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/33] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 72ae36c488abe2730bd16e79bef0cdef214f5cb6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/33] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 650fac08480d4c79c49956e035f39bfeaa46344f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/33] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 c9ed632ea039a8a2aba43fd0354c2cafd39b4034 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/33] 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 fbc56862bde7..acc873462be6 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 28c096cd01cbd81c79b5b96eaec288ca2b2a98a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/33] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 7f57da942d3f4edac1f2049a0aabcd6a319e8105 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/33] 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 84ff92b93ae8..d6a5662e0b58 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 f40a3d28693426548ad566c032c93bfb5d16cf61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 12/33] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 28924dc7fd9dfade6dd9f5f7974b5e5f06bf4fdd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 13/33] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 3276699110504bb5a620450e261306c32ee287fe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 14/33] 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 b7c5a1335b2f..07f7dc0fea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1138,10 +1138,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 d157e14baffb..0622908753aa 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 <gottox@voidlinux.org>"
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 906d712881ef74452fb704d527dcd537ac81f686 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 15/33] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 686c63d34c8eeea831f613b0ffb80c8f1ce0503a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 16/33] 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 64ecf75826b7..4ee3cbced47f 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 9659c05c334a4612d63c1fd7092449b45862052b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/33] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 a315f8f155690ba2416c0a90f4f8c5b90a468baa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 18/33] 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 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 61dda9f7d2ec99fce98bd5f903e4192af00af6cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/33] 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 0b7aae2e9efc..83ea29b5a485 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 15fcc9cc78dfd512a9d5de8abdb214d372f70096 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/33] 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 730fb3c5f6d1..43ab670861c9 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 c19eda61a66b094bc99898f8f1c4c2241dad836d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/33] 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 0eb8af318ac2..b481d520e2a2 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 79a0c5adfa438bdc5e84e086748873935ca5a416 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 22/33] 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 571013b24c7d..ea8f2ad81d47 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 5cbae35fc21604969e4c45773526fb5c4c80b4f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 23/33] 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 9197dbbcbd46..7ce5da3a10cb 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 02cc371312b724554769901edb2af8371d276e93 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 24/33] 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 07f7dc0fea0a..6bebe3b6402e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 b6e0fbdd331c80f4ce04c663731dad47acabf605 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 25/33] 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 43ab670861c9..7ffa8e3a33b0 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 11a2507810ba90ae26620e565aa3ef932931658e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 26/33] 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 1baaf1e1922f..0c929aa19e70 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 adcc675eb42b2118c6dbcb2b2d438e1b1d63a547 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 27/33] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 30258e2bbfc7b991fc5ecbf0e05210ea2c9b6f5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 28/33] 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 7e09b6cc9945..3b3d80f4f538 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 <oreo6391@gmail.org>"
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 0dd15200d7e298f71425ddd1350bb8762069d560 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 29/33] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 604a845441b6024b1fe6c2c8598c38f3595485aa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 30/33] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 fcfdf2f57e4af67bf54f111231decc6bef6dabe9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 31/33] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From 83a714339e8bc2b574e1812fe9d24ece729c2f48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 32/33] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 8ce21e5313bf4b12b1499d0ba049e9d0565b75d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Nov 2022 22:09:44 +0100
Subject: [PATCH 33/33] gnome-console: update to 43.0.
---
srcpkgs/gnome-console/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 3b3d80f4f538..c041023d594b 100644
--- a/srcpkgs/gnome-console/template
+++ b/srcpkgs/gnome-console/template
@@ -9,7 +9,7 @@ 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/console"
changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-43/NEWS"
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (17 preceding siblings ...)
2022-11-22 21:11 ` [PR PATCH] [Updated] " paper42
@ 2022-11-22 21:54 ` paper42
2022-11-23 1:38 ` [PR REVIEW] " oreo639
` (38 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-11-22 21:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [x] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [x] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
- [ ] gcr4 https://github.com/void-linux/void-packages/pull/40701
- [ ] gjs 2.74 https://github.com/void-linux/void-packages/pull/40702
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 61919 bytes --]
From 6cd0f2a272a6fef3a9bb907f944bcebc294aee3f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 01/32] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 4dc113379c28f9d57c263569fabd4377888709ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 02/32] New package: gcr4-4.0.0
---
common/shlibs | 2 ++
srcpkgs/gcr4-devel | 1 +
srcpkgs/gcr4/template | 43 +++++++++++++++++++++++++++++++++++++++++++
srcpkgs/gcr4/update | 1 +
4 files changed, 47 insertions(+)
create mode 120000 srcpkgs/gcr4-devel
create mode 100644 srcpkgs/gcr4/template
create mode 100644 srcpkgs/gcr4/update
diff --git a/common/shlibs b/common/shlibs
index 37895879b1ba..0338579188c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1036,6 +1036,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.0.0 gcr4-4.0.0_1
+libgcr-4.so.0.0.0 gcr4-4.0.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 000000000000..e85b363d95de
--- /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 000000000000..c088e87bc16f
--- /dev/null
+++ b/srcpkgs/gcr4/template
@@ -0,0 +1,43 @@
+# Template file for 'gcr4'
+pkgname=gcr4
+version=4.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+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="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 <orphan@voidlinux.org>"
+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=c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
+make_check_pre="dbus-run-session"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+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
+ }
+}
diff --git a/srcpkgs/gcr4/update b/srcpkgs/gcr4/update
new file mode 100644
index 000000000000..81e9823e570d
--- /dev/null
+++ b/srcpkgs/gcr4/update
@@ -0,0 +1 @@
+pkgname="gcr"
From 420ebb4634b3b037a810240530bb5584728602ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 03/32] 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 0338579188c7..15f873d92491 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2978,10 +2978,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..dd6e4aac5600 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-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 2033d1b853365bbaf3cd0ef9c0d7f98927520e47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 04/32] 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 7621c5fa8ee1..144e7da1aa65 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.6
+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=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
do_check() {
mkdir /tmp/gnome-shell-xdg
From 0d52b1f163d21c524f43d31fde1dc09a0b914275 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 05/32] 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 15f873d92491..b7c5a1335b2f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..a6fc89cfdb1d 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 <gottox@voidlinux.org>"
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 b4352d94f9d589fcf696f6b1e3ddaafd21ae9600 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/32] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 a3494e9ead21dc744707ceb51a4bc7c51d261004 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/32] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 d7905a628c304566a1b57269947da455be0390a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/32] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 24e2cc3b255fc38a7fc5d2b4f64c812de1edb1e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/32] 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 fbc56862bde7..acc873462be6 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 7a89b0a754f983b4bce1acd6c517a333e0484356 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/32] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 c58e1b886ad6a5d9095cada7a6175539f04be448 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/32] 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 84ff92b93ae8..d6a5662e0b58 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 22d5bcd15e4d4a0ce16fe6c56f75a39ae9426c29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 12/32] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 773258b11e0ff1be2f397d6b35e3740e7c4f8bbb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 13/32] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 3203a7c961f684db2ccf096b40dc137457e43074 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 14/32] 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 b7c5a1335b2f..07f7dc0fea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1138,10 +1138,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..0622908753aa 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.6
+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 <gottox@voidlinux.org>"
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=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 5a267553ee6cce3d9e20d40d82ecd28e4024ea0e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 15/32] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 b095cfa4b667b1911c82e7bd62419de82f986df8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 16/32] 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 64ecf75826b7..4ee3cbced47f 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 fad6a9bc2383bf13bfba09841c124fddfd92be9d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/32] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 cecb583d6cb280e77b7e3ddca5f1b8cfe78c1c64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 18/32] 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 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 848b2cedf0125d0543650aaf1c736d97943cfff7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/32] 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 0b7aae2e9efc..83ea29b5a485 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 403975d7b4aee7423e48fda5bae4e2f089be03c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/32] 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 730fb3c5f6d1..43ab670861c9 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 6e3152337c2fc8ccb5ff6b0c6184d850e86284ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/32] 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 0eb8af318ac2..b481d520e2a2 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 f518d33f5508bef1cdc1607b0de47031dec132ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 22/32] 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 571013b24c7d..ea8f2ad81d47 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 079f546245973588bbd3ca2163d2d5048e45716a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 23/32] 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 9197dbbcbd46..7ce5da3a10cb 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 4679674b8265878baaff15fb4243dc744c3da7f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 24/32] 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 07f7dc0fea0a..6bebe3b6402e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 71da3bb8545be004090a1085972654fd281e6279 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 25/32] 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 43ab670861c9..7ffa8e3a33b0 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 7a2e34ec105ecb350c3c5f35fde0c64aed37de6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 26/32] 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 1baaf1e1922f..0c929aa19e70 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 fc789692953e39862704cf9c14a0b06ab3aba2e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 27/32] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 3cbce69ca445c5d709c92c4331392d210fe7b462 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 28/32] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 214c7b10db3dc2fef771f400dabc3dd9c0cdbfc5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 29/32] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From d6e3126d214f273f26af31cff1c3134edc844c01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 30/32] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 260c3068ae9746cf64a7c2044db6eb3f57e765a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 31/32] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From 4c0029bb3d95ef5b9f44f220b62759916ac72d3c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 32/32] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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"
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (18 preceding siblings ...)
2022-11-22 21:54 ` paper42
@ 2022-11-23 1:38 ` oreo639
2022-11-23 1:39 ` oreo639
` (37 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 1:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r1029957668
Comment:
I think this is supposed to be libwebkit2gtk50-devel
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (19 preceding siblings ...)
2022-11-23 1:38 ` [PR REVIEW] " oreo639
@ 2022-11-23 1:39 ` oreo639
2022-11-23 1:59 ` oreo639
` (36 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
(I haven't tested it yet though)
Also, xdg-desktop-portal-gnome needs to be revbumped.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (20 preceding siblings ...)
2022-11-23 1:39 ` oreo639
@ 2022-11-23 1:59 ` oreo639
2022-11-23 2:00 ` oreo639
` (35 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
(I haven't tested it yet though)
Also, xdg-desktop-portal-gnome needs to be revbumped.
Also, gnome-shell-extensions probably should be updated.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (21 preceding siblings ...)
2022-11-23 1:59 ` oreo639
@ 2022-11-23 2:00 ` oreo639
2022-11-23 2:01 ` oreo639
` (34 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
(I haven't tested it yet though)
Also, xdg-desktop-portal-gnome needs to be revbumped.
Also, gnome-shell-extensions probably should be updated.
(and the latest version of gnome-shell/mutter is 43.1)
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (22 preceding siblings ...)
2022-11-23 2:00 ` oreo639
@ 2022-11-23 2:01 ` oreo639
2022-11-23 6:04 ` oreo639
` (33 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
Also, xdg-desktop-portal-gnome needs to be revbumped.
Also, gnome-shell-extensions probably should be updated.
(and the latest version of gnome-shell/mutter is 43.1)
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (23 preceding siblings ...)
2022-11-23 2:01 ` oreo639
@ 2022-11-23 6:04 ` oreo639
2022-11-23 6:04 ` oreo639
` (32 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 6:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 577 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
Also, xdg-desktop-portal-gnome needs to be revbumped.
Also, gnome-shell-extensions probably should be updated.
(and the latest version of gnome-shell/mutter is 43.1)
I also noticed a build failure for gnome-console related to an issue with the vte3 package: https://github.com/void-linux/void-packages/pull/40707
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (24 preceding siblings ...)
2022-11-23 6:04 ` oreo639
@ 2022-11-23 6:04 ` oreo639
2022-11-23 17:39 ` oreo639
` (31 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 6:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
Also, xdg-desktop-portal-gnome needs to be revbumped.
Also, gnome-shell-extensions probably should be updated.
(and the latest version of gnome-shell/mutter is 43.1)
I also noticed a build failure for gnome-console related to an issue with the vte3 package. (Should be fixed by https://github.com/void-linux/void-packages/pull/40707)
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (25 preceding siblings ...)
2022-11-23 6:04 ` oreo639
@ 2022-11-23 17:39 ` oreo639
2022-11-23 20:08 ` [PR PATCH] [Updated] " paper42
` (30 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-11-23 17:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
xdg-desktop-portal-gnome needs to be revbumped.
The latest version of gnome-shell/mutter is 43.1.
Also, gnome-shell-extensions probably should be updated.
I also noticed a build failure for gnome-console related to an issue with the vte3 package. (Should be fixed by https://github.com/void-linux/void-packages/pull/40707)
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (26 preceding siblings ...)
2022-11-23 17:39 ` oreo639
@ 2022-11-23 20:08 ` paper42
2022-12-02 7:27 ` oreo639
` (29 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-11-23 20:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [x] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [x] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
- [ ] gcr4 https://github.com/void-linux/void-packages/pull/40701
- [x] gjs 2.74 https://github.com/void-linux/void-packages/pull/40702
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 95479 bytes --]
From d60dcbb5a0fecff013977f635ff2ddb0c5750a78 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 01:30:26 +0200
Subject: [PATCH 01/55] 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 682a4f72e419..1ddc35a718fc 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 <gottox@voidlinux.org>"
@@ -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 1e0bc6aea60c8fbcb3c213e6560d0a172e40240d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 02/55] New package: gcr4-4.0.0
---
common/shlibs | 2 ++
srcpkgs/gcr4-devel | 1 +
srcpkgs/gcr4/template | 43 +++++++++++++++++++++++++++++++++++++++++++
srcpkgs/gcr4/update | 1 +
4 files changed, 47 insertions(+)
create mode 120000 srcpkgs/gcr4-devel
create mode 100644 srcpkgs/gcr4/template
create mode 100644 srcpkgs/gcr4/update
diff --git a/common/shlibs b/common/shlibs
index d9fc6ca08507..e6543ebce0e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1036,6 +1036,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.0.0 gcr4-4.0.0_1
+libgcr-4.so.0.0.0 gcr4-4.0.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 000000000000..e85b363d95de
--- /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 000000000000..c088e87bc16f
--- /dev/null
+++ b/srcpkgs/gcr4/template
@@ -0,0 +1,43 @@
+# Template file for 'gcr4'
+pkgname=gcr4
+version=4.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+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="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 <orphan@voidlinux.org>"
+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=c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
+make_check_pre="dbus-run-session"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+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
+ }
+}
diff --git a/srcpkgs/gcr4/update b/srcpkgs/gcr4/update
new file mode 100644
index 000000000000..81e9823e570d
--- /dev/null
+++ b/srcpkgs/gcr4/update
@@ -0,0 +1 @@
+pkgname="gcr"
From fe41fd8ae4b9b89ebfa69be3d51b14fb51c63831 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 03/55] 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 e6543ebce0e0..d97ad0c5bf54 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2978,10 +2978,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..dd6e4aac5600 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-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 06e3e4245fca3a6f4f72f1113b220449dc24e262 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 04/55] 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 7621c5fa8ee1..144e7da1aa65 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.6
+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=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
do_check() {
mkdir /tmp/gnome-shell-xdg
From e9f441d360a4fa4208f0fbe1213b4fdbc453657e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 05/55] 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 d97ad0c5bf54..b392073891a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..a6fc89cfdb1d 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 <gottox@voidlinux.org>"
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 9d9003ab295a6ae1bbbda50f869dbc0ab77e491f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/55] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 fd040448b100afb8bfb5bfb0e3635b650740829d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/55] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 2893f5bc443d1bcd41028d78250a7746ff75adea Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/55] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 ccfd55eede6f14c20f069e85f8363db8b609343b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/55] 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 fbc56862bde7..acc873462be6 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 5a2f74c9f4bf74f270008e7e2bae97cd203f8c40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/55] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 8adfed37da4c93e1d251c5093bdc2fa1e1f38125 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/55] 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 84ff92b93ae8..d6a5662e0b58 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 4a151f3bd9932b87a1ea9e23ba77d5369f1746a7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 12/55] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From b631bf058b49f6b904299b9b5c79eecabaf99c26 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 13/55] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 357371a5eb7cad7bf03a6843e5277e8de5841aeb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 14/55] 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 b392073891a7..8eb22bbc1a82 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1138,10 +1138,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..0622908753aa 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.6
+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 <gottox@voidlinux.org>"
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=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 95a596cd38a29e145b9a892262f1ea2dd711d379 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 15/55] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 04d1e552a51d72330ae1bf0c3ae7b7a3ffd154ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 16/55] 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 64ecf75826b7..4ee3cbced47f 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 f9ce56fdcdd9c8fd02f983892b552da41b506a11 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/55] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 83c2bff684cd43f31f899a571fac1add1c4f8bc4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 18/55] 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 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 a5751c333b3a94706b1a009c604b41010a6602f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/55] 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 0b7aae2e9efc..83ea29b5a485 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 331fac09f3ee7f8ebd570d25ff9c74dcbdbfd0b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/55] 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 730fb3c5f6d1..43ab670861c9 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 33e3fb255aa63b1adeed9f89607c8029e536f1c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/55] 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 0eb8af318ac2..b481d520e2a2 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 fb6844c19a5633fb03e9806bb31ff5250d1b163e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 22/55] 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 571013b24c7d..ea8f2ad81d47 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 c15b9fb6857473d508b4c11b0f98b06641bf39d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 23/55] 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 9197dbbcbd46..7ce5da3a10cb 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 2dffb8f50d8fd2ce84c111806420f567a6798f9f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 24/55] 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 8eb22bbc1a82..59a272530bca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 d6a0b2d10e3fdfe50c1b263274950b92f13f43d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 25/55] 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 43ab670861c9..7ffa8e3a33b0 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 b4c46494f9414dd8e7318ef84a7fe4d0b8a3df61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 26/55] 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 1baaf1e1922f..0c929aa19e70 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 5296ba322b32d42ebdc19eda01cac7f6210fb938 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 27/55] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 1b479a9b46de7bf7b7ac74f218b30f3bef40dc40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 28/55] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 c7ca785473f9189187cc9cbcedc9650400e24248 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 29/55] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From ab6336e01e75ecd826b63c27b7f6be788735ca4a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 30/55] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 2a204618dbf9db38149ce3c4416e07ef4d210647 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 31/55] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From 2c4b3cbe0578382c029f03f7d834b25a51bf263b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 32/55] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 7b4f413ae48816a373a7e4a418ca7096e6f0ce7a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:49 +0100
Subject: [PATCH 33/55] gnome-shell: update to 43.1.
---
srcpkgs/gnome-shell/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 144e7da1aa65..93ad9396c7f4 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=43.0
+version=43.1
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
+checksum=df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc
do_check() {
mkdir /tmp/gnome-shell-xdg
From 0f5be76f27dc82ecd480ae6a93ef38be0a19c561 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 34/55] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..f04be0130d79 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From c0f3a7888ae58045404fd2125a4e60a9ca80f221 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:13 +0100
Subject: [PATCH 35/55] eog: update to 43.1.
---
srcpkgs/eog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 83ea29b5a485..2cf08f89629c 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
-version=43.0
-revision=2
+version=43.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=a52a2f3eb1a3bb50038a3362902bc795163e1a986763ee82d20424e7ae84546f
+checksum=fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971
shlib_provides="libeog.so"
lib32disabled=yes
From 221ea8d8e9b2fddb54fbbe292ef3a572edcec8fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:19 +0100
Subject: [PATCH 36/55] mutter: update to 43.1.
---
srcpkgs/mutter/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index dd6e4aac5600..6952076b701f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.0
+version=43.1
revision=1
build_helper="gir"
build_style=meson
@@ -18,9 +18,9 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=8d9ba528ed99ef6799642e147b3fe9f2bcbeca9beced2845c1cadb331cd3e525
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264
shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
libmutter-cogl-pango-11.so"
make_check=no # needs a full graphical session
From b3012823de883f39c848f691b8a2c09d4ea5e240 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:22 +0100
Subject: [PATCH 37/55] evince: update to 43.1.
---
srcpkgs/evince/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index 7ffa8e3a33b0..46e700adb0fc 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
-version=43.0
-revision=3
+version=43.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
@@ -21,7 +21,7 @@ homepage="https://wiki.gnome.org/Apps/Evince"
#changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/gnome-43/NEWS"
changelog="https://gitlab.gnome.org/GNOME/evince/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/evince/${version%.*}/evince-${version}.tar.xz"
-checksum=66be0de4b47b1130486103988cc152c04aea95950ba3ef16dc20c2ef6b681d47
+checksum=6d75ca62b73bfbb600f718a098103dc6b813f9050b9594be929e29b4589d2335
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 2fb333709229ed9c6a3b232e403aff6d41e4ffa1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:23 +0100
Subject: [PATCH 38/55] evolution-ews: update to 3.46.1.
---
srcpkgs/evolution-ews/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 9cc0b9809f69..0040e0a55291 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -12,5 +12,5 @@ maintainer="Peter Kuchar <masaj@gmx.com>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd97ba205cc45bad12997bee1348a2f91d8b02d714583d79f4fae1794dac1b80
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=a79269ef09e8a80ba8f0ccbc643325d2bb05734d79f06f31f2501e8567cb8dbd
From 493de222bb50a4bdc4482fdd76a5aad9cde4e737 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:50 +0100
Subject: [PATCH 39/55] evolution: update to 3.46.1.
---
srcpkgs/evolution/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ef10334fdb4d..79114cbd9906 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="qemu"
@@ -20,7 +20,7 @@ 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-43/NEWS"
distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=e09e9276bc6b9abf0dad3a4e813eea1d025f4f6aaf1fac3b7b0f88895742913f
+checksum=1ac84583ed2caf897b074e99f93542ad1446fff0acfab86d5e679e033ae02c86
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From da02f226bcf8ddce690eafd38b4afd4265be8c20 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 40/55] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 9e548f57a5591d5ae7de662fc132bb321cf84e61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:42:18 +0100
Subject: [PATCH 41/55] evolution-data-server: update to 3.46.1.
---
srcpkgs/evolution-data-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index a6fc89cfdb1d..0c5d89c6ea0b 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
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
+checksum=c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb
build_options="gir"
build_options_default="gir"
From a416aa41694b618e6b3103e6de4a07fded3aa843 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:47:15 +0100
Subject: [PATCH 42/55] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 0c929aa19e70..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
-revision=3
+version=43.0
+revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 11c6af36aff3349a65758fda88db12d7822a0bb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:49:28 +0100
Subject: [PATCH 43/55] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 5c0919c4013e..1eb9cb1382cb 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=43.0
+version=43.1
revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
@@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Calendar"
#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=09e5c0f9360f3f856deaa7c0db30f5dab0151180df4183807c6cf3602992f5cc
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From a0b5c1586eef538b608874d07c06dd41b9138628 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:51:12 +0100
Subject: [PATCH 44/55] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 7ce5da3a10cb..8607dd144d7b 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=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
@@ -15,5 +15,5 @@ short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From dadf9fa4c222890720cdccb581aa47cd996fcb5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:53:28 +0100
Subject: [PATCH 45/55] gnome-contacts: update to 43.0.
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 4ee3cbced47f..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=3
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 0472ef96dc006b8fe463ced3953c6710582327e7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:03 +0100
Subject: [PATCH 46/55] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index d6a5662e0b58..33b10b274f28 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=43.0
+version=43.1
revision=1
build_style=meson
build_helper="gir"
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From b32959a778b2ea34702c740e003e058cc2990798 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:08 +0100
Subject: [PATCH 47/55] gnome-initial-setup: update to 43.1.
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cc0b94f2aa42..fe6ed931ac04 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=43.0
+version=43.1
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-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
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
+checksum=8104e7043ef9b98e2b50b2ab38fda05fd0437f8c55569fa16830b7be57be0df6
From c677b79a473a3561f7db808b90da2f629a353221 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 48/55] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..2fa408d08dde 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -12,8 +12,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 329e404fb3c881d00f87326379df53598077cd3c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 49/55] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 381ff7aed89cc4135e49429d4d34c4ef528591b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 11:08:41 +0100
Subject: [PATCH 50/55] amtk: update to 5.6.1.
---
srcpkgs/amtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/amtk/template b/srcpkgs/amtk/template
index 46ee8dccb415..96aa3b11019f 100644
--- a/srcpkgs/amtk/template
+++ b/srcpkgs/amtk/template
@@ -1,7 +1,7 @@
# Template file for 'amtk'
pkgname=amtk
-version=5.4.1
-revision=2
+version=5.6.1
+revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc)"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/World/amtk"
distfiles="${GNOME_SITE}/amtk/${version%.*}/amtk-${version}.tar.xz"
-checksum=7ebabc429b0eebb2b32360c9bfdbe368e489b35c3cdc086a856cfc9b3a466a72
+checksum=d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228
build_options="gir gtk_doc"
build_options_default="gir"
From 23c10f168363a434429d878acf61c0c9dc71805d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 11:05:11 +0100
Subject: [PATCH 51/55] tepl: update to 6.2.0.
---
common/shlibs | 2 +-
srcpkgs/tepl/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59a272530bca..93e6af246f99 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3513,7 +3513,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
-libtepl-6.so.0 tepl-6.00.0_1
+libtepl-6.so.1 tepl-6.2.0_1
libnomacsCore.so.3 nomacs-3.10.2_4
libaudit.so.1 libaudit-2.8.4_1
libauparse.so.0 libauparse-2.8.4_1
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index fae1e1d3a3f3..8a95b5f52ba2 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,6 +1,6 @@
# Template file for 'tepl'
pkgname=tepl
-version=6.1.1
+version=6.2.0
revision=1
build_style=meson
build_helper=gir
@@ -14,8 +14,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/Tepl"
changelog="https://gitlab.gnome.org/swilmet/tepl/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a0fbcbcf82dbcb031e1cbea286ab3edc70d5a6ea4125038242a1b1d3ff0278aa
+distfiles="${GNOME_SITE}/tepl/${version%.*}/tepl-${version}.tar.xz"
+checksum=8cd6865c2c38188760cb38cae33dc9e0a888fad18d0b04f1d55e656aa989a844
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
From 337e6ea320787f5f84c53104f7317334d741cb43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 11:08:25 +0100
Subject: [PATCH 52/55] gnome-latex: revbump for tepl 6.2
---
srcpkgs/gnome-latex/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 6cb4695c9f94..f998d791153f 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-latex'
pkgname=gnome-latex
version=3.40.0
-revision=1
+revision=2
build_helper="gir"
build_style=gnu-configure
configure_args="--disable-appstream-util --disable-dconf-migration
From c010618df810b17c8e7fa5e96e273bdcbf7dfe74 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:52 +0100
Subject: [PATCH 53/55] gedit: update to 43.2.
---
common/shlibs | 2 +-
srcpkgs/gedit/template | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 93e6af246f99..4dc3212b5df0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3634,7 +3634,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
libqmdnsengine.so.0 qmdnsengine-0.1.0_1
libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_1
-libgedit-41.so gedit-41.0_1
+libgedit-43.so gedit-43.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
libdwarves_emit.so.1 pahole-1.12_1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 8aad2f036e05..4292cdbd6aa0 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,27 +1,29 @@
# Template file for 'gedit'
+# keep major version in sync with gedit
pkgname=gedit
-version=42.2
-revision=2
+version=43.2
+revision=1
build_helper="gir"
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
+configure_args="-Dgtk_doc=false"
hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl gettext vala"
makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel
- libpeas-devel python3-gobject-devel"
+ libpeas-devel python3-gobject-devel amtk-devel tepl-devel"
depends="desktop-file-utils gsettings-desktop-schemas iso-codes"
short_desc="Text editor for GNOME"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gedit"
-changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c6229111f0ac066ae44964920791d1265f5bbb56b0bd949a69b7b1261fc8fca
-shlib_provides="libgedit-41.so"
+changelog="https://gitlab.gnome.org/GNOME/gedit/-/raw/gedit-43/NEWS"
+distfiles="${GNOME_SITE}/gedit/${version%.*}/gedit-${version}.tar.xz"
+checksum=f950d2d35c594bb6c8dbc9f5440cad7788ca0a8688e2b07846f83de9a4e3fc25
python_version=3
+shlib_provides="libgedit-43.so"
gedit-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel
- gtksourceview4-devel libpeas-devel"
+ gtksourceview4-devel libpeas-devel amtk-devel tepl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From dad7b61672059b52637fa1cb09028b302bd04a70 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 20:25:43 +0100
Subject: [PATCH 54/55] gedit-plugins: update to 43.1.
---
srcpkgs/gedit-plugins/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template
index 576c3a3dcdad..ae67d13837be 100644
--- a/srcpkgs/gedit-plugins/template
+++ b/srcpkgs/gedit-plugins/template
@@ -1,19 +1,21 @@
# Template file for 'gedit-plugins'
+# keep major version in sync with gedit
pkgname=gedit-plugins
-version=42.1
-revision=2
+version=43.1
+revision=1
build_style=meson
pycompile_dirs="usr/lib/gedit/plugins"
hostmakedepends="gettext glib-devel itstool pkg-config vala appstream-glib
python3-gobject gucharmap-devel vte3-devel"
makedepends="gedit-devel gtksourceview4-devel gtk+3-devel libgit2-glib-devel
- libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-devel"
+ libglib-devel libpeas-devel python3-dbus-devel python3-devel zeitgeist-devel
+ amtk-devel"
depends="python3-gobject gucharmap vte3"
short_desc="Set of plugins for Gedit"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gedit-plugins"
changelog="https://gitlab.gnome.org/GNOME/gedit-plugins/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6b741de7d2610b0e474ef1b72a2a587e236998573403d527fe18e9e3de2623d
+distfiles="${GNOME_SITE}/gedit-plugins/${version%.*}/gedit-plugins-${version}.tar.xz"
+checksum=93a4ff0f60e8283293f16c242c25eb197e5e7bdc06cbe8891b82cf1d46cc6e1d
python_version=3
From 05953c8557809573ba6febd367080ec2cd43d30f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 55/55] gnome-terminal: update to 3.46.6.
---
srcpkgs/gnome-terminal/template | 10 +++++-----
srcpkgs/gnome-terminal/template.orig | 30 ++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gnome-terminal/template.orig
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..b530be088d27 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.6
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=b34f72167b906092b1c5356eac2511159e1c74478d00399f3b853939c925893b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
diff --git a/srcpkgs/gnome-terminal/template.orig b/srcpkgs/gnome-terminal/template.orig
new file mode 100644
index 000000000000..f12986cc45af
--- /dev/null
+++ b/srcpkgs/gnome-terminal/template.orig
@@ -0,0 +1,30 @@
+# Template file for 'gnome-terminal'
+pkgname=gnome-terminal
+version=3.44.1
+revision=1
+build_style=meson
+configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
+ nautilus-devel vte3-devel"
+depends="desktop-file-utils"
+short_desc="GNOME terminal emulator application"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, GFDL-1.3-only"
+homepage="https://wiki.gnome.org/Apps/Terminal"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+lib32disabled=yes
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" desktop-file-utils"
+ configure_args+=" -Dsearch_provider=false"
+fi
+
+nautilus-gnome-terminal-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (27 preceding siblings ...)
2022-11-23 20:08 ` [PR PATCH] [Updated] " paper42
@ 2022-12-02 7:27 ` oreo639
2022-12-02 7:27 ` oreo639
` (28 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-12-02 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 765 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
xdg-desktop-portal-gnome needs to be revbumped.
The latest version of gnome-shell/mutter is 43.1.
Also, gnome-shell-extensions probably should be updated.
I also noticed a build failure for gnome-console related to an issue with the vte3 package. (Should be fixed by https://github.com/void-linux/void-packages/pull/40707)
Also, I ran into an issue where gnome 43 would not register as plugged in when fully charged unless I updated upower: https://github.com/void-linux/void-packages/pull/40723
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (28 preceding siblings ...)
2022-12-02 7:27 ` oreo639
@ 2022-12-02 7:27 ` oreo639
2022-12-09 17:32 ` [PR PATCH] [Updated] " paper42
` (27 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2022-12-02 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 780 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1324442940
Comment:
gnome-terminal needs to be updated for nautilus:
https://gist.github.com/oreo639/eebf05ac651c77670bd0270e8f7acf16
xdg-desktop-portal-gnome needs to be revbumped.
The latest version of gnome-shell/mutter is 43.1.
Also, gnome-shell-extensions probably should be updated.
I also noticed a build failure for gnome-console related to an issue with the vte3 package. (Should be fixed by https://github.com/void-linux/void-packages/pull/40707)
Also, I ran into an issue where gnome 43 would not register being plugged in when the battery fully charged unless I updated upower: https://github.com/void-linux/void-packages/pull/40723
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (29 preceding siblings ...)
2022-12-02 7:27 ` oreo639
@ 2022-12-09 17:32 ` paper42
2022-12-11 20:53 ` paper42
` (26 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-09 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [x] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [x] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
- [ ] gcr4 https://github.com/void-linux/void-packages/pull/40701
- [x] gjs 2.74 https://github.com/void-linux/void-packages/pull/40702
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 84825 bytes --]
From 3929fcff4c84234f55df53caf9c1306687864e09 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 01/48] New package: gcr4-4.0.0
---
common/shlibs | 2 ++
srcpkgs/gcr4-devel | 1 +
srcpkgs/gcr4/template | 43 +++++++++++++++++++++++++++++++++++++++++++
srcpkgs/gcr4/update | 1 +
4 files changed, 47 insertions(+)
create mode 120000 srcpkgs/gcr4-devel
create mode 100644 srcpkgs/gcr4/template
create mode 100644 srcpkgs/gcr4/update
diff --git a/common/shlibs b/common/shlibs
index 8fafa638e86e..ee681e62dcd4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1036,6 +1036,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.0.0 gcr4-4.0.0_1
+libgcr-4.so.0.0.0 gcr4-4.0.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 000000000000..e85b363d95de
--- /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 000000000000..c088e87bc16f
--- /dev/null
+++ b/srcpkgs/gcr4/template
@@ -0,0 +1,43 @@
+# Template file for 'gcr4'
+pkgname=gcr4
+version=4.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+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="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 <orphan@voidlinux.org>"
+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=c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
+make_check_pre="dbus-run-session"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+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
+ }
+}
diff --git a/srcpkgs/gcr4/update b/srcpkgs/gcr4/update
new file mode 100644
index 000000000000..81e9823e570d
--- /dev/null
+++ b/srcpkgs/gcr4/update
@@ -0,0 +1 @@
+pkgname="gcr"
From 271e395bef3bcd83d0b2c03da9df04957c670564 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 02/48] 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 ee681e62dcd4..9a18d309222a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2979,10 +2979,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..dd6e4aac5600 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-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 2227e4493dba16f5f9bff628e41e6157da7e535a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 03/48] 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 7621c5fa8ee1..144e7da1aa65 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.6
+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=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
do_check() {
mkdir /tmp/gnome-shell-xdg
From 53f792cb690ed99310061c50e54c3abf3f0a8e23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 04/48] 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 9a18d309222a..cebda3326ef5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..a6fc89cfdb1d 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 <gottox@voidlinux.org>"
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 20682583817efd1c8fa74fa64b44b9b1009a6948 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 05/48] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 e1a70bc77c078137d9f3e2884780f245abe66a43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 06/48] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 d231d2e5e60acf84ff43d4ad4f94c318354a0eb2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 07/48] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 622a760bc63d3f6a80f58cb4ff340ff52653a23f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/48] 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 fbc56862bde7..acc873462be6 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 d0f07c609af4fe6c8b57753ba94c49bdb254c1ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 09/48] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 7a0481ffe5e76b68b67892748297abbb811b9a7e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 10/48] 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 84ff92b93ae8..d6a5662e0b58 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 097d2cef57fc308a5f5ba80784d6d4bc20896461 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 11/48] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From f1f5f0c386b0cca061c92930769b047a40e5b864 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 12/48] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 8ee870e1a44263411a1d825676ba44556531042a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 13/48] 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 cebda3326ef5..43e174b692f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1138,10 +1138,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..0622908753aa 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.6
+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 <gottox@voidlinux.org>"
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=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 2060bfc2e9aca7eef0947c0f00625244f297b151 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 14/48] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 0ba2616591ed1da3965ac17d142905f1af936391 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 15/48] 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 64ecf75826b7..4ee3cbced47f 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 42674e966d91266a754c3f3d55310372c5cc7d2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 16/48] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 a2acd195087d252ec385820af5fa27e79939f8d7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 17/48] 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 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 61f453cb059962aa0499a8bc6935c688269e0d15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 18/48] 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 0b7aae2e9efc..83ea29b5a485 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 bc03b4238494835f22a16a49eaaf481fd486e3c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/48] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From c957e8d227995a49539b685b9d6634e0b23940a7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/48] 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 0eb8af318ac2..b481d520e2a2 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 bd6b2734d00779b766d1f4b92a472c5f63d10c90 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/48] 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 571013b24c7d..ea8f2ad81d47 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 15d0a32dc61dd5a4cee40b0dca5581911ef734ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/48] 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 9197dbbcbd46..7ce5da3a10cb 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 021f0cb0afde81da3879a72b871356cbc30300e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/48] 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 43e174b692f6..01fbba4385ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 962da63d63b194f184e679f9a3fe5bd93fbdf1f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 24/48] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 52bc49b0b5ec0afef851fbed48d507f48fe0a3e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 25/48] 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 1baaf1e1922f..0c929aa19e70 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 9307fcd201b4879faa78266d5fec674758d19ea5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 26/48] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 4a156ebd015024b18b784ba18c24e0c88bd1897b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 27/48] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 04b00b5078c729e41545e052e721ad2b2a479c5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 28/48] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From eda379700d285f6f5522d6d51cccb2398605d59f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 29/48] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 3ae0569c421d3dcfdf6d81582fbfeddece9ee295 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 30/48] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From 566cc0f1018521333bebd1daa0acd6f0c66b1d10 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 31/48] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 6d51bc63909a6a5163239ec7dcdccef4daa26bed Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:49 +0100
Subject: [PATCH 32/48] gnome-shell: update to 43.1.
---
srcpkgs/gnome-shell/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 144e7da1aa65..93ad9396c7f4 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=43.0
+version=43.1
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
+checksum=df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc
do_check() {
mkdir /tmp/gnome-shell-xdg
From 76c166f1307e1518e0800bf988b66ea2ce2959c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 33/48] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..f04be0130d79 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From f54b8b9e3bc4b47cf5fcd6a93ce9a4dc50ebdcbd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:13 +0100
Subject: [PATCH 34/48] eog: update to 43.1.
---
srcpkgs/eog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 83ea29b5a485..2cf08f89629c 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
-version=43.0
-revision=2
+version=43.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=a52a2f3eb1a3bb50038a3362902bc795163e1a986763ee82d20424e7ae84546f
+checksum=fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971
shlib_provides="libeog.so"
lib32disabled=yes
From 541eaba3b065037d82a90fdb80117d9057cde375 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:19 +0100
Subject: [PATCH 35/48] mutter: update to 43.1.
---
srcpkgs/mutter/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index dd6e4aac5600..6952076b701f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.0
+version=43.1
revision=1
build_helper="gir"
build_style=meson
@@ -18,9 +18,9 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=8d9ba528ed99ef6799642e147b3fe9f2bcbeca9beced2845c1cadb331cd3e525
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264
shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
libmutter-cogl-pango-11.so"
make_check=no # needs a full graphical session
From f8edcf4d0d10758c5c36ed197e23a0aca48e9d12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:23 +0100
Subject: [PATCH 36/48] evolution-ews: update to 3.46.1.
---
srcpkgs/evolution-ews/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 9cc0b9809f69..0040e0a55291 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -12,5 +12,5 @@ maintainer="Peter Kuchar <masaj@gmx.com>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd97ba205cc45bad12997bee1348a2f91d8b02d714583d79f4fae1794dac1b80
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=a79269ef09e8a80ba8f0ccbc643325d2bb05734d79f06f31f2501e8567cb8dbd
From 46d57d28374ad8fb87368585282174d659c005f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:50 +0100
Subject: [PATCH 37/48] evolution: update to 3.46.1.
---
srcpkgs/evolution/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ef10334fdb4d..79114cbd9906 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="qemu"
@@ -20,7 +20,7 @@ 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-43/NEWS"
distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=e09e9276bc6b9abf0dad3a4e813eea1d025f4f6aaf1fac3b7b0f88895742913f
+checksum=1ac84583ed2caf897b074e99f93542ad1446fff0acfab86d5e679e033ae02c86
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 99485a60fa9d51ae07121b13c70cfb5ebe5663dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 38/48] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From dc824f0fdf9ca7e6bb350349406f108b2609b2f7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:42:18 +0100
Subject: [PATCH 39/48] evolution-data-server: update to 3.46.1.
---
srcpkgs/evolution-data-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index a6fc89cfdb1d..0c5d89c6ea0b 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
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
+checksum=c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb
build_options="gir"
build_options_default="gir"
From aef6ea9711ec90f979c80743877aa0d0b62fe911 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:47:15 +0100
Subject: [PATCH 40/48] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 0c929aa19e70..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
-revision=3
+version=43.0
+revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From a4953c01d54362d547d051d9918293320b004fde Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:49:28 +0100
Subject: [PATCH 41/48] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 5c0919c4013e..1eb9cb1382cb 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=43.0
+version=43.1
revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
@@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Calendar"
#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=09e5c0f9360f3f856deaa7c0db30f5dab0151180df4183807c6cf3602992f5cc
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 388e94abb292c795f2ce6a12f7abb444c5b8f70f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:51:12 +0100
Subject: [PATCH 42/48] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 7ce5da3a10cb..8607dd144d7b 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=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
@@ -15,5 +15,5 @@ short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 110d6ef2c63b42f1292dc74f09f637fcf72116e7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:53:28 +0100
Subject: [PATCH 43/48] gnome-contacts: update to 43.0.
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 4ee3cbced47f..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=3
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From e451a32b86304f5236a94807d093db1927b24368 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:03 +0100
Subject: [PATCH 44/48] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index d6a5662e0b58..33b10b274f28 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=43.0
+version=43.1
revision=1
build_style=meson
build_helper="gir"
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 88a557344ca28d2b804b4440cf68325421725a5e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:08 +0100
Subject: [PATCH 45/48] gnome-initial-setup: update to 43.1.
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cc0b94f2aa42..fe6ed931ac04 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=43.0
+version=43.1
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-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
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
+checksum=8104e7043ef9b98e2b50b2ab38fda05fd0437f8c55569fa16830b7be57be0df6
From d199a0ab4bbb421957c2f68cf0ae5412c860021f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 46/48] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..2fa408d08dde 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -12,8 +12,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 66432179cbdfe7ad67ac1e1322f0e28a391260a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 47/48] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From beb1dffdcf586f4be488b163b770be1e9bc20df1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 48/48] gnome-terminal: update to 3.46.6.
---
srcpkgs/gnome-terminal/template | 10 +++++-----
srcpkgs/gnome-terminal/template.orig | 30 ++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gnome-terminal/template.orig
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..b530be088d27 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.6
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=b34f72167b906092b1c5356eac2511159e1c74478d00399f3b853939c925893b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
diff --git a/srcpkgs/gnome-terminal/template.orig b/srcpkgs/gnome-terminal/template.orig
new file mode 100644
index 000000000000..f12986cc45af
--- /dev/null
+++ b/srcpkgs/gnome-terminal/template.orig
@@ -0,0 +1,30 @@
+# Template file for 'gnome-terminal'
+pkgname=gnome-terminal
+version=3.44.1
+revision=1
+build_style=meson
+configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
+ nautilus-devel vte3-devel"
+depends="desktop-file-utils"
+short_desc="GNOME terminal emulator application"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, GFDL-1.3-only"
+homepage="https://wiki.gnome.org/Apps/Terminal"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+lib32disabled=yes
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" desktop-file-utils"
+ configure_args+=" -Dsearch_provider=false"
+fi
+
+nautilus-gnome-terminal-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (30 preceding siblings ...)
2022-12-09 17:32 ` [PR PATCH] [Updated] " paper42
@ 2022-12-11 20:53 ` paper42
2022-12-11 21:00 ` paper42
` (25 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-11 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [x] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [x] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
- [ ] gcr4 https://github.com/void-linux/void-packages/pull/40701
- [x] gjs 2.74 https://github.com/void-linux/void-packages/pull/40702
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 118902 bytes --]
From 38ca2536e0ed057427f5db57c6195dd9d0775f08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 01/66] New package: gcr4-4.0.0
---
common/shlibs | 2 ++
srcpkgs/gcr4-devel | 1 +
srcpkgs/gcr4/template | 43 +++++++++++++++++++++++++++++++++++++++++++
srcpkgs/gcr4/update | 1 +
4 files changed, 47 insertions(+)
create mode 120000 srcpkgs/gcr4-devel
create mode 100644 srcpkgs/gcr4/template
create mode 100644 srcpkgs/gcr4/update
diff --git a/common/shlibs b/common/shlibs
index 72c62657dc59..19ce25d99572 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1037,6 +1037,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.0.0 gcr4-4.0.0_1
+libgcr-4.so.0.0.0 gcr4-4.0.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 000000000000..e85b363d95de
--- /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 000000000000..c088e87bc16f
--- /dev/null
+++ b/srcpkgs/gcr4/template
@@ -0,0 +1,43 @@
+# Template file for 'gcr4'
+pkgname=gcr4
+version=4.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+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="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 <orphan@voidlinux.org>"
+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=c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
+make_check_pre="dbus-run-session"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+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
+ }
+}
diff --git a/srcpkgs/gcr4/update b/srcpkgs/gcr4/update
new file mode 100644
index 000000000000..81e9823e570d
--- /dev/null
+++ b/srcpkgs/gcr4/update
@@ -0,0 +1 @@
+pkgname="gcr"
From 57288189f7660bfb2d2cf61dc49400eefe941517 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 02/66] 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 19ce25d99572..3a88e83e3967 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..dd6e4aac5600 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-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 87ac23de43633162ac805e1fb46eeca45fbdfd48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 03/66] 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 7621c5fa8ee1..144e7da1aa65 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.6
+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=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
do_check() {
mkdir /tmp/gnome-shell-xdg
From 4a92df58854b2c021ddd82771c799b392ddcd138 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 04/66] 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 3a88e83e3967..3ca4e2cc49a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..a6fc89cfdb1d 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 <gottox@voidlinux.org>"
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 ece543b7d73233281cec5322e1cdec4f4b54ba50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 05/66] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 4797db7d7249eb2684fa15c19ea99bc1704de678 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 06/66] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 cab7db83928ce31e456baeeb87215ce8fdb82b2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 07/66] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 04fa100cba43584b23b9344ec0fcee31591194e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/66] 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 fbc56862bde7..acc873462be6 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 207975c9b11621fe2de188e75d04c6da910f0e03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 09/66] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 04e3defd736c6a67dd69a4165b6d60ecafe4f243 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 10/66] 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 84ff92b93ae8..d6a5662e0b58 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 9e08dcbea72efb9b45fbe92fb9ecc5d386cefd91 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 11/66] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 61524e03d96ce81a076d5f0103abab07e77de187 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 12/66] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 c7ca9a14e867953c88a66656738d486edc268c5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 13/66] 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 3ca4e2cc49a1..ae9dd0407932 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..0622908753aa 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.6
+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 <gottox@voidlinux.org>"
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=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 25c245accd7ad178336c581bee736f562e519c02 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 14/66] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 c91fdb1c84baee45c7ad75868b1636dd9d6ffdd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 15/66] 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 64ecf75826b7..4ee3cbced47f 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 6c20a8a8262a7841cc6989889c3d142176996f35 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 16/66] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 7b80267d6a86cd9b1fe36c3c2cad8466551e07be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 17/66] 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 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 f6e6dfa14e20a3c1dbd5175384efe17d8f0ad2f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 18/66] 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 0b7aae2e9efc..83ea29b5a485 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 18c797c2fb35f31446565d0174d7aa8f2015be49 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/66] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 9c676041917902340a78fbabf5ab35de299a92dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/66] 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 0eb8af318ac2..b481d520e2a2 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 69ae55e37ee55ff992f54671579f73435969c626 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/66] 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 571013b24c7d..ea8f2ad81d47 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 9ac498fb05de92b679aed21cfd66b689367a999b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/66] 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 9197dbbcbd46..7ce5da3a10cb 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 bed352c95f1c26d37ff142eb94b94333303aa819 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/66] 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 ae9dd0407932..ef249073e284 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 ae59512f7e7ee5f84d061302069959f01a5a6a7f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 24/66] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 261b15808367bbe6156b56a6e7343dee1e18ace7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 25/66] 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 1baaf1e1922f..0c929aa19e70 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 15e3acdf47d38a2e6a0455942e003658c55cba67 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 26/66] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From dc308f6428ae1caadbbf6493e96e3398b54c78a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 27/66] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 0e3a3d26f292a4390c80096eae4d30368c69f807 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 28/66] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From af1691e843ef0b06ee12c6845bce8df1a2351e61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 29/66] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 cfa561dab1f376fdb32518ba26826bf5b1d959a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 30/66] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From dfc8b221a8c011f35811bec64fa26f1740ae5bd8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 31/66] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 44680d94fbd738888dc06f98c3411932954f9883 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:49 +0100
Subject: [PATCH 32/66] gnome-shell: update to 43.1.
---
srcpkgs/gnome-shell/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 144e7da1aa65..93ad9396c7f4 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=43.0
+version=43.1
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
+checksum=df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc
do_check() {
mkdir /tmp/gnome-shell-xdg
From 75821e406053b6677c024d1a1fdbc9af07c40335 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 33/66] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..f04be0130d79 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From bdf3e317038a6c8c22da080920b984865fd4d99c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:13 +0100
Subject: [PATCH 34/66] eog: update to 43.1.
---
srcpkgs/eog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 83ea29b5a485..2cf08f89629c 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
-version=43.0
-revision=2
+version=43.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=a52a2f3eb1a3bb50038a3362902bc795163e1a986763ee82d20424e7ae84546f
+checksum=fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971
shlib_provides="libeog.so"
lib32disabled=yes
From b82ab375c3d53c1ebf8c37b5c4c72966e940a761 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:19 +0100
Subject: [PATCH 35/66] mutter: update to 43.1.
---
srcpkgs/mutter/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index dd6e4aac5600..6952076b701f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.0
+version=43.1
revision=1
build_helper="gir"
build_style=meson
@@ -18,9 +18,9 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=8d9ba528ed99ef6799642e147b3fe9f2bcbeca9beced2845c1cadb331cd3e525
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264
shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
libmutter-cogl-pango-11.so"
make_check=no # needs a full graphical session
From 6e57cb6c6650bf18a75fda0dba639ea624daac4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:23 +0100
Subject: [PATCH 36/66] evolution-ews: update to 3.46.1.
---
srcpkgs/evolution-ews/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 9cc0b9809f69..0040e0a55291 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -12,5 +12,5 @@ maintainer="Peter Kuchar <masaj@gmx.com>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd97ba205cc45bad12997bee1348a2f91d8b02d714583d79f4fae1794dac1b80
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=a79269ef09e8a80ba8f0ccbc643325d2bb05734d79f06f31f2501e8567cb8dbd
From 55c32342848e54f6634e45bc146ed366eb14be02 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:50 +0100
Subject: [PATCH 37/66] evolution: update to 3.46.1.
---
srcpkgs/evolution/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ef10334fdb4d..79114cbd9906 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="qemu"
@@ -20,7 +20,7 @@ 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-43/NEWS"
distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=e09e9276bc6b9abf0dad3a4e813eea1d025f4f6aaf1fac3b7b0f88895742913f
+checksum=1ac84583ed2caf897b074e99f93542ad1446fff0acfab86d5e679e033ae02c86
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 4d346516ac43b0528b005e32219560d1a50d8f52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 38/66] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From bdaca65d0a99e09dc712a7c858e180de93994bb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:42:18 +0100
Subject: [PATCH 39/66] evolution-data-server: update to 3.46.1.
---
srcpkgs/evolution-data-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index a6fc89cfdb1d..0c5d89c6ea0b 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
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
+checksum=c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb
build_options="gir"
build_options_default="gir"
From 468396fac966a960d0d715c0840543c18acc612a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:47:15 +0100
Subject: [PATCH 40/66] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 0c929aa19e70..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
-revision=3
+version=43.0
+revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 647505464ed98963b080bb25c2f76159f1d76027 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:49:28 +0100
Subject: [PATCH 41/66] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 5c0919c4013e..701f02accc6c 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=43.0
+version=43.1
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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Calendar"
#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=09e5c0f9360f3f856deaa7c0db30f5dab0151180df4183807c6cf3602992f5cc
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 0fcbf6c699be138d01b67614f852e8c609373b2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:51:12 +0100
Subject: [PATCH 42/66] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 7ce5da3a10cb..42b75d08cdd2 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,19 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 2efbab2b0452aba11b732b561717428ee8f2e9db Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:53:28 +0100
Subject: [PATCH 43/66] gnome-contacts: update to 43.0.
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 4ee3cbced47f..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=3
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 86352199b3f81c2f905c65c3c7fd96eb051bd6fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:03 +0100
Subject: [PATCH 44/66] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index d6a5662e0b58..33b10b274f28 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=43.0
+version=43.1
revision=1
build_style=meson
build_helper="gir"
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 215fba5dc91ae8d3cb1d61ea124fbb1c63e03abf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:08 +0100
Subject: [PATCH 45/66] gnome-initial-setup: update to 43.1.
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cc0b94f2aa42..fe6ed931ac04 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=43.0
+version=43.1
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-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
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
+checksum=8104e7043ef9b98e2b50b2ab38fda05fd0437f8c55569fa16830b7be57be0df6
From 81677df3503ab09dcd5d680dcbcf3e17a37f0114 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 46/66] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..2fa408d08dde 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -12,8 +12,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 7c6a0cce525b9c388dfaf7bb2cec17f09a70f1e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 47/66] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 23ade52f8d715ad93c27cf309cb1fb18c7fdf2c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 48/66] gnome-terminal: update to 3.46.6.
---
srcpkgs/gnome-terminal/template | 10 +++++-----
srcpkgs/gnome-terminal/template.orig | 30 ++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gnome-terminal/template.orig
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..b530be088d27 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.6
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=b34f72167b906092b1c5356eac2511159e1c74478d00399f3b853939c925893b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
diff --git a/srcpkgs/gnome-terminal/template.orig b/srcpkgs/gnome-terminal/template.orig
new file mode 100644
index 000000000000..f12986cc45af
--- /dev/null
+++ b/srcpkgs/gnome-terminal/template.orig
@@ -0,0 +1,30 @@
+# Template file for 'gnome-terminal'
+pkgname=gnome-terminal
+version=3.44.1
+revision=1
+build_style=meson
+configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
+ nautilus-devel vte3-devel"
+depends="desktop-file-utils"
+short_desc="GNOME terminal emulator application"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, GFDL-1.3-only"
+homepage="https://wiki.gnome.org/Apps/Terminal"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+lib32disabled=yes
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" desktop-file-utils"
+ configure_args+=" -Dsearch_provider=false"
+fi
+
+nautilus-gnome-terminal-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
From 304b0c8eee1c44374830afb6e7aedb813e88861b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 49/66] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..ed51c6a78aa9 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,5 +9,5 @@ short_desc="Theme consisting of a set of icons for GTK+"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From a51160760459a5e239c8a4be82fad08dee705377 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 50/66] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..c59007798d22 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -10,6 +10,6 @@ short_desc="User documentation for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 6c529b2411241a305e743d1dd166d4b70edb4150 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:12:47 +0100
Subject: [PATCH 51/66] baobab: update to 43.0.
---
srcpkgs/baobab/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 23e3372ea262..61dd3102439a 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,6 +1,6 @@
# Template file for 'baobab'
pkgname=baobab
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="gettext pkg-config itstool glib-devel vala"
@@ -10,5 +10,5 @@ short_desc="Graphical directory tree analyzer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later"
homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc
+distfiles="${GNOME_SITE}/baobab/${version%.*}/baobab-${version}.tar.xz"
+checksum=52c6864118f5697f5a5736882dcda27db22e7220bc492838deecc699246cdb26
From 8c3d9d74aeede16d98ba1244b90af85a5e469711 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:11 +0100
Subject: [PATCH 52/66] gnome-calculator: update to 43.0.1.
---
srcpkgs/gnome-calculator/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 28411fde0009..a4385bfb93fe 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-calculator'
pkgname=gnome-calculator
-version=42.2
+version=43.0.1
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="cmake gettext glib-devel itstool pkg-config vala
gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel
- libmpc-devel libsoup-devel gtk4-devel libadwaita-devel"
+ libmpc-devel libsoup3-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
short_desc="GNOME calculator"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calculator"
changelog="https://gitlab.gnome.org/GNOME/gnome-calculator/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=33dab1bca43658d66520958b0f674cb0ad3185cfd30c12e459e7f69481c5c6a0
+distfiles="${GNOME_SITE}/gnome-calculator/${version%%.*}/gnome-calculator-${version}.tar.xz"
+checksum=02c12ded3cf5053d17537d95ec69587f4b919899d7726eceecdb4b47ffb1c90f
From 6bcfbb332dd079808bfef5dd23c75563d373fac0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 53/66] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..98f012abf642 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=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=43
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
- zenity>=3.${version}"
+ zenity>=3.42"
From 0cd045d613d427d7fb709250aef0a6f149d74ef5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 54/66] gnome: update to 43.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..905c87ac276d 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version%.*}.alpha
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-terminal>=3.46
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,12 +58,12 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
+ gnome-system-monitor>=42
gnome-terminal>=3.${version}
gnome-text-editor>=${version}
gnote>=${version}
From 4aa7a2a0477423e5c05c9e380dd00e0aa6308ee7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:16:04 +0100
Subject: [PATCH 55/66] gnome-characters: update to 43.1.
---
srcpkgs/gnome-characters/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index c4bf34464a64..10abaa3cb9af 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-characters'
pkgname=gnome-characters
-version=42.0
-revision=2
+version=43.1
+revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="gettext gjs glib-devel itstool pkg-config"
+hostmakedepends="gettext gjs glib-devel itstool pkg-config desktop-file-utils"
makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel libunistring-devel"
depends="gnome-desktop gjs libadwaita"
short_desc="Utility to find and insert unusual characters for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8
+distfiles="${GNOME_SITE}/gnome-characters/${version%.*}/gnome-characters-${version}.tar.xz"
+checksum=b23e15d950978b363c81a47261ee1a3b47db3c6697ee169ff213eea6572a7841
lib32disabled=yes
From 6e3e89a83e96df8c65ed4b6d23af1443c3dbe725 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:28:00 +0100
Subject: [PATCH 56/66] gnome-disk-utility: update to 43.0.
---
srcpkgs/gnome-disk-utility/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 6164ffb20058..5cb095fa06a3 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=42.0
+version=43.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
-hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
+hostmakedepends="glib-devel gettext pkg-config desktop-file-utils"
makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
libhandy1-devel"
@@ -13,6 +13,6 @@ short_desc="GNOME libraries and applications for dealing with storage devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b
+distfiles="${GNOME_SITE}/gnome-disk-utility/${version%.*}/gnome-disk-utility-${version}.tar.xz"
+checksum=7afca9805a6b92db6933dd7efcec4af8386c01bbc1f871e2dae4def7e192a2c5
lib32disabled=yes
From 0b727e111ce6fb7f60d99559bd682ca92c688242 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:32:09 +0100
Subject: [PATCH 57/66] gnome-disk-utility: enable elogind support
---
srcpkgs/gnome-disk-utility/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 5cb095fa06a3..f6c55f1fc1d3 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
version=43.0
-revision=1
+revision=2
build_style=meson
-configure_args="-Dlogind=none"
+configure_args="-Dlogind=libelogind"
hostmakedepends="glib-devel gettext pkg-config desktop-file-utils"
makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
- libhandy1-devel"
+ libhandy1-devel elogind-devel"
depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
short_desc="GNOME libraries and applications for dealing with storage devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 08574f2f7203433b9fac484150e9a0831da7f458 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 58/66] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..6fc038e3d826 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -11,5 +11,5 @@ short_desc="Font viewer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From 39e04e68b5a8eb06f1b9026ef23e7a9c03b09ab4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:45:58 +0100
Subject: [PATCH 59/66] gnome-maps: update to 43.2.
---
srcpkgs/gnome-maps/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index bf82966579bb..8e387a6e7c37 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
-version=42.3
-revision=3
+version=43.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest0-devel libhandy1-devel
+makedepends="geoclue2-devel gjs-devel
+ gnome-desktop-devel libshumate-devel rest-devel libadwaita-devel
libgweather-devel"
-depends="geoclue2 gjs libhandy1 libgweather"
+depends="geoclue2 gjs libadwaita libgweather"
short_desc="GNOME maps application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-maps/${version%.*}/gnome-maps-${version}.tar.xz"
-checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
+checksum=c0221d250be45ea36e971ae63bfde971a46145c967b1c659e96c5b072a71551d
From 3c82698c855a0d2c2d371d4d6591af1b278ba06c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 60/66] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From f57ba8064c8ffdd033bdc8f19974d625548aed93 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 61/66] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..e5c80c65401d 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 5e2f4da45df350335438890c951fdd35a294a29e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 62/66] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From cc66d364b6c9a4a6170e0f99031d964d66c4ef53 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 63/66] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 6 +--
2 files changed, 3 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..004f1e6d2b58 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,6 +1,6 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,8 +10,8 @@ short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
From 0ee935579e9617857ed1803e683aeea8b8567786 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:10:42 +0100
Subject: [PATCH 64/66] ghex: update to 43.0.
---
common/shlibs | 2 +-
srcpkgs/ghex/template | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ef249073e284..e3ee4c4f9aca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,7 +1584,7 @@ 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
-libgtkhex-4.so.0 libgtkhex-42.1_1
+libgtkhex-4.so.1 libgtkhex-43.0_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
libdovecot.so.0 dovecot-2.3.13_3
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index 6d9b98d886ab..e0d0ce8b5630 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -1,6 +1,6 @@
# Template file for 'ghex'
pkgname=ghex
-version=42.3
+version=43.0
revision=1
build_style=meson
build_helper=gir
@@ -8,15 +8,15 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
desktop-file-utils gtk-update-icon-cache $(vopt_if gtk_doc gi-docgen)"
-makedepends="gtk4-devel"
+makedepends="gtk4-devel libadwaita-devel"
depends="hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Simple binary editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, GFDL-1.1-only"
homepage="https://gitlab.gnome.org/GNOME/ghex"
-changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-42/NEWS"
-distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-$version.tar.xz"
-checksum=add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
+changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-43/NEWS"
+distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-${version}.tar.xz"
+checksum=866c0622c66fdb5ad2a475e9cfcccb219a1c6431f009acb2291d43f2140b147e
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
@@ -36,7 +36,7 @@ libgtkhex_package() {
}
ghex-devel_package() {
- depends="gtk4-devel libgtkhex>=${version}_${revision}"
+ depends="gtk4-devel libadwaita-devel libgtkhex>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From b582c5329383c45bba28a5069522e2b329c0427c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 65/66] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e3ee4c4f9aca..a9bf8bbc94e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..89bdef62e234 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
-revision=2
+version=3.46.0
+revision=1
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From a3ee27439c489dfd7688185658096e554d3a12d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 66/66] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..36d04bac0c4c 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (31 preceding siblings ...)
2022-12-11 20:53 ` paper42
@ 2022-12-11 21:00 ` paper42
2022-12-11 21:53 ` paper42
` (24 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-11 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.
[ci skip]
depends on:
- [x] libwebkit2gtk50, libwebkit2gtk41 https://github.com/void-linux/void-packages/pull/39488
- [x] mozjs102 https://github.com/void-linux/void-packages/pull/39498
- [x] totem 43 https://github.com/void-linux/void-packages/pull/39515
- [x] evince 43 https://github.com/void-linux/void-packages/pull/39514
- [ ] gcr4 https://github.com/void-linux/void-packages/pull/40701
- [x] gjs 2.74 https://github.com/void-linux/void-packages/pull/40702
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 118887 bytes --]
From 38ca2536e0ed057427f5db57c6195dd9d0775f08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:03:12 +0200
Subject: [PATCH 01/66] New package: gcr4-4.0.0
---
common/shlibs | 2 ++
srcpkgs/gcr4-devel | 1 +
srcpkgs/gcr4/template | 43 +++++++++++++++++++++++++++++++++++++++++++
srcpkgs/gcr4/update | 1 +
4 files changed, 47 insertions(+)
create mode 120000 srcpkgs/gcr4-devel
create mode 100644 srcpkgs/gcr4/template
create mode 100644 srcpkgs/gcr4/update
diff --git a/common/shlibs b/common/shlibs
index 72c62657dc59..19ce25d99572 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1037,6 +1037,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.0.0 gcr4-4.0.0_1
+libgcr-4.so.0.0.0 gcr4-4.0.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 000000000000..e85b363d95de
--- /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 000000000000..c088e87bc16f
--- /dev/null
+++ b/srcpkgs/gcr4/template
@@ -0,0 +1,43 @@
+# Template file for 'gcr4'
+pkgname=gcr4
+version=4.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+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="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 <orphan@voidlinux.org>"
+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=c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c
+make_check_pre="dbus-run-session"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+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
+ }
+}
diff --git a/srcpkgs/gcr4/update b/srcpkgs/gcr4/update
new file mode 100644
index 000000000000..81e9823e570d
--- /dev/null
+++ b/srcpkgs/gcr4/update
@@ -0,0 +1 @@
+pkgname="gcr"
From 57288189f7660bfb2d2cf61dc49400eefe941517 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 02/66] 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 19ce25d99572..3a88e83e3967 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..dd6e4aac5600 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-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 87ac23de43633162ac805e1fb46eeca45fbdfd48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 03/66] 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 7621c5fa8ee1..144e7da1aa65 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.6
+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=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
do_check() {
mkdir /tmp/gnome-shell-xdg
From 4a92df58854b2c021ddd82771c799b392ddcd138 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 04/66] 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 3a88e83e3967..3ca4e2cc49a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..a6fc89cfdb1d 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 <gottox@voidlinux.org>"
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 ece543b7d73233281cec5322e1cdec4f4b54ba50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 05/66] evolution: update to 3.46.0.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..ef10334fdb4d 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+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 <gottox@voidlinux.org>"
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 4797db7d7249eb2684fa15c19ea99bc1704de678 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 06/66] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 cab7db83928ce31e456baeeb87215ce8fdb82b2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 07/66] 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 2446b3edd159..9cc0b9809f69 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 <masaj@gmx.com>"
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 04fa100cba43584b23b9344ec0fcee31591194e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/66] 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 fbc56862bde7..acc873462be6 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 207975c9b11621fe2de188e75d04c6da910f0e03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 09/66] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 04e3defd736c6a67dd69a4165b6d60ecafe4f243 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 10/66] 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 84ff92b93ae8..d6a5662e0b58 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 9e08dcbea72efb9b45fbe92fb9ecc5d386cefd91 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 11/66] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 61524e03d96ce81a076d5f0103abab07e77de187 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 12/66] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 c7ca9a14e867953c88a66656738d486edc268c5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 13/66] 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 3ca4e2cc49a1..ae9dd0407932 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..0622908753aa 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.6
+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 <gottox@voidlinux.org>"
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=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 25c245accd7ad178336c581bee736f562e519c02 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 14/66] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 c91fdb1c84baee45c7ad75868b1636dd9d6ffdd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 15/66] 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 64ecf75826b7..4ee3cbced47f 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 6c20a8a8262a7841cc6989889c3d142176996f35 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 16/66] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 7b80267d6a86cd9b1fe36c3c2cad8466551e07be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 17/66] 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 086915b3988f..5c0919c4013e 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=42.2
-revision=2
+version=43.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
@@ -12,9 +12,10 @@ short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 f6e6dfa14e20a3c1dbd5175384efe17d8f0ad2f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 18/66] 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 0b7aae2e9efc..83ea29b5a485 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 18c797c2fb35f31446565d0174d7aa8f2015be49 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/66] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 9c676041917902340a78fbabf5ab35de299a92dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/66] 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 0eb8af318ac2..b481d520e2a2 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 69ae55e37ee55ff992f54671579f73435969c626 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/66] 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 571013b24c7d..ea8f2ad81d47 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 9ac498fb05de92b679aed21cfd66b689367a999b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/66] 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 9197dbbcbd46..7ce5da3a10cb 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 bed352c95f1c26d37ff142eb94b94333303aa819 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/66] 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 ae9dd0407932..ef249073e284 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 ae59512f7e7ee5f84d061302069959f01a5a6a7f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 24/66] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 261b15808367bbe6156b56a6e7343dee1e18ace7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 25/66] 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 1baaf1e1922f..0c929aa19e70 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 15e3acdf47d38a2e6a0455942e003658c55cba67 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 26/66] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From dc308f6428ae1caadbbf6493e96e3398b54c78a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 27/66] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 0e3a3d26f292a4390c80096eae4d30368c69f807 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 28/66] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From af1691e843ef0b06ee12c6845bce8df1a2351e61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 29/66] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 cfa561dab1f376fdb32518ba26826bf5b1d959a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 30/66] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From dfc8b221a8c011f35811bec64fa26f1740ae5bd8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 31/66] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 44680d94fbd738888dc06f98c3411932954f9883 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:49 +0100
Subject: [PATCH 32/66] gnome-shell: update to 43.1.
---
srcpkgs/gnome-shell/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 144e7da1aa65..93ad9396c7f4 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=43.0
+version=43.1
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=f6eec97703f9f3cc6fe6e6b41f6dc821b18ec84df8351c4df97b17ae82741b41
+checksum=df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc
do_check() {
mkdir /tmp/gnome-shell-xdg
From 75821e406053b6677c024d1a1fdbc9af07c40335 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 33/66] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..f04be0130d79 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From bdf3e317038a6c8c22da080920b984865fd4d99c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:13 +0100
Subject: [PATCH 34/66] eog: update to 43.1.
---
srcpkgs/eog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 83ea29b5a485..2cf08f89629c 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
-version=43.0
-revision=2
+version=43.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=a52a2f3eb1a3bb50038a3362902bc795163e1a986763ee82d20424e7ae84546f
+checksum=fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971
shlib_provides="libeog.so"
lib32disabled=yes
From b82ab375c3d53c1ebf8c37b5c4c72966e940a761 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:19 +0100
Subject: [PATCH 35/66] mutter: update to 43.1.
---
srcpkgs/mutter/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index dd6e4aac5600..6952076b701f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.0
+version=43.1
revision=1
build_helper="gir"
build_style=meson
@@ -18,9 +18,9 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=8d9ba528ed99ef6799642e147b3fe9f2bcbeca9beced2845c1cadb331cd3e525
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264
shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
libmutter-cogl-pango-11.so"
make_check=no # needs a full graphical session
From 6e57cb6c6650bf18a75fda0dba639ea624daac4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:23 +0100
Subject: [PATCH 36/66] evolution-ews: update to 3.46.1.
---
srcpkgs/evolution-ews/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 9cc0b9809f69..0040e0a55291 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -12,5 +12,5 @@ maintainer="Peter Kuchar <masaj@gmx.com>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd97ba205cc45bad12997bee1348a2f91d8b02d714583d79f4fae1794dac1b80
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=a79269ef09e8a80ba8f0ccbc643325d2bb05734d79f06f31f2501e8567cb8dbd
From 55c32342848e54f6634e45bc146ed366eb14be02 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:19:50 +0100
Subject: [PATCH 37/66] evolution: update to 3.46.1.
---
srcpkgs/evolution/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index ef10334fdb4d..79114cbd9906 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="qemu"
@@ -20,7 +20,7 @@ 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-43/NEWS"
distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=e09e9276bc6b9abf0dad3a4e813eea1d025f4f6aaf1fac3b7b0f88895742913f
+checksum=1ac84583ed2caf897b074e99f93542ad1446fff0acfab86d5e679e033ae02c86
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 4d346516ac43b0528b005e32219560d1a50d8f52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 38/66] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From bdaca65d0a99e09dc712a7c858e180de93994bb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:42:18 +0100
Subject: [PATCH 39/66] evolution-data-server: update to 3.46.1.
---
srcpkgs/evolution-data-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index a6fc89cfdb1d..0c5d89c6ea0b 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.46.0
+version=3.46.1
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
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
+checksum=c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb
build_options="gir"
build_options_default="gir"
From 468396fac966a960d0d715c0840543c18acc612a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:47:15 +0100
Subject: [PATCH 40/66] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 0c929aa19e70..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
-revision=3
+version=43.0
+revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 647505464ed98963b080bb25c2f76159f1d76027 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:49:28 +0100
Subject: [PATCH 41/66] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 5c0919c4013e..701f02accc6c 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
-version=43.0
+version=43.1
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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
@@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Calendar"
#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=09e5c0f9360f3f856deaa7c0db30f5dab0151180df4183807c6cf3602992f5cc
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 0fcbf6c699be138d01b67614f852e8c609373b2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:51:12 +0100
Subject: [PATCH 42/66] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 7ce5da3a10cb..42b75d08cdd2 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,19 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 2efbab2b0452aba11b732b561717428ee8f2e9db Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:53:28 +0100
Subject: [PATCH 43/66] gnome-contacts: update to 43.0.
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 4ee3cbced47f..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=3
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 86352199b3f81c2f905c65c3c7fd96eb051bd6fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:03 +0100
Subject: [PATCH 44/66] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index d6a5662e0b58..33b10b274f28 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=43.0
+version=43.1
revision=1
build_style=meson
build_helper="gir"
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 215fba5dc91ae8d3cb1d61ea124fbb1c63e03abf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:08 +0100
Subject: [PATCH 45/66] gnome-initial-setup: update to 43.1.
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cc0b94f2aa42..fe6ed931ac04 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=43.0
+version=43.1
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-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
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
+checksum=8104e7043ef9b98e2b50b2ab38fda05fd0437f8c55569fa16830b7be57be0df6
From 81677df3503ab09dcd5d680dcbcf3e17a37f0114 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 46/66] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..2fa408d08dde 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -12,8 +12,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 7c6a0cce525b9c388dfaf7bb2cec17f09a70f1e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 47/66] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 23ade52f8d715ad93c27cf309cb1fb18c7fdf2c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 48/66] gnome-terminal: update to 3.46.6.
---
srcpkgs/gnome-terminal/template | 10 +++++-----
srcpkgs/gnome-terminal/template.orig | 30 ++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gnome-terminal/template.orig
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..b530be088d27 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.6
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=b34f72167b906092b1c5356eac2511159e1c74478d00399f3b853939c925893b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
diff --git a/srcpkgs/gnome-terminal/template.orig b/srcpkgs/gnome-terminal/template.orig
new file mode 100644
index 000000000000..f12986cc45af
--- /dev/null
+++ b/srcpkgs/gnome-terminal/template.orig
@@ -0,0 +1,30 @@
+# Template file for 'gnome-terminal'
+pkgname=gnome-terminal
+version=3.44.1
+revision=1
+build_style=meson
+configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
+ nautilus-devel vte3-devel"
+depends="desktop-file-utils"
+short_desc="GNOME terminal emulator application"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, GFDL-1.3-only"
+homepage="https://wiki.gnome.org/Apps/Terminal"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+lib32disabled=yes
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" desktop-file-utils"
+ configure_args+=" -Dsearch_provider=false"
+fi
+
+nautilus-gnome-terminal-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
From 304b0c8eee1c44374830afb6e7aedb813e88861b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 49/66] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..ed51c6a78aa9 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,5 +9,5 @@ short_desc="Theme consisting of a set of icons for GTK+"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From a51160760459a5e239c8a4be82fad08dee705377 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 50/66] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..c59007798d22 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -10,6 +10,6 @@ short_desc="User documentation for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 6c529b2411241a305e743d1dd166d4b70edb4150 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:12:47 +0100
Subject: [PATCH 51/66] baobab: update to 43.0.
---
srcpkgs/baobab/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 23e3372ea262..61dd3102439a 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,6 +1,6 @@
# Template file for 'baobab'
pkgname=baobab
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="gettext pkg-config itstool glib-devel vala"
@@ -10,5 +10,5 @@ short_desc="Graphical directory tree analyzer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later"
homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc
+distfiles="${GNOME_SITE}/baobab/${version%.*}/baobab-${version}.tar.xz"
+checksum=52c6864118f5697f5a5736882dcda27db22e7220bc492838deecc699246cdb26
From 8c3d9d74aeede16d98ba1244b90af85a5e469711 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:11 +0100
Subject: [PATCH 52/66] gnome-calculator: update to 43.0.1.
---
srcpkgs/gnome-calculator/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 28411fde0009..a4385bfb93fe 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-calculator'
pkgname=gnome-calculator
-version=42.2
+version=43.0.1
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="cmake gettext glib-devel itstool pkg-config vala
gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel
- libmpc-devel libsoup-devel gtk4-devel libadwaita-devel"
+ libmpc-devel libsoup3-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
short_desc="GNOME calculator"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calculator"
changelog="https://gitlab.gnome.org/GNOME/gnome-calculator/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=33dab1bca43658d66520958b0f674cb0ad3185cfd30c12e459e7f69481c5c6a0
+distfiles="${GNOME_SITE}/gnome-calculator/${version%%.*}/gnome-calculator-${version}.tar.xz"
+checksum=02c12ded3cf5053d17537d95ec69587f4b919899d7726eceecdb4b47ffb1c90f
From 6bcfbb332dd079808bfef5dd23c75563d373fac0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 53/66] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..98f012abf642 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=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=43
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
- zenity>=3.${version}"
+ zenity>=3.42"
From 0cd045d613d427d7fb709250aef0a6f149d74ef5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 54/66] gnome: update to 43.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..905c87ac276d 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version%.*}.alpha
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-terminal>=3.46
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,12 +58,12 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
+ gnome-system-monitor>=42
gnome-terminal>=3.${version}
gnome-text-editor>=${version}
gnote>=${version}
From 4aa7a2a0477423e5c05c9e380dd00e0aa6308ee7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:16:04 +0100
Subject: [PATCH 55/66] gnome-characters: update to 43.1.
---
srcpkgs/gnome-characters/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index c4bf34464a64..10abaa3cb9af 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-characters'
pkgname=gnome-characters
-version=42.0
-revision=2
+version=43.1
+revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="gettext gjs glib-devel itstool pkg-config"
+hostmakedepends="gettext gjs glib-devel itstool pkg-config desktop-file-utils"
makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel libunistring-devel"
depends="gnome-desktop gjs libadwaita"
short_desc="Utility to find and insert unusual characters for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8
+distfiles="${GNOME_SITE}/gnome-characters/${version%.*}/gnome-characters-${version}.tar.xz"
+checksum=b23e15d950978b363c81a47261ee1a3b47db3c6697ee169ff213eea6572a7841
lib32disabled=yes
From 472de2938dc75500dfeea7b7ecaa6fe94f642a01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:28:00 +0100
Subject: [PATCH 56/66] gnome-disk-utility: update to 43.0.
---
srcpkgs/gnome-disk-utility/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 6164ffb20058..5cb095fa06a3 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=42.0
+version=43.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
-hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
+hostmakedepends="glib-devel gettext pkg-config desktop-file-utils"
makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
libhandy1-devel"
@@ -13,6 +13,6 @@ short_desc="GNOME libraries and applications for dealing with storage devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b
+distfiles="${GNOME_SITE}/gnome-disk-utility/${version%.*}/gnome-disk-utility-${version}.tar.xz"
+checksum=7afca9805a6b92db6933dd7efcec4af8386c01bbc1f871e2dae4def7e192a2c5
lib32disabled=yes
From 6bb1462f38af970222d17a17f9d6803467b1878c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:32:09 +0100
Subject: [PATCH 57/66] gnome-disk-utility: enable elogind support
---
srcpkgs/gnome-disk-utility/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 5cb095fa06a3..f6c55f1fc1d3 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
version=43.0
-revision=1
+revision=2
build_style=meson
-configure_args="-Dlogind=none"
+configure_args="-Dlogind=libelogind"
hostmakedepends="glib-devel gettext pkg-config desktop-file-utils"
makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
- libhandy1-devel"
+ libhandy1-devel elogind-devel"
depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
short_desc="GNOME libraries and applications for dealing with storage devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
From aa14fa2597d2e46358628535e572a923a3a51054 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 58/66] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..6fc038e3d826 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -11,5 +11,5 @@ short_desc="Font viewer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From e003656096318d97ded522ef0289e6c289d1b679 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:45:58 +0100
Subject: [PATCH 59/66] gnome-maps: update to 43.2.
---
srcpkgs/gnome-maps/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index bf82966579bb..8e387a6e7c37 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
-version=42.3
-revision=3
+version=43.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest0-devel libhandy1-devel
+makedepends="geoclue2-devel gjs-devel
+ gnome-desktop-devel libshumate-devel rest-devel libadwaita-devel
libgweather-devel"
-depends="geoclue2 gjs libhandy1 libgweather"
+depends="geoclue2 gjs libadwaita libgweather"
short_desc="GNOME maps application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-maps/${version%.*}/gnome-maps-${version}.tar.xz"
-checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
+checksum=c0221d250be45ea36e971ae63bfde971a46145c967b1c659e96c5b072a71551d
From 1640321f8a3d93c9235b0f2353affca09110071e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 60/66] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 72ab1bc64e96cfdf53314b6933b84eaa56b83a73 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 61/66] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..e5c80c65401d 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From d3332f2ce4afe40863da07245a1986d992155644 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 62/66] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From ccd262dc289c084e775301c34be1c434fb1fc1c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 63/66] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 6 +--
2 files changed, 3 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..004f1e6d2b58 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,6 +1,6 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,8 +10,8 @@ short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
From afe809dfab096f47f42b66fef4bd61cd47316372 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:10:42 +0100
Subject: [PATCH 64/66] ghex: update to 43.0.
---
common/shlibs | 2 +-
srcpkgs/ghex/template | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ef249073e284..e3ee4c4f9aca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,7 +1584,7 @@ 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
-libgtkhex-4.so.0 libgtkhex-42.1_1
+libgtkhex-4.so.1 libgtkhex-43.0_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
libdovecot.so.0 dovecot-2.3.13_3
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index 6d9b98d886ab..e0d0ce8b5630 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -1,6 +1,6 @@
# Template file for 'ghex'
pkgname=ghex
-version=42.3
+version=43.0
revision=1
build_style=meson
build_helper=gir
@@ -8,15 +8,15 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
desktop-file-utils gtk-update-icon-cache $(vopt_if gtk_doc gi-docgen)"
-makedepends="gtk4-devel"
+makedepends="gtk4-devel libadwaita-devel"
depends="hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Simple binary editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, GFDL-1.1-only"
homepage="https://gitlab.gnome.org/GNOME/ghex"
-changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-42/NEWS"
-distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-$version.tar.xz"
-checksum=add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
+changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-43/NEWS"
+distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-${version}.tar.xz"
+checksum=866c0622c66fdb5ad2a475e9cfcccb219a1c6431f009acb2291d43f2140b147e
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
@@ -36,7 +36,7 @@ libgtkhex_package() {
}
ghex-devel_package() {
- depends="gtk4-devel libgtkhex>=${version}_${revision}"
+ depends="gtk4-devel libadwaita-devel libgtkhex>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From a90f5eb368dc2ca50b90d02e42bf3d809228d26b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 65/66] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e3ee4c4f9aca..a9bf8bbc94e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 4697e4ffa79949b6e30c87b35b37004ae7e5ae92 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 66/66] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..36d04bac0c4c 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (32 preceding siblings ...)
2022-12-11 21:00 ` paper42
@ 2022-12-11 21:53 ` paper42
2022-12-13 20:00 ` paper42
` (23 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-11 21:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
[ci skip]
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [ ] https://github.com/void-linux/void-packages/pull/41019
- [ ] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [ ] https://github.com/void-linux/void-packages/pull/41022
- [ ] https://github.com/void-linux/void-packages/pull/41023
- [ ] https://github.com/void-linux/void-packages/pull/41024
- [ ] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 108295 bytes --]
From 116d04ff62c83b862cf06fcf61ad2e16c8ba5d89 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 01/58] mutter: update to 43.1.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 19ce25d99572..3a88e83e3967 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..6952076b701f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.1
revision=1
build_helper="gir"
build_style=meson
@@ -18,11 +18,11 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264
+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 83638b1e24bc015a06ea3f0a9531cb02ca2ea2e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 02/58] gnome-shell: update to 43.1.
---
srcpkgs/gnome-shell/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..93ad9396c7f4 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.6
+version=43.1
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"
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc
do_check() {
mkdir /tmp/gnome-shell-xdg
From 4fdb3e5351c578b2b3c6b966edb799d08fc22336 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 03/58] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..f04be0130d79 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From 1b31730264e662f8693957b9d50aabefa276c2bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 04/58] evolution-data-server: update to 3.46.1.
---
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 3a88e83e3967..3ca4e2cc49a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..0c5d89c6ea0b 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.1
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 <gottox@voidlinux.org>"
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=c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb
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 ce30afc23691933ba248ff83915bec4011689cb3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 05/58] evolution: update to 3.46.1.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..79114cbd9906 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.1
+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 <gottox@voidlinux.org>"
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=1ac84583ed2caf897b074e99f93542ad1446fff0acfab86d5e679e033ae02c86
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 063265512fde218ee6fcec5e058553b9112185ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 06/58] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 df0f150b4131b92530ad7b348dd4cf1d9c769b87 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 07/58] evolution-ews: update to 3.46.1.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..0040e0a55291 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.1
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=a79269ef09e8a80ba8f0ccbc643325d2bb05734d79f06f31f2501e8567cb8dbd
From b6dbdcec0a75c1b6905dfa191c6bfdf2b1f9a3a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/58] 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 fbc56862bde7..acc873462be6 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 78fe8efb1b90d91b8293ea0b3b67f1c92d6caec2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 09/58] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 d483a5ca0967a362adeeb285bc87dccc05434b72 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 10/58] 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 84ff92b93ae8..d6a5662e0b58 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 3d4387e03d945c8009cd635c401d56d945f49047 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 11/58] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 48edff79ac0d72ac47042863794d6fd34b54cf0e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 12/58] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 681e469e28b2b94a528500bf4b61c32ba5fd3c40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 13/58] 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 3ca4e2cc49a1..ae9dd0407932 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..0622908753aa 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.6
+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 <gottox@voidlinux.org>"
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=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From bb42d01c3743b1f644959cab7812a810cd941784 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 14/58] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 1817c7a1b9bd0d54deababc1b39c21d5194213ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 15/58] 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 64ecf75826b7..4ee3cbced47f 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 77fea6ca85a2071302c9d9480972fe739d48cbb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 16/58] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 f8d2ba72059a308b9cef1bb236077329279048a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 17/58] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..812f3af1ac87 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 42acd038284f6ed8491739ca20d5fa13773e3607 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 18/58] 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 0b7aae2e9efc..83ea29b5a485 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 0eb2d55a6766161c6af012e22b804d7df3759777 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/58] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From c90d0b3ba34b2ad659dfa9752317e06aa98c902c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/58] 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 0eb8af318ac2..b481d520e2a2 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 7f3da32c99078db865e58074ecc22b9c460d46e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/58] 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 571013b24c7d..ea8f2ad81d47 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 396f45f6e8dbbe3d73a94b43fee05336dad5f1d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/58] gnome-clocks: update to 42.0.
---
srcpkgs/gnome-clocks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 9197dbbcbd46..42b75d08cdd2 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,19 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=2
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 62d39560eefbcd912310c4c6d577e7e065326316 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/58] 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 ae9dd0407932..ef249073e284 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 2851e23d80e2aaba7f3cfd61eb6098bfe3589f1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 24/58] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 8ccaeda0d948d6e2d3adcde4b376efe2f085eb1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 25/58] 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 1baaf1e1922f..0c929aa19e70 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 7d3e906682589548f23c33cc00834a44e06b8681 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 26/58] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 0f8399d41597fec12f0b6c7efc65b9237ed9936d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 27/58] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 5259f31c514ea0ce356a84206afbaf78d244dd60 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 28/58] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From b9cf446f433f466322a5e1f9603930d574afa08f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 29/58] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 45ef5442dda32116cb9371bcc439b9a8ca2e0092 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 30/58] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From 4e0c3c50df9e5e653939cb7fac6dbbb176c62178 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 31/58] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 7e1c13cd1159bab835d4f05a43668e3b6ee4d764 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:13 +0100
Subject: [PATCH 32/58] eog: update to 43.1.
---
srcpkgs/eog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 83ea29b5a485..2cf08f89629c 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
-version=43.0
-revision=2
+version=43.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=a52a2f3eb1a3bb50038a3362902bc795163e1a986763ee82d20424e7ae84546f
+checksum=fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971
shlib_provides="libeog.so"
lib32disabled=yes
From 1dabf1410aee6b6c25ef0aabdb8016c6a1e42c01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 33/58] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From a3ee02314b173ddbf30cbc722446d3387e9bf869 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:47:15 +0100
Subject: [PATCH 34/58] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 0c929aa19e70..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
-revision=3
+version=43.0
+revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 3aaa95b4bf585edc6ef413abc3ff947bf6a1af3b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:53:28 +0100
Subject: [PATCH 35/58] gnome-contacts: update to 43.0.
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 4ee3cbced47f..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=3
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 9fd26af2a276eaf503f30e82c1ec847bb5460152 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:03 +0100
Subject: [PATCH 36/58] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index d6a5662e0b58..33b10b274f28 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=43.0
+version=43.1
revision=1
build_style=meson
build_helper="gir"
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 9f57d4d16ad0b9d2cd29d41fe5fc18c2412def89 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:08 +0100
Subject: [PATCH 37/58] gnome-initial-setup: update to 43.1.
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cc0b94f2aa42..fe6ed931ac04 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=43.0
+version=43.1
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-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
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
+checksum=8104e7043ef9b98e2b50b2ab38fda05fd0437f8c55569fa16830b7be57be0df6
From 40304d855ef3981e17df094b88cf9d4d27616e2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 38/58] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..2fa408d08dde 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -12,8 +12,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From eb4dd2a819f5569f049942fcc5e98f3ccb204288 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 39/58] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 048c4d640e7d1ea4c1ceb6384349b60a3b2e41f4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 40/58] gnome-terminal: update to 3.46.6.
---
srcpkgs/gnome-terminal/template | 10 +++++-----
srcpkgs/gnome-terminal/template.orig | 30 ++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gnome-terminal/template.orig
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..b530be088d27 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.6
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=b34f72167b906092b1c5356eac2511159e1c74478d00399f3b853939c925893b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
diff --git a/srcpkgs/gnome-terminal/template.orig b/srcpkgs/gnome-terminal/template.orig
new file mode 100644
index 000000000000..f12986cc45af
--- /dev/null
+++ b/srcpkgs/gnome-terminal/template.orig
@@ -0,0 +1,30 @@
+# Template file for 'gnome-terminal'
+pkgname=gnome-terminal
+version=3.44.1
+revision=1
+build_style=meson
+configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
+ nautilus-devel vte3-devel"
+depends="desktop-file-utils"
+short_desc="GNOME terminal emulator application"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, GFDL-1.3-only"
+homepage="https://wiki.gnome.org/Apps/Terminal"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+lib32disabled=yes
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" desktop-file-utils"
+ configure_args+=" -Dsearch_provider=false"
+fi
+
+nautilus-gnome-terminal-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
From 08e19ae8a36c7e1fda2dd315914a2d456fefa291 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 41/58] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..ed51c6a78aa9 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,5 +9,5 @@ short_desc="Theme consisting of a set of icons for GTK+"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From df407db1e11727ead0476d1c1af50cb3f10e1e30 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 42/58] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..c59007798d22 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -10,6 +10,6 @@ short_desc="User documentation for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 0d19fcc887501e2968d9fb24b5689dec0fe425bc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:12:47 +0100
Subject: [PATCH 43/58] baobab: update to 43.0.
---
srcpkgs/baobab/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index 23e3372ea262..61dd3102439a 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -1,6 +1,6 @@
# Template file for 'baobab'
pkgname=baobab
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="gettext pkg-config itstool glib-devel vala"
@@ -10,5 +10,5 @@ short_desc="Graphical directory tree analyzer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later"
homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc
+distfiles="${GNOME_SITE}/baobab/${version%.*}/baobab-${version}.tar.xz"
+checksum=52c6864118f5697f5a5736882dcda27db22e7220bc492838deecc699246cdb26
From 6cee0d6c1bad15f88f997e020d294325c14970ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:11 +0100
Subject: [PATCH 44/58] gnome-calculator: update to 43.0.1.
---
srcpkgs/gnome-calculator/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 28411fde0009..a4385bfb93fe 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-calculator'
pkgname=gnome-calculator
-version=42.2
+version=43.0.1
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="cmake gettext glib-devel itstool pkg-config vala
gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel
- libmpc-devel libsoup-devel gtk4-devel libadwaita-devel"
+ libmpc-devel libsoup3-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
short_desc="GNOME calculator"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Calculator"
changelog="https://gitlab.gnome.org/GNOME/gnome-calculator/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=33dab1bca43658d66520958b0f674cb0ad3185cfd30c12e459e7f69481c5c6a0
+distfiles="${GNOME_SITE}/gnome-calculator/${version%%.*}/gnome-calculator-${version}.tar.xz"
+checksum=02c12ded3cf5053d17537d95ec69587f4b919899d7726eceecdb4b47ffb1c90f
From c6130afa9886f25477a3a46f18e23c64115d9b48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 45/58] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..98f012abf642 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=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=43
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
- zenity>=3.${version}"
+ zenity>=3.42"
From 2baf3eddd68c9d522a76fad5620fd51e11eb82df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 46/58] gnome: update to 43.0.
* replace gnome-terminal by gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..144503420ff8 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version%.*}.alpha
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
From cb9bb465a1cde8b592771e53a5957f3f35e2623d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:16:04 +0100
Subject: [PATCH 47/58] gnome-characters: update to 43.1.
---
srcpkgs/gnome-characters/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template
index c4bf34464a64..10abaa3cb9af 100644
--- a/srcpkgs/gnome-characters/template
+++ b/srcpkgs/gnome-characters/template
@@ -1,16 +1,16 @@
# Template file for 'gnome-characters'
pkgname=gnome-characters
-version=42.0
-revision=2
+version=43.1
+revision=1
build_style=meson
build_helper="gir"
-hostmakedepends="gettext gjs glib-devel itstool pkg-config"
+hostmakedepends="gettext gjs glib-devel itstool pkg-config desktop-file-utils"
makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel libunistring-devel"
depends="gnome-desktop gjs libadwaita"
short_desc="Utility to find and insert unusual characters for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/Apps/CharacterMap"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8
+distfiles="${GNOME_SITE}/gnome-characters/${version%.*}/gnome-characters-${version}.tar.xz"
+checksum=b23e15d950978b363c81a47261ee1a3b47db3c6697ee169ff213eea6572a7841
lib32disabled=yes
From bce89928162ee2a5946a7d1c60df3751556c8ed0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:28:00 +0100
Subject: [PATCH 48/58] gnome-disk-utility: update to 43.0.
---
srcpkgs/gnome-disk-utility/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 6164ffb20058..5cb095fa06a3 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=42.0
+version=43.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
-hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt"
+hostmakedepends="glib-devel gettext pkg-config desktop-file-utils"
makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
libhandy1-devel"
@@ -13,6 +13,6 @@ short_desc="GNOME libraries and applications for dealing with storage devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b
+distfiles="${GNOME_SITE}/gnome-disk-utility/${version%.*}/gnome-disk-utility-${version}.tar.xz"
+checksum=7afca9805a6b92db6933dd7efcec4af8386c01bbc1f871e2dae4def7e192a2c5
lib32disabled=yes
From f3654527920b6cb1599a5a55ad4f017bc4b8dc35 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:32:09 +0100
Subject: [PATCH 49/58] gnome-disk-utility: enable elogind support
---
srcpkgs/gnome-disk-utility/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 5cb095fa06a3..f6c55f1fc1d3 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
version=43.0
-revision=1
+revision=2
build_style=meson
-configure_args="-Dlogind=none"
+configure_args="-Dlogind=libelogind"
hostmakedepends="glib-devel gettext pkg-config desktop-file-utils"
makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel
libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel
- libhandy1-devel"
+ libhandy1-devel elogind-devel"
depends="desktop-file-utils gptfdisk hicolor-icon-theme parted"
short_desc="GNOME libraries and applications for dealing with storage devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
From bd41022fbc8dc90ab7b765819361392b52d7e3f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 50/58] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..6fc038e3d826 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -11,5 +11,5 @@ short_desc="Font viewer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From b024526b069d7d58b88644d600b1fa506d20ff34 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:45:58 +0100
Subject: [PATCH 51/58] gnome-maps: update to 43.2.
---
srcpkgs/gnome-maps/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index bf82966579bb..8e387a6e7c37 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
-version=42.3
-revision=3
+version=43.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest0-devel libhandy1-devel
+makedepends="geoclue2-devel gjs-devel
+ gnome-desktop-devel libshumate-devel rest-devel libadwaita-devel
libgweather-devel"
-depends="geoclue2 gjs libhandy1 libgweather"
+depends="geoclue2 gjs libadwaita libgweather"
short_desc="GNOME maps application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-maps/${version%.*}/gnome-maps-${version}.tar.xz"
-checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
+checksum=c0221d250be45ea36e971ae63bfde971a46145c967b1c659e96c5b072a71551d
From fadcf071803e44e02519bf43385cc55b47669aab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 52/58] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 6693f9ed1c4202ff62a00b79890d3397d1429f4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 53/58] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..e5c80c65401d 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From d3163183297061ba332c9807696ddb09f9a48287 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 54/58] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From 8035353845ad7fec88624a7d47c6094295328cc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 55/58] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 6 +--
2 files changed, 3 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..004f1e6d2b58 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,6 +1,6 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,8 +10,8 @@ short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
From c36b30e6d9b398c4ab5b9ebf485dfc099ec36694 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:10:42 +0100
Subject: [PATCH 56/58] ghex: update to 43.0.
---
common/shlibs | 2 +-
srcpkgs/ghex/template | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ef249073e284..e3ee4c4f9aca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1584,7 +1584,7 @@ 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
-libgtkhex-4.so.0 libgtkhex-42.1_1
+libgtkhex-4.so.1 libgtkhex-43.0_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
libdovecot.so.0 dovecot-2.3.13_3
diff --git a/srcpkgs/ghex/template b/srcpkgs/ghex/template
index 6d9b98d886ab..e0d0ce8b5630 100644
--- a/srcpkgs/ghex/template
+++ b/srcpkgs/ghex/template
@@ -1,6 +1,6 @@
# Template file for 'ghex'
pkgname=ghex
-version=42.3
+version=43.0
revision=1
build_style=meson
build_helper=gir
@@ -8,15 +8,15 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
$(vopt_bool gtk_doc gtk_doc)"
hostmakedepends="pkg-config iso-codes gettext itstool glib-devel
desktop-file-utils gtk-update-icon-cache $(vopt_if gtk_doc gi-docgen)"
-makedepends="gtk4-devel"
+makedepends="gtk4-devel libadwaita-devel"
depends="hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Simple binary editor for GNOME"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, GFDL-1.1-only"
homepage="https://gitlab.gnome.org/GNOME/ghex"
-changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-42/NEWS"
-distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-$version.tar.xz"
-checksum=add40f8ab24921db30d27be58f00273201977d87fdc8d79eceadfa8b0e354def
+changelog="https://gitlab.gnome.org/GNOME/ghex/-/raw/ghex-43/NEWS"
+distfiles="${GNOME_SITE}/ghex/${version%.*}/ghex-${version}.tar.xz"
+checksum=866c0622c66fdb5ad2a475e9cfcccb219a1c6431f009acb2291d43f2140b147e
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
@@ -36,7 +36,7 @@ libgtkhex_package() {
}
ghex-devel_package() {
- depends="gtk4-devel libgtkhex>=${version}_${revision}"
+ depends="gtk4-devel libadwaita-devel libgtkhex>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 92454d4eae9158dcd5a4b89d231a50bc57d14325 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 57/58] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e3ee4c4f9aca..a9bf8bbc94e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 36623fbe64d38a5872a61099db312e558e1afe2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 58/58] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..36d04bac0c4c 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (33 preceding siblings ...)
2022-12-11 21:53 ` paper42
@ 2022-12-13 20:00 ` paper42
2022-12-15 16:39 ` paper42
` (22 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-13 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2218 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
[ci skip]
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 97247 bytes --]
From f7430402c47980f1f4380e9043b11b8cc1d5785f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 01/51] mutter: update to 43.1.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..8c3c320951e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..6952076b701f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.1
revision=1
build_helper="gir"
build_style=meson
@@ -18,11 +18,11 @@ short_desc="Wayland display server, X11 window manager and compositor library"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264
+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 3dd4d17290919212663ce1e987f09639d90d1a6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 02/51] gnome-shell: update to 43.1.
---
srcpkgs/gnome-shell/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..93ad9396c7f4 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.6
+version=43.1
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"
@@ -19,9 +19,9 @@ short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc
do_check() {
mkdir /tmp/gnome-shell-xdg
From 88fb21d4ad53275084df76706831eb69f37c7bd7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 03/51] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..f04be0130d79 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From e974c87650721315466a4249df7e341feae73d3c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 04/51] evolution-data-server: update to 3.46.1.
---
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 8c3c320951e5..979c83a3949d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..0c5d89c6ea0b 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.1
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 <gottox@voidlinux.org>"
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=c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb
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 c859589197d9a41626eb3e06f507c191cd397275 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 05/51] evolution: update to 3.46.1.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..79114cbd9906 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.1
+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 <gottox@voidlinux.org>"
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=1ac84583ed2caf897b074e99f93542ad1446fff0acfab86d5e679e033ae02c86
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 564bee00703c273e042468bb9369f3a8e3607a07 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 06/51] 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 4b9b2fbe1c0b..530d5eac4a2a 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 <gottox@voidlinux.org>"
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 0df3f5a25495a1c53c2bad64fdf59e591778854c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 07/51] evolution-ews: update to 3.46.1.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..0040e0a55291 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.1
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=a79269ef09e8a80ba8f0ccbc643325d2bb05734d79f06f31f2501e8567cb8dbd
From 80c9a0982135756ef7c561b17dbff299d4225592 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/51] 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 fbc56862bde7..acc873462be6 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 a7d4423166fdcdfb8940ce1ba01cd54d7fcf3b65 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 09/51] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 d9c99bf14f5221a665f50758fd17ef0ecad8b181 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 10/51] 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 84ff92b93ae8..d6a5662e0b58 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 38ce078e99783da0b7f49a28ad3be68098b043d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 11/51] gdm: update to 43.0.
---
srcpkgs/gdm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..6fcd91b69720 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -24,7 +24,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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
From 13e77f9e7209edcbc4a55fbb8d52189f6222fd9f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 12/51] 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 76b1f49f1cdc..af3335442a04 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 <gottox@voidlinux.org>"
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 32b1f455ad553a0b7bd9dc95fe7c6c36d23120a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 13/51] 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 979c83a3949d..6cf1fd3cb002 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..0622908753aa 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.6
+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 <gottox@voidlinux.org>"
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=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 0aa991f192b326ed356d40f6f13e91b5bd4337dc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 14/51] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..66c4714ec9d0 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
-revision=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 2c3fab30962c47ae752250df52cb38f49b2fc155 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 15/51] 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 64ecf75826b7..4ee3cbced47f 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 6d65f3c48fc94f28c5ba9f46e9f911e08c0df2bc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 16/51] 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 066828c02207..8842089b11ec 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 <gottox@voidlinux.org>"
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 ab775a5560a81481c4c089bc0b0dcca8c39fcffd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 17/51] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..812f3af1ac87 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From f498ff884989f765a754b8aea14fec7eb866a40a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 18/51] 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 0b7aae2e9efc..83ea29b5a485 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 f6585de4457bd104880a7ecc745fef48be0a38f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/51] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From b2e598e35980b41ec38b673371466a4384310d04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/51] 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 0eb8af318ac2..b481d520e2a2 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 dd7c9ef4bb282cc5764c10531ca1e6f29ce0cde4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/51] 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 571013b24c7d..ea8f2ad81d47 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 a72c7d3c3ab2061087eed297a8c7c39564587fc5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/51] gnome-clocks: update to 42.0.
---
srcpkgs/gnome-clocks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 9197dbbcbd46..42b75d08cdd2 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,19 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=2
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 93873ba99da72d5fedd569d4738ca00dc8309bc5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/51] 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 6cf1fd3cb002..2052dae96ca2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..624c02ead8cb 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 cdbcc053ff7c9f30c709759400c6026b4a335e4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 24/51] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 e1cc6d31bb2c7c612526c5c363d5ae93aa58a6ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 25/51] 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 1baaf1e1922f..0c929aa19e70 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 f36c6e1aee6b487010f71c33f019d593efd7b067 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 26/51] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 5de80d729ed3c01e444605b578e88a9915e021b1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 27/51] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 79ede46d0295a88503b390d0c5a65345cf2ab824 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 28/51] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 11 ++--
3 files changed, 6 insertions(+), 70 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..36b51d9945fa 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=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 9e2e50024b5b40ccdabbc980f26c8d4ce2a8500c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 29/51] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 1892f56ad1936d69ee2ec211e33a56b376f208b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 30/51] gnome-initial-setup: update to 43.0.
---
srcpkgs/gnome-initial-setup/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..cc0b94f2aa42 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,8 +9,8 @@ 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
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
From 65ef9dad909b368bb50f89d40ccdf41b42888786 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 31/51] grilo-plugins: disable goa
---
srcpkgs/grilo-plugins/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index d49a8ec8b200..27d001166fcd 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,12 +3,13 @@ pkgname=grilo-plugins
version=0.3.14
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 rest0-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 64d895c3b40e9b32b434cfec479973923994969a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:18:13 +0100
Subject: [PATCH 32/51] eog: update to 43.1.
---
srcpkgs/eog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 83ea29b5a485..2cf08f89629c 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
-version=43.0
-revision=2
+version=43.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=a52a2f3eb1a3bb50038a3362902bc795163e1a986763ee82d20424e7ae84546f
+checksum=fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971
shlib_provides="libeog.so"
lib32disabled=yes
From dc57b3edc019e2c4c6c15911ca87a1091db84654 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 33/51] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 09424c8f6a76c6c949fa240ca3314b7984b208c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:47:15 +0100
Subject: [PATCH 34/51] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 0c929aa19e70..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
-revision=3
+version=43.0
+revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From b49446f00d97598b5dc0829d83b3cd7e61adc4b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:53:28 +0100
Subject: [PATCH 35/51] gnome-contacts: update to 43.0.
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 4ee3cbced47f..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=3
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 9227c92fd0d39a782708a5841f8e229e6e5902df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:03 +0100
Subject: [PATCH 36/51] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index d6a5662e0b58..33b10b274f28 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=43.0
+version=43.1
revision=1
build_style=meson
build_helper="gir"
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 2c29432df68ddeca836cc8aea0e53b53177d9e40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:54:08 +0100
Subject: [PATCH 37/51] gnome-initial-setup: update to 43.1.
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index cc0b94f2aa42..fe6ed931ac04 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=43.0
+version=43.1
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-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
@@ -18,4 +18,4 @@ 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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=029ecb81933f404fa4f6ca55bee47b03ef890e84462bf145f6ee09477e1a3955
+checksum=8104e7043ef9b98e2b50b2ab38fda05fd0437f8c55569fa16830b7be57be0df6
From 7aec04bb09b563de616e4ec3468df7109b5b98f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 38/51] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..2fa408d08dde 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -12,8 +12,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From a5cd3c857767838367d3bd0d0162a5713c46bc7b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 39/51] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 963ee911c881a16569a5394aa932be8cf4aa3186 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 40/51] gnome-terminal: update to 3.46.6.
---
srcpkgs/gnome-terminal/template | 10 +++++-----
srcpkgs/gnome-terminal/template.orig | 30 ++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/gnome-terminal/template.orig
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..b530be088d27 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.6
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=b34f72167b906092b1c5356eac2511159e1c74478d00399f3b853939c925893b
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
diff --git a/srcpkgs/gnome-terminal/template.orig b/srcpkgs/gnome-terminal/template.orig
new file mode 100644
index 000000000000..f12986cc45af
--- /dev/null
+++ b/srcpkgs/gnome-terminal/template.orig
@@ -0,0 +1,30 @@
+# Template file for 'gnome-terminal'
+pkgname=gnome-terminal
+version=3.44.1
+revision=1
+build_style=meson
+configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
+ nautilus-devel vte3-devel"
+depends="desktop-file-utils"
+short_desc="GNOME terminal emulator application"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later, GFDL-1.3-only"
+homepage="https://wiki.gnome.org/Apps/Terminal"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+lib32disabled=yes
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" desktop-file-utils"
+ configure_args+=" -Dsearch_provider=false"
+fi
+
+nautilus-gnome-terminal-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
From d7dfd14f48ee2a49065d17365cbacd832ec4b3e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 41/51] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..ed51c6a78aa9 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -9,5 +9,5 @@ short_desc="Theme consisting of a set of icons for GTK+"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From 5e1dd0cc067b19c3dc86184d32bd1ee7b57926bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 42/51] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..c59007798d22 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -10,6 +10,6 @@ short_desc="User documentation for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From c91ea2372a6b512b220d1b358676d10a9953a5a3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 43/51] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..98f012abf642 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=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=43
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
- zenity>=3.${version}"
+ zenity>=3.42"
From fd5b73f10e638fcec3ad92a430350520785df842 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 44/51] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..144503420ff8 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version%.*}.alpha
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
From 4723a8309814aa3683685598a9d7574f25746efe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 45/51] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..6fc038e3d826 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -11,5 +11,5 @@ short_desc="Font viewer for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From 04083a67ef7f60c427aa7c53a40966ac0c908041 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 46/51] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From c8bbfaa1e027d6ec669f876915679cb8e772fcbc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 47/51] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..e5c80c65401d 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 1057762655bde75de8f33ffa874985c0bcb77e66 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 48/51] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From 94dd328afbf25390f28d80b2d1764d29a677c826 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 49/51] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 6 +--
2 files changed, 3 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..004f1e6d2b58 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,6 +1,6 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,8 +10,8 @@ short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
From 8051d3bd999170e19a0353c0480c727e200c5257 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 50/51] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2052dae96ca2..fcbf3dd61683 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 5cc0c6e66add1946cde85a8c092288bd03985014 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 51/51] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..36d04bac0c4c 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (34 preceding siblings ...)
2022-12-13 20:00 ` paper42
@ 2022-12-15 16:39 ` paper42
2022-12-15 17:09 ` paper42
` (21 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-15 16:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2218 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
[ci skip]
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 100794 bytes --]
From e8e695c499612b8b8f3054e8de56685a96fa0dbf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 01/48] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From a42f81ef79bb07d005ed3a9ebfa790c4e186c1c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 02/48] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..8c3c320951e5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 bd502db4c45a56cfe36435dd640f3e830163596b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 03/48] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From ad8f0d26db7f30d8497716713103f3270267da0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 04/48] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From f7442d21c526e2b77e3badbed8c51684c53dfc24 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 05/48] evolution-data-server: update to 3.46.2.
---
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 8c3c320951e5..979c83a3949d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 3e2d88a1b6c65e9d7503a35313d8594a1ee42fc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/48] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 f676572831fe57a6f369ad3886b3b33ffd85e5e3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/48] sushi: update to 43.0.
---
srcpkgs/sushi/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..c6f3739e96c1 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From fa849af1c21986de0986b9159c2bd1f40ae944ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/48] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From c0a0a26aac63987ef3baf9bc340920d8c25d2e9a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/48] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From 85c30361ace30f7683b246c332aa41fc14febdb1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/48] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 965a2578e872261e8559d88f9a252c8bec7cf76b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/48] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..a3866ac31251 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.1
revision=1
build_style=meson
build_helper="gir"
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 8a302ec1ec08c9bbe6b6aa231b733c6206dd53bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 12/48] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From 344be38a66095521b4e4ddc754e9cf6e8727555c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 13/48] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From 35ff1292909453e0c8b16a7ada03ddb63885948b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 14/48] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index 979c83a3949d..6cf1fd3cb002 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From b4328f55640e1b949435be7722f8c6b11eceb9a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 15/48] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From dece9c5f57c6ee8529abef735c508ac2ad16487a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 16/48] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 54a5f281dae2e0b8007b96ce827e420ee31a9fca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/48] cheese: update to 43.0.
---
srcpkgs/cheese/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 066828c02207..abbadbce4daf 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
# Template file for 'cheese'
pkgname=cheese
-version=41.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,8 +15,9 @@ short_desc="GNOME tool to take pictures and videos from your webcam"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Cheese"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547
+changelog="https://gitlab.gnome.org/GNOME/cheese/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/cheese/${version%.*}/cheese-${version}.tar.xz"
+checksum=74574c4a3c327327f1a2d6d0b3f937be2afb07a6159b6d78db9c192de6667f0b
build_options="gir gtk_doc"
build_options_default="gir"
From 6f95690922d239755e955ffa6516d22935d8f9a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 18/48] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From f0db9e4258f1108d50e447fe19f58dd62a3ec827 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/48] eog: update to 43.1.
---
srcpkgs/eog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 0b7aae2e9efc..a45f10b47bb9 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
# Template file for 'eog'
pkgname=eog
-version=43.0
+version=43.1
revision=1
build_helper="gir"
build_style=meson
@@ -10,12 +10,12 @@ makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel
librsvg-devel lcms2-devel libportal-gtk3-devel libhandy1-devel"
depends="desktop-file-utils hicolor-icon-theme shared-mime-info"
short_desc="Eye of GNOME graphics viewer program"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=a52a2f3eb1a3bb50038a3362902bc795163e1a986763ee82d20424e7ae84546f
+checksum=fed79ff3ca19bac62f27155c9bdd69eef875870b971e6dcb0aa38c093d131971
shlib_provides="libeog.so"
lib32disabled=yes
From 56dfd7caee94b7c502f0d649ae8f773bd52edd7f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/48] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From ab66f07a54fb15420a7b7094f979bf2e6c439eac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/48] 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 0eb8af318ac2..b481d520e2a2 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 99fb1ed6e08867733ff967c763d8a6c02fa6561e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 22/48] 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 571013b24c7d..ea8f2ad81d47 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 9b71e1325b50f1413766374c6c31709cf2a13cfd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 23/48] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 9197dbbcbd46..1afa0de1dac8 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=2
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 3b7b73f30335aded9c0369cda1ea38f6ecdf00af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 24/48] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 6cf1fd3cb002..2052dae96ca2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..cfeaa56f731a 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,25 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
-revision=2
+version=43.1
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# 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 dd0d5dec7cf7c889aeb335a6a39f85f77983a102 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 25/48] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 68c9736e5f7000938697d731ed086e512923851f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 26/48] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 0d0094f2f00259705a164b968e8e616d427d5bb5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 27/48] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 7ca295775c250f5a2d9587251caccef7c36203c0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 28/48] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 77e53edfc83f1af305f47a2ba3f5ca2992f21cbc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 29/48] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 14 ++---
3 files changed, 8 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..15b9aabf1110 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,22 +1,24 @@
# Template file for 'libgweather'
pkgname=libgweather
reverts="40.0_1"
-version=4.0.0
-revision=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 129a6802c3fb68116c6db51086e6ca5cf0b33bf2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 30/48] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 f8f11b5faa56b29a15d50e5fc177ba5433bb9bac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 31/48] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From dd51ba685aa5b3865350f35cf2459f8a736ea5e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 32/48] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 80c7137c822461561cc58d542b74201fd0e4f4ab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 33/48] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 68014204d3a11e541f8168074eb03116a5f3166c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 34/48] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 4268d1f586891dad0ffdd1fafdb67101940a5ce4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 35/48] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From d9e5d89940047696203f3f8fa84cdccf84e57a31 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 36/48] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..98beb6214732 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,9 +1,9 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From bad646b1c9ff352835cfce1ac81b5ede3a5d767b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 37/48] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From aa43a89d7a045acceb88e0b32d68db3c89390e49 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 38/48] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From feece550cd2e90fc0fe679592e6a4cf4ef142b8f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 39/48] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 50b8fc5cf9856799ca1ce91218efbef57b78e9b5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 40/48] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..acb6d637a833 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +29,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_install() {
- rm -f ${DESTDIR}/usr/lib64
+ rm ${DESTDIR}/usr/lib64
}
# first we want to separate -server, everything else then goes to client
From 7cd81bc0a1e46010f11f2f931c9944baece02b8a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 41/48] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From b4f1d0e348a379f4786bf321b06c2a4cfe30c02a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 42/48] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 11 +++---
2 files changed, 6 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..d4eb843ee6ba 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 075a5bb464bbd75c9fc8b1b2a0993a4fb623a845 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 43/48] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2052dae96ca2..fcbf3dd61683 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 658aad8965512e5280624ffbabbd87fe6dc064ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 44/48] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From 011477285ecd1eaf23c6ec7a31e9b9786df95412 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:45 +0100
Subject: [PATCH 45/48] yelp: use libwebkit2gtk41
---
srcpkgs/yelp/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index ee51f61289ca..09930e80e65c 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
# Template file for 'yelp'
pkgname=yelp
version=42.1
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
+configure_args="--disable-schemas-compile --disable-static"
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
+ libxml2-devel libxslt-devel sqlite-devel libwebkit2gtk41-devel yelp-xsl libhandy1-devel"
depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
short_desc="Help browser for GNOME desktop"
maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -14,11 +14,11 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp"
# change this when it moves to a new major release
changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/yelp/${version%.*}/yelp-${version}.tar.xz"
checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41
yelp-devel_package() {
- depends="yelp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From fd48017c82e1ae01cce8019f5ca395f8606dccef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 46/48] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From 4d53b18534eb708e0b5c5e7593b647d32f634f63 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 47/48] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 74c8b0c62b16d259b944e090885472431636fc3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 48/48] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/README | 13 +++++++++++++
srcpkgs/gnome/template | 28 ++++++++++++++--------------
2 files changed, 27 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/gnome/README
diff --git a/srcpkgs/gnome/README b/srcpkgs/gnome/README
new file mode 100644
index 000000000000..2f83f7fe6f6f
--- /dev/null
+++ b/srcpkgs/gnome/README
@@ -0,0 +1,13 @@
+## gnome
+mousetweaks
+## gnome-core
+font-adobe-source-code-pro
+
+check updates
+adopt stuff
+check $pkgname and $hostname in distfiles
+check for proper homepages where it's gnome.org
+check for changelogs/news
+check for intltool
+
+wrong update file gnome-terminal
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (35 preceding siblings ...)
2022-12-15 16:39 ` paper42
@ 2022-12-15 17:09 ` paper42
2022-12-15 19:48 ` paper42
` (20 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-15 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2205 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 99072 bytes --]
From b804d893d680639e042a670238914f4cb3a28f48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 01/47] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From 7c86b5954f66801024b515c5293b2fd577b048a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 02/47] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..1591b9dadd58 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 f022646d3ecd1e12c17f71d447dbb9abdb6faff2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 03/47] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From f67ebc1815091a7d5b14a7e5f493f8ca1c82fa19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 04/47] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From 907c1b918650f3f3fdb96ef8e0c9dcc478217ea0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 05/47] evolution-data-server: update to 3.46.2.
---
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 1591b9dadd58..db8553c31529 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 710dd2e97d9eaaf49dc83eb31a50a9d0db6a4c04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/47] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 da8f89b3cd28e8499c02236ea1251ef48a085a4a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/47] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From 3267ed308f676aa71041e524d322c8fe7cef2f80 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/47] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From 8c18e8a4a4edd4bbebaf00515b3bb8802a0d67f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/47] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From 91a5fafe2e7f7fd450404136ae5c951c60b9038f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/47] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 a1e097c02acf4d774c2c60a4402c758824d6fcd8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/47] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..a3866ac31251 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.1
revision=1
build_style=meson
build_helper="gir"
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 76aa5ecb24096e89364f6365ca51b49d8710d2f8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 12/47] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From cb999c7edfd8308b39905ee41bc4ce16630fcd7f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 13/47] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From f11181d0d36f83b4053c107ccf47ba1e3c1308f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 14/47] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index db8553c31529..1725ea3b1208 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 44c0ec3ca3cc9aa2b46f093af2e1652b14e7d316 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 15/47] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 016ce3cdd940bcc148fe00da0fecdc43528ff8bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 16/47] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 72116c25e0c937fe4c116774be04101afaa1c7a6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/47] cheese: update to 43.0.
---
srcpkgs/cheese/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 066828c02207..abbadbce4daf 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
# Template file for 'cheese'
pkgname=cheese
-version=41.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,8 +15,9 @@ short_desc="GNOME tool to take pictures and videos from your webcam"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Cheese"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547
+changelog="https://gitlab.gnome.org/GNOME/cheese/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/cheese/${version%.*}/cheese-${version}.tar.xz"
+checksum=74574c4a3c327327f1a2d6d0b3f937be2afb07a6159b6d78db9c192de6667f0b
build_options="gir gtk_doc"
build_options_default="gir"
From 5964ecf1ddaaf5e6f3caf6e4a2d040fac9cfd83f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 18/47] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From c1b8af62f355b39bb7ae46b1e67be01ae793df78 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/47] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From f999ef04871ef7428950fe55f39c6b854fca6d62 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/47] 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 0eb8af318ac2..b481d520e2a2 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 c992adb84d2cc0ee563b629902e6fc7cf90402a7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/47] 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 571013b24c7d..ea8f2ad81d47 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 7ed6c304b91c3a30cc183eca0d8364dba262c557 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/47] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 9197dbbcbd46..1afa0de1dac8 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=2
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 62d46bb56fc1748e4f329bf207656b751c3802d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/47] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1725ea3b1208..c30b43fdea57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..cfeaa56f731a 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,25 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
-revision=2
+version=43.1
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# 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 54e8c4e461a2e7445e936a21d2e35814860d119a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 24/47] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 9aad4fed11de8ca7e604ca87967f3dfbc2dba2f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 25/47] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 355af0deed36573f324b15a7111f54d176b437b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 26/47] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 269ca59f5c91d608eb4c16807b0ee49bd27e4eab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 27/47] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 1e662a88678cc627c3b256e10b03109caccc8ba1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 28/47] libgweather: update to 4.2.0.
---
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 14 ++---
3 files changed, 8 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 fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..15b9aabf1110 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,22 +1,24 @@
# Template file for 'libgweather'
pkgname=libgweather
reverts="40.0_1"
-version=4.0.0
-revision=3
+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-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 09a559d68ae9b673f25e33f77227f86295bd9e52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 29/47] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 b3f4b1ba858d14260493d510af6876ad986c9901 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 30/47] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 4c8e7ffbfe4c14a3214fa17172072e9ca19fd15c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 31/47] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 15d0e21a1eecd25ea499cac53140dfabf5d25257 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 32/47] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 39d16128cd216f5a4107e619f5a7c27d5217fb3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 33/47] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 381bfbdf085e40e026371c81d207ebf204af10cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 34/47] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From bed781c4e112b7bd9352937d0d3993a27c252790 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 35/47] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From 5d2d4ee2caeab51dd9c5317f83513855f49508a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 36/47] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 544451ce73bd50c8de5ac4002229dbe8df111f08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 37/47] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From 10bab3a7c1d0edf5a8fc983d9eaf2f2e82060461 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 38/47] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 5a46c0a16d58c29983a24786ec3450383afcf3bc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 39/47] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..acb6d637a833 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +29,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_install() {
- rm -f ${DESTDIR}/usr/lib64
+ rm ${DESTDIR}/usr/lib64
}
# first we want to separate -server, everything else then goes to client
From 5be335de4f3f47cb0ee69c843dd2e7b9ed59f740 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 40/47] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From d5f97f9bec0ee9bee6dcd568c78232968c3c5afe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 41/47] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 11 +++---
2 files changed, 6 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..d4eb843ee6ba 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 21aafc978ecfb82e17121ae618a6dfcff732430f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 42/47] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c30b43fdea57..b33314aeeb5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From da9fe0e36b32a1dce2a4711192f3f840e17808da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 43/47] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From 8ccaebb55f8360f5592fe258850dd5865f2e26a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:45 +0100
Subject: [PATCH 44/47] yelp: use libwebkit2gtk41
---
srcpkgs/yelp/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index ee51f61289ca..09930e80e65c 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
# Template file for 'yelp'
pkgname=yelp
version=42.1
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
+configure_args="--disable-schemas-compile --disable-static"
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
+ libxml2-devel libxslt-devel sqlite-devel libwebkit2gtk41-devel yelp-xsl libhandy1-devel"
depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
short_desc="Help browser for GNOME desktop"
maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -14,11 +14,11 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp"
# change this when it moves to a new major release
changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/yelp/${version%.*}/yelp-${version}.tar.xz"
checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41
yelp-devel_package() {
- depends="yelp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 7e3ba0abd5a875bbe78bcb305018a10017570f8e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 45/47] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From c89d4162ca61dc15278efce67ac8eac1ffd6dff3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 46/47] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From bf0a667bbaaf14c0daa822fedee9570c7341f959 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 47/47] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (36 preceding siblings ...)
2022-12-15 17:09 ` paper42
@ 2022-12-15 19:48 ` paper42
2022-12-15 20:13 ` paper42
` (19 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-15 19:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2205 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 114417 bytes --]
From 4b1b657cb5fac9bd64f9cb77b41e2cd95c9f1bf3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 01/52] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From e41b2a1723d6d27369c9f54ae298c9e2ceaf943d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 02/52] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..1591b9dadd58 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 10279652ca65640c947932579830da3393c63ed0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 03/52] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From 34c45560f9e2a9a5ae6f9a57ca72897ea8659a4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 04/52] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From 46f16f9f1242510afdcf9d728e4427ca1de733d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 05/52] evolution-data-server: update to 3.46.2.
---
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 1591b9dadd58..db8553c31529 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 01066d79be40222daf671f4797e2a361a070c4e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/52] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 97b977774e2218740ae7d34cb087e13907ddf216 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/52] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From 9a55eaf387072379a5ee01e96eb084c47f27323e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/52] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From 750d1af678b2e17d058179c4c8f3aca652e2a8d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/52] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From e0bc2eadc081e8b7e5488133d442e0f25a5b326b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/52] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 1e772f7853f0f986fa56a6d92123d241fb9e4e55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/52] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..a3866ac31251 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.1
revision=1
build_style=meson
build_helper="gir"
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From dd683a6fef053c33099ca0e203502ddb5ca1f21e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 12/52] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From ef5c521e9d68c3256b4291c931e76957ff497567 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 13/52] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From c0843850857b72fdf5672306cc7268a5019a04c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 14/52] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index db8553c31529..1725ea3b1208 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From f0dba98badca326a568300d4184f31f01bd4ad82 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 15/52] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From f293f10d1b71dbb76de3c6ecd140c35bc6aebeac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 16/52] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From ea0a0a691cdab395c385d1c44285437eeec26f5b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/52] cheese: update to 43.0.
---
srcpkgs/cheese/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 066828c02207..abbadbce4daf 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
# Template file for 'cheese'
pkgname=cheese
-version=41.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,8 +15,9 @@ short_desc="GNOME tool to take pictures and videos from your webcam"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Cheese"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547
+changelog="https://gitlab.gnome.org/GNOME/cheese/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/cheese/${version%.*}/cheese-${version}.tar.xz"
+checksum=74574c4a3c327327f1a2d6d0b3f937be2afb07a6159b6d78db9c192de6667f0b
build_options="gir gtk_doc"
build_options_default="gir"
From d53a26d76ffee015aac3fdd7846d96973a6aeccf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 18/52] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 08e48d2ee889bf46ff30de599685069e824b82e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/52] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From fc4a54fbb6f61ab105221671c308f4120bd02095 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/52] 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 0eb8af318ac2..b481d520e2a2 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 a566d3c4111b522ff717935618c61ca3728386da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/52] 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 571013b24c7d..ea8f2ad81d47 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 08dffa668cc96256caa55d5382ce6b2acf00c5b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/52] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 9197dbbcbd46..1afa0de1dac8 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=2
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From 94b7112567cda3d2fcc9bea8cec0df6961b807cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/52] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1725ea3b1208..c30b43fdea57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..cfeaa56f731a 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,25 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
-revision=2
+version=43.1
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# 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 1298cb33d956f8cb1bb0f7143145c741198a4883 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 24/52] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From 20690a92508429bee27e9e369c1d9470aed25a85 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:31:06 +0100
Subject: [PATCH 25/52] dropbox: remove package
doesn't work with nautilus 43
---
srcpkgs/dropbox/template | 25 -------------------------
srcpkgs/dropbox/update | 1 -
srcpkgs/nautilus-dropbox | 1 -
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/dropbox/template
delete mode 100644 srcpkgs/dropbox/update
delete mode 120000 srcpkgs/nautilus-dropbox
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
deleted file mode 100644
index 7b73816c3c5c..000000000000
--- a/srcpkgs/dropbox/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'dropbox'
-pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
-makedepends="nautilus-devel python3-devel python3-gobject-devel"
-depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
-short_desc="Dropbox file sharing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
-
-nautilus-dropbox_package() {
- short_desc="Dropbox nautilus plugin"
- depends="dropbox>=${version}_${revision}"
- pkg_install() {
- vmove /usr/lib/nautilus
- vmove /usr/share/nautilus-dropbox
- }
-}
diff --git a/srcpkgs/dropbox/update b/srcpkgs/dropbox/update
deleted file mode 100644
index db5a2a8292c3..000000000000
--- a/srcpkgs/dropbox/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=nautilus-dropbox
diff --git a/srcpkgs/nautilus-dropbox b/srcpkgs/nautilus-dropbox
deleted file mode 120000
index 650a4c835dc4..000000000000
--- a/srcpkgs/nautilus-dropbox
+++ /dev/null
@@ -1 +0,0 @@
-dropbox
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df3fdc331c84..643f738cc91c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -79,6 +79,7 @@ replaces="
dnote-cli<=0.6.2_1
docker2aci<=0.17.2_4
dreampie<=1.2.1_3
+ dropbox<=2020.03.04_2
dtkcore-devel<=2.1.1_2
dtkcore<=2.1.1_2
dtkwidget-devel<=2.1.1_2
@@ -311,6 +312,7 @@ replaces="
mozjs68<=68.11.0_1
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
+ nautilus-dropbox<=2020.03.04_2
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From c4118ef1b236df27820fd168d336814f8ddf8d51 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 26/52] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 565cd8af5377a3cdcca88d925afe96ab7f914597 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 27/52] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 31b13db09eb8a5db67e0efd91e2092bbd67e9bf5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 28/52] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 0e8daa3119a4dc12b56bcef8e6c218146b82522a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:42:49 +0100
Subject: [PATCH 29/52] nautilus-python: remove package
doesn't work with nautilus 43
---
srcpkgs/nautilus-python/template | 25 -------------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 srcpkgs/nautilus-python/template
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
deleted file mode 100644
index b65f4808f4f1..000000000000
--- a/srcpkgs/nautilus-python/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'nautilus-python'
-pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
-depends="nautilus python3-gobject"
-short_desc="Python bindings for the Nautilus extension framework"
-maintainer="Nafis <mnabid.25@outlook.com>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
-
-build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 643f738cc91c..fca98aa5341a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
nautilus-dropbox<=2020.03.04_2
+ nautilus-python<=1.2.3_6
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From 8258250d69691df37c21b49c9fd7606e530db5ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:45:29 +0100
Subject: [PATCH 30/52] seahorse-nautilus: remove package
doesn't work with nautilus 43
---
srcpkgs/removed-packages/template | 1 +
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 22 --------
6 files changed, 1 insertion(+), 121 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
delete mode 100644 srcpkgs/seahorse-nautilus/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fca98aa5341a..805b65d1f6e1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -475,6 +475,7 @@ replaces="
rkt-stage1-fly<=1.30.0_3
rkt<=1.30.0_3
scantailor<=0.9.12.1_2
+ seahorse-nautilus<=3.10.1_6
seahorse-sharing<=3.8.0_4
searchfile<=0.0.0.20180623_2
seriespl<=2.3.5_2
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
deleted file mode 100644
index d80a1258aeae..000000000000
--- a/srcpkgs/seahorse-nautilus/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'seahorse-nautilus'
-pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
-makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
-depends="gnupg desktop-file-utils"
-short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
-lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
From ffde5a008c85a6509f708063d7cd3ded67598bee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 31/52] 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 fa21b95b7434..f936f384468e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From fcaf79ebcd71a97be4d312e2a374040782fca60d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 32/52] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 af5f2f75601faa303c4feed492f7938032203283 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 33/52] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From f8d46988101116770b0c1434478d17478d65591f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 34/52] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 4cea88d68dd1ec293fa65d357b312b673ce98da2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 35/52] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 025f25409b224ec27f43b46626c2cae15f42b94d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 36/52] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 0e4015877be02e9bfc7e8b537509cffae9bb929e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 37/52] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 8927abe2b72aa5cb62bf685cee5e97ff3f75c8b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 38/52] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From dd9bc1e7b761b5a895e12b6ee5a6df628684746a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 39/52] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From d167eb8a73e64193b493551ea3f89aa638e54c0d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 40/52] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From ba089497630673e7e0a5f57df5dba6f5cbea1e3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 41/52] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From c6ee084d5e437e8f710ed7a7fd91d3fcd79dce5e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 42/52] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From 46e2050f151a1ce89c4459579a173b8d9ace0efc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 43/52] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 6f6be8df36878920931f124ad9c78d600e1c71e4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 44/52] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..acb6d637a833 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +29,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_install() {
- rm -f ${DESTDIR}/usr/lib64
+ rm ${DESTDIR}/usr/lib64
}
# first we want to separate -server, everything else then goes to client
From 06a165c87e502f8290608e1ab1a628549c5aa604 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 45/52] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From 24e52d5b55c701f0e3010938c82fb29b0ed75c7e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 46/52] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 11 +++---
2 files changed, 6 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..d4eb843ee6ba 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From e43e07925c6ae816c7ea29379929725e4c882cbd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 47/52] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c30b43fdea57..b33314aeeb5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 9b69f21444118c48a9a87e9ec8f44a7073abaeb2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 48/52] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From 8602bd43a6d793502772862b8f3b4ca8b141b9b3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:45 +0100
Subject: [PATCH 49/52] yelp: use libwebkit2gtk41
---
srcpkgs/yelp/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index ee51f61289ca..09930e80e65c 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,12 +1,12 @@
# Template file for 'yelp'
pkgname=yelp
version=42.1
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0"
+configure_args="--disable-schemas-compile --disable-static"
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel
- libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel"
+ libxml2-devel libxslt-devel sqlite-devel libwebkit2gtk41-devel yelp-xsl libhandy1-devel"
depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl"
short_desc="Help browser for GNOME desktop"
maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -14,11 +14,11 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Yelp"
# change this when it moves to a new major release
changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/yelp/${version%.*}/yelp-${version}.tar.xz"
checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41
yelp-devel_package() {
- depends="yelp-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 44e108233fdbe1cc51af47efaa23a168ad63f1da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 50/52] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From 0696faf0d274445ac7032853c719557ab77f86a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 51/52] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From a8bff0555a5b9b43350966f8bc558f569f0161c2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 52/52] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (37 preceding siblings ...)
2022-12-15 19:48 ` paper42
@ 2022-12-15 20:13 ` paper42
2022-12-15 20:54 ` paper42
` (18 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-15 20:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2205 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 112603 bytes --]
From c809a47fe0e1b6219b844d7241cecba10b09f024 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 01/51] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From f65a4d98c6d7a95c33db7af5dc7a325c68f91505 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 02/51] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..1591b9dadd58 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2980,10 +2980,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 c84b4e194da86e447103383a3357593f3828d7ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 03/51] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From b820126b6239d2073e66740a5e840801f8be37c0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 04/51] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From ba7f5bc72e9a670d37d91bc717ebf095dd17399b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 05/51] evolution-data-server: update to 3.46.2.
---
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 1591b9dadd58..db8553c31529 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 2f94d99084398f9dc640ee16ea1486c690fe3d4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 06/51] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 69d6fa3f4f44061077296e7506fcec8596c67281 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 07/51] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From 1d1474b4dced2bb5c171db143bd8f83ca4690dcf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 08/51] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From 47cb703be2c39c810c394aea31387cae23c99cfd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 09/51] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From 8996f3342750adef2eba63f268f3846b0a9a3f26 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 10/51] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 ea46ec05e7aaac4f0252b0edc85733ea75176d6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 11/51] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..a3866ac31251 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.1
revision=1
build_style=meson
build_helper="gir"
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 0875f7bc3f5f689f49259c4daecc513818d91463 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 12/51] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From ab66b9fd24e4f86996179a440ca82ddf6eea3501 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 13/51] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From d74b44d7dee285ec58073387f3308255c47a3196 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 14/51] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index db8553c31529..1725ea3b1208 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 9203dbe6ff41b50f53fe6111bc07826ae06df401 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 15/51] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 28a0e3052424c086800e3a4a4a3868f8fbaf090b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 16/51] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 0334a30f7c50faa1f8d66b9e95fa04216bce19d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:03:56 +0200
Subject: [PATCH 17/51] cheese: update to 43.0.
---
srcpkgs/cheese/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 066828c02207..abbadbce4daf 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
# Template file for 'cheese'
pkgname=cheese
-version=41.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,8 +15,9 @@ short_desc="GNOME tool to take pictures and videos from your webcam"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Cheese"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547
+changelog="https://gitlab.gnome.org/GNOME/cheese/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/cheese/${version%.*}/cheese-${version}.tar.xz"
+checksum=74574c4a3c327327f1a2d6d0b3f937be2afb07a6159b6d78db9c192de6667f0b
build_options="gir gtk_doc"
build_options_default="gir"
From 2b42cb68e7ad0a91733db91c4546c3ad5c046840 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 18/51] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From aed32d54c00e3e397f88e913d3ca3131bfdcccfb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 19/51] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 080092c832f41a1e31231ef73099eaea91d7ab60 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 20/51] 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 0eb8af318ac2..b481d520e2a2 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 34afa09a51860c64663d7e4a387ab6f5d95f926e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 21/51] 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 571013b24c7d..ea8f2ad81d47 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 02d0557eef802e71edf592563d510f2be7a8fcc8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 13:23:42 +0200
Subject: [PATCH 22/51] gnome-clocks: update to 43.0.
---
srcpkgs/gnome-clocks/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 9197dbbcbd46..1afa0de1dac8 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,19 +1,20 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
-version=42.0
-revision=2
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
+ libgweather-devel geocode-glib-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0
+changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
+checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
From e3196b42ef50d922887d12ea308e609b14c308de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:16:58 +0200
Subject: [PATCH 23/51] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1725ea3b1208..c30b43fdea57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 ea8f2ad81d47..cfeaa56f731a 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,25 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
-revision=2
+version=43.1
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# 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 8048045833a72632567b474e20ff9cc1c3d8b0b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 24/51] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6670043b9a30805e1c6764a41deb553f07f92304 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:31:06 +0100
Subject: [PATCH 25/51] dropbox: remove package
doesn't work with nautilus 43
---
srcpkgs/dropbox/template | 25 -------------------------
srcpkgs/dropbox/update | 1 -
srcpkgs/nautilus-dropbox | 1 -
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/dropbox/template
delete mode 100644 srcpkgs/dropbox/update
delete mode 120000 srcpkgs/nautilus-dropbox
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
deleted file mode 100644
index 7b73816c3c5c..000000000000
--- a/srcpkgs/dropbox/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'dropbox'
-pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
-makedepends="nautilus-devel python3-devel python3-gobject-devel"
-depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
-short_desc="Dropbox file sharing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
-
-nautilus-dropbox_package() {
- short_desc="Dropbox nautilus plugin"
- depends="dropbox>=${version}_${revision}"
- pkg_install() {
- vmove /usr/lib/nautilus
- vmove /usr/share/nautilus-dropbox
- }
-}
diff --git a/srcpkgs/dropbox/update b/srcpkgs/dropbox/update
deleted file mode 100644
index db5a2a8292c3..000000000000
--- a/srcpkgs/dropbox/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=nautilus-dropbox
diff --git a/srcpkgs/nautilus-dropbox b/srcpkgs/nautilus-dropbox
deleted file mode 120000
index 650a4c835dc4..000000000000
--- a/srcpkgs/nautilus-dropbox
+++ /dev/null
@@ -1 +0,0 @@
-dropbox
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df3fdc331c84..643f738cc91c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -79,6 +79,7 @@ replaces="
dnote-cli<=0.6.2_1
docker2aci<=0.17.2_4
dreampie<=1.2.1_3
+ dropbox<=2020.03.04_2
dtkcore-devel<=2.1.1_2
dtkcore<=2.1.1_2
dtkwidget-devel<=2.1.1_2
@@ -311,6 +312,7 @@ replaces="
mozjs68<=68.11.0_1
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
+ nautilus-dropbox<=2020.03.04_2
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From 38e09bc5b53e42065fb90566533ac6c209e3e33c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 26/51] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 c49288e9977a90c241624082d59be9f0c7dfdcaa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 27/51] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From cde9475d0bb64dfc0217e8d285f40e9a9d13b85b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 28/51] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 71d5ff178890fad6b04e30042795d682511b848b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:42:49 +0100
Subject: [PATCH 29/51] nautilus-python: remove package
doesn't work with nautilus 43
---
srcpkgs/nautilus-python/template | 25 -------------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 srcpkgs/nautilus-python/template
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
deleted file mode 100644
index b65f4808f4f1..000000000000
--- a/srcpkgs/nautilus-python/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'nautilus-python'
-pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
-depends="nautilus python3-gobject"
-short_desc="Python bindings for the Nautilus extension framework"
-maintainer="Nafis <mnabid.25@outlook.com>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
-
-build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 643f738cc91c..fca98aa5341a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
nautilus-dropbox<=2020.03.04_2
+ nautilus-python<=1.2.3_6
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From aad40692d97b0a8993202f9d184d8c73edcb2c2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:45:29 +0100
Subject: [PATCH 30/51] seahorse-nautilus: remove package
doesn't work with nautilus 43
---
srcpkgs/removed-packages/template | 1 +
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 22 --------
6 files changed, 1 insertion(+), 121 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
delete mode 100644 srcpkgs/seahorse-nautilus/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fca98aa5341a..805b65d1f6e1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -475,6 +475,7 @@ replaces="
rkt-stage1-fly<=1.30.0_3
rkt<=1.30.0_3
scantailor<=0.9.12.1_2
+ seahorse-nautilus<=3.10.1_6
seahorse-sharing<=3.8.0_4
searchfile<=0.0.0.20180623_2
seriespl<=2.3.5_2
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
deleted file mode 100644
index d80a1258aeae..000000000000
--- a/srcpkgs/seahorse-nautilus/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'seahorse-nautilus'
-pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
-makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
-depends="gnupg desktop-file-utils"
-short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
-lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
From db76bb2ec6f95e18cc00f2710d4bd26777bae932 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 31/51] 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 fa21b95b7434..413a971ed87e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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 libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 01624c60c361ceb4151c24f5035d744c563afaa2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 32/51] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 2311043bb8527b5d59f74f9b27926b9d8ae6a293 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 33/51] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 4bb07bd0d3e14c841cbbfda8940a74604d805ed3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 34/51] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 5ba3b93c83d2959af96a3d9b2dfc3192a9784b54 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 35/51] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 8ea58b0bab0c1762f6b6a50405a6de5abbcd0b59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 36/51] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 eed08c81b7108772cd98eec806293e012ebb4f94 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 37/51] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 4f73325e45726c7e92447010aedcc075c266f07c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 38/51] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 6c689f34e94559f1cef464a1f7a7649ba5ef3257 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 39/51] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From e6618fd7f1f3e31d233b96116f418802ce1892f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 40/51] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From 890cbb94528d2481010821894962914a159ba659 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 41/51] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 52ef6a776433f63f46013abe6c3a75001b490846 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 42/51] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From 74d635f6695b0846422f8743e96ad173fdf54760 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 43/51] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 1ed85a6c7ad9832d945f9a4c08772a0338d7fef9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 44/51] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..acb6d637a833 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +29,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_install() {
- rm -f ${DESTDIR}/usr/lib64
+ rm ${DESTDIR}/usr/lib64
}
# first we want to separate -server, everything else then goes to client
From 30c3f41cd77e3255c2f562d4be3895195550e427 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 45/51] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From ce28b01d000c48a5e1b4044150e26fa51b649430 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 46/51] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 11 +++---
2 files changed, 6 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..d4eb843ee6ba 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 3d051c8fec0b49606511a8a8c285327707186bbf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 47/51] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c30b43fdea57..b33314aeeb5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 85513e3703c79cbbc154df608a88cb8494d0c2bc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 48/51] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From 64d7566ff0799963aa96b8513d2fac784fc0cc32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 49/51] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From 887fce8fc59bc4a3dceebfbb3436e79f9272e982 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 50/51] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 2dff66678ad627347f8f4dc0e429848f2bae3770 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 51/51] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (38 preceding siblings ...)
2022-12-15 20:13 ` paper42
@ 2022-12-15 20:54 ` paper42
2023-01-01 20:26 ` paper42
` (17 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2022-12-15 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2205 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 118150 bytes --]
From d11599d512ef33c06c89b21590ef11ca661c2d3c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 01/60] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From 50274327698fc6078c92eaff8e404aba72f9f726 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 02/60] evolution-data-server: update to 3.46.2.
---
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 b9fecc044025..54247354b9f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -604,21 +604,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 af254d390e11775be454a08b583ad69325b12632 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 03/60] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index 54247354b9f3..2c590c469c92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1139,10 +1139,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 41e9d3905605b4618ab3bab80e6eb824c6d30ce6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 04/60] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2c590c469c92..1725ea3b1208 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2981,10 +2981,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 42aa133786f4f719bae3a5fb7d86989a33563944 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 05/60] budgie-desktop: revbump for mutter 43
---
srcpkgs/budgie-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6c32a8d9cbbb..d21c3b94badc 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.4
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 26131672b489e394abd0b2380ded94f781add44a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 06/60] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1725ea3b1208..c30b43fdea57 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -675,7 +675,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 571013b24c7d..cfeaa56f731a 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,25 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
+version=43.1
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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# 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 1132f679fcadc09ca515b6dce36ef0ae71652cd6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 07/60] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From 1cab2b48e4b8929386e3e9abeb0a2a5bcd3c6ea7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 08/60] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From 88b230ebb7dbc3b604d84f4977e8d7b36a4f36b5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 09/60] Endeavour: revbump for evolution-data-server 3.46
---
srcpkgs/Endeavour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 0d9cf4e33cf2..5cd95af999fd 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
# Template file for 'Endeavour'
pkgname=Endeavour
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
From b6f62399cee77209aec4ccde105d4f553fe02112 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 10/60] bijiben: revbump for evolution-data-server 3.46
---
srcpkgs/bijiben/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 604076fdb93c..73e972222b7c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=2
+revision=3
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From 8dbddb0dcd4f2958c80505b136bffd0b711c6c19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:20:42 +0100
Subject: [PATCH 11/60] gnome-panel: revbump for evolution-data-server 3.46,
gnome-desktop 43
---
srcpkgs/gnome-panel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 2484b7e4525d..5fdce4415225 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
version=3.44.0
-revision=1
+revision=3
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
hostmakedepends="gettext-devel glib-devel itstool pkg-config gettext"
From cf529784e33f2a9116a6bf34c3510440ff43b499 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:21:27 +0100
Subject: [PATCH 12/60] io.elementary.calendar: revbump for
evolution-data-server 3.46
---
srcpkgs/io.elementary.calendar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 96cb63ae1c63..8d96757a514a 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
version=6.1.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
From 225492fa086f0d58d13122fbb0ca67297939c0b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 13/60] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 23987c372021c63a30a336491955fa420d077ee8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 14/60] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From fa0be7afa84b829ff833d3028a13acbdcb4b7c0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 15/60] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From 5f562e5cf0505b5aad2c2f56afd25630e28a4e19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 16/60] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From 6aee03b23577ca4b7583ac45556191ef4b986872 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 17/60] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 1f2545a20dc337f7d90ef035d088876036086243 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 18/60] gnome-control-center: update to 43.1.
---
srcpkgs/gnome-control-center/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..d6d0c47906d1 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=42.3
+version=43.1
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
- polkit python3"
+ polkit python3 gtk-update-icon-cache"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From b57c1bc1cb618a657f06ab6dd14dc4769f481f82 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 19/60] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From d6b6f47dc8cb7763a03eb015560ea233fce91ec4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 20/60] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From cb98920ec833dd3ce211aa1090cbb3123a3e6c9f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 21/60] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 3383ca6fb5132f022a25290c115c92cf9920aaa1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:25:59 +0100
Subject: [PATCH 22/60] budgie-control-center: revbump for gnome-desktop 43
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index d39469cc2ef4..11c9080925f0 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From ac2400d07844477d24ef16436cedc13fb5d25835 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 23/60] budgie-screensaver: revbump for gnome-desktop 43
---
srcpkgs/budgie-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index d88afb442743..21f96bbd5e7b 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-screensaver'
pkgname=budgie-screensaver
version=5.1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config intltool glib-devel"
makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel
From c8b49530d7ef028a1c9854a0b5382c77f4de0757 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 24/60] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 40fc9dc6a5f3e1160e86d312c6dcb55a0abb2a71 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 25/60] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 2bbb9318aa6e02dfafccfce79ab95bfc34562345 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 26/60] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 4f68db687f795402bebdfffec4ef3cc7c0dbb332 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/60] 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 0eb8af318ac2..b481d520e2a2 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 f8ea07e3ba9fb7d7bbbe0cec8fb9a24e19191810 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 28/60] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 6f86bc00afe81efd65a5662f586b89823df01496 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 29/60] 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 a45f10b47bb9..ca02eb97a9ef 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
From d3bbd4df72aa6d3cda90c78c1dec34931f1d2160 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 30/60] gnome-flashback: revbump for gnome-desktop 43
---
srcpkgs/gnome-flashback/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 9fc5c992a7db..4cc5299b7d85 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
version=3.44.0
-revision=1
+revision=2
build_helper=gir
build_style=gnu-configure
configure_args="--with-compiz-session --enable-compile-warnings=minimum"
From 35d0685abb994aef6bdb59114a48f2d8d1aa2df9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 31/60] gnome-screensaver: revbump for gnome-desktop 43
---
srcpkgs/gnome-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1a23f6dcfb06..fea1becd504e 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
version=3.6.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-compile-warnings=minimum"
hostmakedepends="pkg-config automake intltool glib-devel"
From 52543a7da3d9d4cc8f29a3f845e09a5d7f83d8dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 32/60] cheese: revbump for gnome-desktop 43
---
srcpkgs/cheese/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index abbadbce4daf..95b1dcb53c38 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
# Template file for 'cheese'
pkgname=cheese
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"
From 86bf213e3dd3be78655242871c08217fdb029423 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 33/60] 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 1afa0de1dac8..1a5183f69658 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
From ff5d4496bcd0c4a97ab50d45686a4bfeaccf3456 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 34/60] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From fa1752b04313352e9c6982f701214440b03d35f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:31:06 +0100
Subject: [PATCH 35/60] dropbox: remove package
doesn't work with nautilus 43
---
srcpkgs/dropbox/template | 25 -------------------------
srcpkgs/dropbox/update | 1 -
srcpkgs/nautilus-dropbox | 1 -
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/dropbox/template
delete mode 100644 srcpkgs/dropbox/update
delete mode 120000 srcpkgs/nautilus-dropbox
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
deleted file mode 100644
index 7b73816c3c5c..000000000000
--- a/srcpkgs/dropbox/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'dropbox'
-pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
-makedepends="nautilus-devel python3-devel python3-gobject-devel"
-depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
-short_desc="Dropbox file sharing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
-
-nautilus-dropbox_package() {
- short_desc="Dropbox nautilus plugin"
- depends="dropbox>=${version}_${revision}"
- pkg_install() {
- vmove /usr/lib/nautilus
- vmove /usr/share/nautilus-dropbox
- }
-}
diff --git a/srcpkgs/dropbox/update b/srcpkgs/dropbox/update
deleted file mode 100644
index db5a2a8292c3..000000000000
--- a/srcpkgs/dropbox/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=nautilus-dropbox
diff --git a/srcpkgs/nautilus-dropbox b/srcpkgs/nautilus-dropbox
deleted file mode 120000
index 650a4c835dc4..000000000000
--- a/srcpkgs/nautilus-dropbox
+++ /dev/null
@@ -1 +0,0 @@
-dropbox
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df3fdc331c84..643f738cc91c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -79,6 +79,7 @@ replaces="
dnote-cli<=0.6.2_1
docker2aci<=0.17.2_4
dreampie<=1.2.1_3
+ dropbox<=2020.03.04_2
dtkcore-devel<=2.1.1_2
dtkcore<=2.1.1_2
dtkwidget-devel<=2.1.1_2
@@ -311,6 +312,7 @@ replaces="
mozjs68<=68.11.0_1
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
+ nautilus-dropbox<=2020.03.04_2
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From f90cc2d421672a4359c2878d2e2242cf613bbb64 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 36/60] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 bdddda6646b4b6b172917b39c72fe57131a154df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 37/60] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..a726f3d2d159 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,16 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 2d41372f3a58c4defc5d1f0b05bf91dffbe58092 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 38/60] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 0d5d55ff080d29a8f42f859d7c6e2c1d21b5f6e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:42:49 +0100
Subject: [PATCH 39/60] nautilus-python: remove package
doesn't work with nautilus 43
---
srcpkgs/nautilus-python/template | 25 -------------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 srcpkgs/nautilus-python/template
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
deleted file mode 100644
index b65f4808f4f1..000000000000
--- a/srcpkgs/nautilus-python/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'nautilus-python'
-pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
-depends="nautilus python3-gobject"
-short_desc="Python bindings for the Nautilus extension framework"
-maintainer="Nafis <mnabid.25@outlook.com>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
-
-build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 643f738cc91c..fca98aa5341a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
nautilus-dropbox<=2020.03.04_2
+ nautilus-python<=1.2.3_6
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From 61d95cdc0fc3d0ca5719865f2071fb161d3fd6b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:45:29 +0100
Subject: [PATCH 40/60] seahorse-nautilus: remove package
doesn't work with nautilus 43
---
srcpkgs/removed-packages/template | 1 +
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 22 --------
6 files changed, 1 insertion(+), 121 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
delete mode 100644 srcpkgs/seahorse-nautilus/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fca98aa5341a..805b65d1f6e1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -475,6 +475,7 @@ replaces="
rkt-stage1-fly<=1.30.0_3
rkt<=1.30.0_3
scantailor<=0.9.12.1_2
+ seahorse-nautilus<=3.10.1_6
seahorse-sharing<=3.8.0_4
searchfile<=0.0.0.20180623_2
seriespl<=2.3.5_2
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
deleted file mode 100644
index d80a1258aeae..000000000000
--- a/srcpkgs/seahorse-nautilus/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'seahorse-nautilus'
-pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
-makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
-depends="gnupg desktop-file-utils"
-short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
-lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
From 507ad3f9d84774912961c6ad8eb0d3508e9d7d1b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 41/60] 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 fa21b95b7434..413a971ed87e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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 libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 5b3932944ed34b214b7782b1dfd91e216b8ddb23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 42/60] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 d721751df7063e7e053c8157ded68bac6b6b4bd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 43/60] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 66f181ee8e6be1b7e38f23ac7e582d59dccc413d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 44/60] 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..79642f2195bd 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 <cam@nohom.org>"
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 972977576b0f420dfe8ead4e379c3959969cdf72 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 45/60] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From c8172d34f069f7516b2483dacc0abd910f51cd4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 46/60] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 08e14a5109a8c400a8fe310154ad198fba11e193 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 47/60] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 247ef735e8cbda16bc0253fcbcf784095a0d6f40 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 48/60] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..f2ba159d2105 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell)
hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +29,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From f2a112c12a85d74d3839a9445c25690db143214a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 49/60] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From 4da2b6883bb0340961a658093a506e07f51983fc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 50/60] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 655626386578e05bb2d63180b9dc7a820db96a77 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 51/60] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From 877354a35e3d5bbbe27614abf16518e0b3d58a47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 52/60] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 80e0def9dab6965160169368844d2c418905384a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 53/60] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..acb6d637a833 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
@@ -28,7 +29,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_install() {
- rm -f ${DESTDIR}/usr/lib64
+ rm ${DESTDIR}/usr/lib64
}
# first we want to separate -server, everything else then goes to client
From ce36a2b5f07b13877035238fe2d039d9bd6e32ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 54/60] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From 8c91cd3118e63c6a0fc3afcb665f4016194ad7c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 55/60] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 11 +++---
2 files changed, 6 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..d4eb843ee6ba 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 47e73488a96c3846131ce92c1817d88d37e53e10 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 56/60] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c30b43fdea57..b33314aeeb5c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..f6b18f00c4f0 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,19 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 9a8a3d3f7e2a59a69cf3f08e94ed7e10793c256e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 57/60] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From cb4ab7bb03383ac2f49229fc6f73f64d1607f4c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 58/60] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From aba164ee1832d9f12957e64de5b5d2adeb92653a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 59/60] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 6ca5bb9bafdfe6f80ce71c389fdc9aaebb7ae3a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 60/60] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (39 preceding siblings ...)
2022-12-15 20:54 ` paper42
@ 2023-01-01 20:26 ` paper42
2023-01-01 21:32 ` paper42
` (16 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-01 20:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2267 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
- [ ] https://github.com/void-linux/void-packages/pull/41121
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 128916 bytes --]
From 2539225c1d4f33bb04db95a9cdb0eea98da95551 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 20:07:27 +0100
Subject: [PATCH 01/61] libwnck: update to 43.0.
---
srcpkgs/libwnck/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 57d884c9f44d..c0f91a89fdce 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,6 @@
# Template file for 'libwnck'
pkgname=libwnck
-version=40.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -12,9 +12,9 @@ short_desc="Library for layout and rendering of text"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libwnck/"
-changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611
+changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/libwnck/${version%.*}/libwnck-${version}.tar.xz"
+checksum=905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe
build_options="gir"
build_options_default="gir"
From 7e132f873fc455305d7ca02a6c5b448ddc470e41 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 02/61] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From cda8f9152122094a86581d573ffb4d0a7e723867 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 03/61] evolution-data-server: update to 3.46.2.
---
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 1c852ef3fdff..6b586ced1044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -603,21 +603,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 91ad7799c95b40624066bd3f8ea1f18187018172 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 04/61] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index 6b586ced1044..c2a11c1cf1ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1136,10 +1136,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From ce95b46123430e699758031393059b31e82bdbac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/61] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c2a11c1cf1ef..84a970009f38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,10 +2977,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 c50c1bbdc24599717037fe1fef8f82df59714bb8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 06/61] budgie-desktop: revbump for mutter 43
---
srcpkgs/budgie-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6c32a8d9cbbb..d21c3b94badc 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.4
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From cc8fbfc055a9aea5aa3760332f29be4b553dfe8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 07/61] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 84a970009f38..2cb86c210f0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -674,7 +674,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 571013b24c7d..18e34619b0c4 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,26 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
+version=43.1
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
+ gtk-update-icon-cache"
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# tests timeout:
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=extended
@@ -40,7 +41,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 67d7e827ce9ed0c2fdbc04ed178a56925c06056b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 08/61] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From 27b88e534c2ff3ca4fb20627523d11a81948fa38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 09/61] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From 2c122cbd5fd5db167f064769d59ec1625450aaa4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 10/61] Endeavour: revbump for evolution-data-server 3.46
---
srcpkgs/Endeavour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 0d9cf4e33cf2..5cd95af999fd 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
# Template file for 'Endeavour'
pkgname=Endeavour
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
From 2180fb0618757ba0473da2ecc97abdd273399ff4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 11/61] bijiben: revbump for evolution-data-server 3.46
---
srcpkgs/bijiben/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 604076fdb93c..73e972222b7c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=2
+revision=3
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From 29dd0e4ea2c10e2f3a4be3cc8231c608c8d6ff01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:20:42 +0100
Subject: [PATCH 12/61] gnome-panel: update to 3.46.0.
---
srcpkgs/gnome-panel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 2484b7e4525d..2ef92c56c4f1 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=3.44.0
+version=3.46.0
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -13,8 +13,8 @@ short_desc="Panel Application for GNOME flashback"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomePanel"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
+distfiles="${GNOME_SITE}/gnome-panel/${version%.*}/gnome-panel-${version}.tar.xz"
+checksum=cec7a11b70c524b5e8d76d4d7e4d835ee607abda2eb42f4df7619e62eb06aeb1
gnome-panel-devel_package() {
depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From dff62d47dfe013a1c26464cd0224e1d1fb177513 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:21:27 +0100
Subject: [PATCH 13/61] io.elementary.calendar: update to 6.1.2.
* use libsoup3
---
.../patches/libsoup3.patch | 137 ++++++++++++++++++
srcpkgs/io.elementary.calendar/template | 10 +-
2 files changed, 142 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/io.elementary.calendar/patches/libsoup3.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
new file mode 100644
index 000000000000..61659b902cba
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
@@ -0,0 +1,137 @@
+From 62c20e5786accd68b96c423b04e32c043e726cac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <tintou@noel.tf>
+Date: Sun, 7 Aug 2022 21:18:35 +0200
+Subject: [PATCH] Add support for Evolution Data Server 3.46
+
+EDS 3.46 has switched to libsoup-3
+
+Co-authored-by: Bobby Rong <rjl931189261@126.com>
+---
+ meson.build | 10 ++++++++--
+ plugins/CalDAV/CalDAVBackend.vala | 12 ++++++++++++
+ plugins/Google/GoogleBackend.vala | 26 ++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ff7a2d0f9..703a9686d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -28,14 +28,20 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
+ handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+ libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0')
+ libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0')
+-libsoup_dep = dependency('libsoup-2.4')
++if (libedataserver_dep.version().version_compare ('>=3.46'))
++ libsoup_dep = []
++ geocode_glib_dep = dependency('geocode-glib-2.0')
++ add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala')
++else
++ geocode_glib_dep = dependency('geocode-glib-1.0')
++ libsoup_dep = dependency('libsoup-2.4')
++endif
+ gmodule_dep = dependency('gmodule-2.0')
+ champlain_dep = dependency('champlain-0.12')
+ champlain_gtk_dep = dependency('champlain-gtk-0.12')
+ clutter_dep = dependency('clutter-1.0')
+ clutter_gtk_dep = dependency('clutter-gtk-1.0')
+ folks_dep = dependency('folks')
+-geocode_glib_dep = dependency('geocode-glib-1.0')
+ gclue_dep = dependency('libgeoclue-2.0')
+ libecal_dep = dependency('libecal-2.0')
+ libical_dep = dependency('libical-glib')
+diff --git a/plugins/CalDAV/CalDAVBackend.vala b/plugins/CalDAV/CalDAVBackend.vala
+index e1f6fde53..e4f5e0f5c 100644
+--- a/plugins/CalDAV/CalDAVBackend.vala
++++ b/plugins/CalDAV/CalDAVBackend.vala
+@@ -73,7 +73,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ collection.add (url_entry);
+ if (to_edit != null) {
+ E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
++#if HAS_EDS_3_46
++ var uri = webdav.dup_uri ();
++#else
+ var uri = webdav.dup_soup_uri ();
++#endif
+ if (uri.get_port () != 80) {
+ ((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
+ } else {
+@@ -147,7 +151,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+@@ -190,7 +198,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+diff --git a/plugins/Google/GoogleBackend.vala b/plugins/Google/GoogleBackend.vala
+index 2f9fa3f2b..3f77bd13b 100644
+--- a/plugins/Google/GoogleBackend.vala
++++ b/plugins/Google/GoogleBackend.vala
+@@ -83,12 +83,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
+@@ -128,12 +141,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 96cb63ae1c63..fd37869876fa 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,20 +1,20 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
-version=6.1.0
-revision=2
+version=6.1.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
-checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
+checksum=4051f4d190d2144054c3fb637e53281850a7db858771d73adf157c914dba8f31
libio.elementary.calendar_package() {
short_desc+=" - library"
@@ -26,7 +26,7 @@ libio.elementary.calendar_package() {
libio.elementary.calendar-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.calendar>=${version} evolution-data-server-devel
- granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+ granite-devel gtk+3-devel libglib-devel libical-devel libsoup3-devel
libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
From 2f7242e35f186728d9cf3336d92f8433a478ef6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 14/61] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 6df2dd13b48018c14468757b81959b01de99b977 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 15/61] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From 41588023206d5728d5c0b9f5a7cf543a2caf5ff5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 16/61] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From 863c74f038558ee47756500be9f35a89f4db27d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 17/61] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From b85dac94d492fdff458006bb4f152b102a5dc9c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 18/61] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 a3c175cc8e884121a2e8fcba35b968c13f50f152 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 19/61] gnome-control-center: update to 43.2.
---
srcpkgs/gnome-control-center/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..af6728cd45a1 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=42.3
+version=43.2
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
- polkit python3"
+ polkit python3 gtk-update-icon-cache"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From e1c306addd363ae8023d5beb83780aee548df8b5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 20/61] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From f7433434b8355c7b1e6035a3190625ec6370c021 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 21/61] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From 27b6b2aba29f3cd27ad7f84cdffd949b0728df4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 22/61] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 932ae90438dd612e5b9ae9539aad8ec5ac4bb589 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:25:59 +0100
Subject: [PATCH 23/61] budgie-control-center: revbump for gnome-desktop 43
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index d39469cc2ef4..11c9080925f0 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From 7f0358928a58181e871655daef0bfdfefbb808ab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 24/61] budgie-screensaver: revbump for gnome-desktop 43
---
srcpkgs/budgie-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index d88afb442743..21f96bbd5e7b 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-screensaver'
pkgname=budgie-screensaver
version=5.1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config intltool glib-devel"
makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel
From f719b1ed7107a390b16bb3cfdc212794cf1b2ec3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 25/61] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 12d51b120d85fd49d2e68cc1afe69f6c9f0b4889 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 26/61] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From ac0dacae788b7820543492486110a3feb97330f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/61] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From e59fd30d3c9b3a8a3b84a33fae8f64642a416533 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/61] 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 0eb8af318ac2..b481d520e2a2 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 c050ecee9a19b30ada6a5d02f20e6808f8b0c7da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 29/61] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From b49f8f12e4d38545ccace543a1d27b938bb39a5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 30/61] 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 a45f10b47bb9..ca02eb97a9ef 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
From f4f366471ec1f566319f0260c4014096cb7da33c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 31/61] gnome-flashback: update to 3.46.0.
---
srcpkgs/gnome-flashback/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 9fc5c992a7db..4fa86747815d 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
-version=3.44.0
+version=3.46.0
revision=1
build_helper=gir
build_style=gnu-configure
@@ -17,8 +17,8 @@ short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
+distfiles="${GNOME_SITE}/gnome-flashback/${version%.*}/gnome-flashback-${version}.tar.xz"
+checksum=7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045
post_extract() {
vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \
From 455d2c366fc335c73b1dcae74da104a2e5df44ab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 32/61] gnome-screensaver: revbump for gnome-desktop 43
---
srcpkgs/gnome-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1a23f6dcfb06..fea1becd504e 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
version=3.6.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-compile-warnings=minimum"
hostmakedepends="pkg-config automake intltool glib-devel"
From 1c7d56eaad1719947f5d36c78faa00635dcf7deb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 33/61] cheese: revbump for gnome-desktop 43
---
srcpkgs/cheese/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index abbadbce4daf..95b1dcb53c38 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
# Template file for 'cheese'
pkgname=cheese
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"
From f1364b7e0da07fea992e81f2fff6e1810d1b0d6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 34/61] 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 1afa0de1dac8..1a5183f69658 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
From 0b15a14b55fcd2b10dcfcf62cf350557bc411c86 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 35/61] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From 516609ba871f85f944452c061813dcdb8c31758a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:31:06 +0100
Subject: [PATCH 36/61] dropbox: remove package
doesn't work with nautilus 43
---
srcpkgs/dropbox/template | 25 -------------------------
srcpkgs/dropbox/update | 1 -
srcpkgs/nautilus-dropbox | 1 -
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/dropbox/template
delete mode 100644 srcpkgs/dropbox/update
delete mode 120000 srcpkgs/nautilus-dropbox
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
deleted file mode 100644
index 7b73816c3c5c..000000000000
--- a/srcpkgs/dropbox/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'dropbox'
-pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
-makedepends="nautilus-devel python3-devel python3-gobject-devel"
-depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
-short_desc="Dropbox file sharing"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
-
-nautilus-dropbox_package() {
- short_desc="Dropbox nautilus plugin"
- depends="dropbox>=${version}_${revision}"
- pkg_install() {
- vmove /usr/lib/nautilus
- vmove /usr/share/nautilus-dropbox
- }
-}
diff --git a/srcpkgs/dropbox/update b/srcpkgs/dropbox/update
deleted file mode 100644
index db5a2a8292c3..000000000000
--- a/srcpkgs/dropbox/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=nautilus-dropbox
diff --git a/srcpkgs/nautilus-dropbox b/srcpkgs/nautilus-dropbox
deleted file mode 120000
index 650a4c835dc4..000000000000
--- a/srcpkgs/nautilus-dropbox
+++ /dev/null
@@ -1 +0,0 @@
-dropbox
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 19a38b69de16..d6d543703bb7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -79,6 +79,7 @@ replaces="
dnote-cli<=0.6.2_1
docker2aci<=0.17.2_4
dreampie<=1.2.1_3
+ dropbox<=2020.03.04_2
dtkcore-devel<=2.1.1_2
dtkcore<=2.1.1_2
dtkwidget-devel<=2.1.1_2
@@ -311,6 +312,7 @@ replaces="
mozjs68<=68.11.0_1
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
+ nautilus-dropbox<=2020.03.04_2
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From 5d67a357388f3b3acb525d0fe765883f4c441b48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 37/61] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 1ed60f08f08c44aa99eb076a1476d24cca835b37 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 38/61] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..826a05a773a0 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,17 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
+ gtk-update-icon-cache"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 102522104eae1d1e26e28dcec856a491f371ea28 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 39/61] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 37c95578adec6b7b73a3b49744e059914280b9f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:42:49 +0100
Subject: [PATCH 40/61] nautilus-python: remove package
doesn't work with nautilus 43
---
srcpkgs/nautilus-python/template | 25 -------------------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 srcpkgs/nautilus-python/template
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
deleted file mode 100644
index b65f4808f4f1..000000000000
--- a/srcpkgs/nautilus-python/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'nautilus-python'
-pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
-depends="nautilus python3-gobject"
-short_desc="Python bindings for the Nautilus extension framework"
-maintainer="Nafis <mnabid.25@outlook.com>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
-
-build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d6d543703bb7..9fcaa473c00e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
mp3gain<=1.6.2_2
mutagen<=1.43.0_3
nautilus-dropbox<=2020.03.04_2
+ nautilus-python<=1.2.3_6
nautilus-sendto<=3.8.6_2
ncdns<=0.0.2_12
newt-python<=0.52.21_5
From 64d86a2099400e3f3a0bda535dfd3e5f824d4c8a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:45:29 +0100
Subject: [PATCH 41/61] seahorse-nautilus: remove package
doesn't work with nautilus 43
---
srcpkgs/removed-packages/template | 1 +
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 22 --------
6 files changed, 1 insertion(+), 121 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
delete mode 100644 srcpkgs/seahorse-nautilus/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9fcaa473c00e..36dcc0bdfb0b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -473,6 +473,7 @@ replaces="
rkt-stage1-fly<=1.30.0_3
rkt<=1.30.0_3
scantailor<=0.9.12.1_2
+ seahorse-nautilus<=3.10.1_6
seahorse-sharing<=3.8.0_4
searchfile<=0.0.0.20180623_2
seriespl<=2.3.5_2
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
deleted file mode 100644
index d80a1258aeae..000000000000
--- a/srcpkgs/seahorse-nautilus/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'seahorse-nautilus'
-pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
-makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
-depends="gnupg desktop-file-utils"
-short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
-lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
From c69aee0c6aa730b17ead5545e5d431bec3ffabf5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 42/61] 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 fa21b95b7434..413a971ed87e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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 libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 059ee482092724561a438e8808fff7388b0fed6b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 43/61] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 afb205d6429d076b413c3ab43851ff924efc3546 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 44/61] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From c074ac65d8c11f891736d48cf504853091f97f4a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 45/61] geary: update to 43.0.
---
srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
srcpkgs/geary/template | 15 +++++-----
3 files changed, 8 insertions(+), 72 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..4be416e38a48 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
+ gobject-introspection vala glib-devel gettext gtk-update-icon-cache"
+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 <cam@nohom.org>"
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 3bac49824b83f00403846a04dee6a68b007f8eef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 46/61] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 51ef34b243ca3e922f0aed07d7ec94ef31770875 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 47/61] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 e75e87166559084c86ce3c567fa605c5a79f4eba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 48/61] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 1414c6542c4aca9611d96ddd43f099cb0ea5db2c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 49/61] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..1dc85f8f1344 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,23 +1,25 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gnome_shell gnome-shell)
-Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
-Dsystemd-user-unit-dir=/usr/lib/systemd"
-hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
+hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
+ desktop-file-utils"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +30,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 118305072f13236c23c45b9ee46ac4118f42ca94 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 50/61] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From 90a8a69abe6f6c542423b8415f77f0f9e1e01a0e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 51/61] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From c88c8b6341b375fcbb65af84e3c857ef7aed55e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 52/61] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From f102bad6ffa90f6ef7db5e15d945db374b9d353e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 53/61] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From f2003957907e76cbb75c74e84964cff7327ebac7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 54/61] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..53e67690f863 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 4fb4232e9d2f5ca3cdec692ac115fa3dd54f7ac2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 55/61] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From 99b99755ee9733fd49708da9d73607566fd1707a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 56/61] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 13 ++++---
2 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..7c641946341a 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 173fb1ac2cab4f83d715d37db02f2262f8368541 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 57/61] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2cb86c210f0a..b8c2ae161e9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3115,7 +3115,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..0a40abfb42b7 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,20 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils
+ gtk-update-icon-cache"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+ json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 31451ee785246a68011e9800c02e952c722c389b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 58/61] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From 0a5b58bb56ef6406cc4b229868dbc7d6b41a2869 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 59/61] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From 279fef6456ff742fff96d3338abdc0c751396a0e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 60/61] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 3ae816d1d60b0369795572a8ca17e754bcd42f91 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 61/61] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (40 preceding siblings ...)
2023-01-01 20:26 ` paper42
@ 2023-01-01 21:32 ` paper42
2023-01-01 22:29 ` paper42
` (15 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-01 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2267 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
- [ ] https://github.com/void-linux/void-packages/pull/41121
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 127644 bytes --]
From 2539225c1d4f33bb04db95a9cdb0eea98da95551 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 20:07:27 +0100
Subject: [PATCH 01/61] libwnck: update to 43.0.
---
srcpkgs/libwnck/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 57d884c9f44d..c0f91a89fdce 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,6 @@
# Template file for 'libwnck'
pkgname=libwnck
-version=40.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -12,9 +12,9 @@ short_desc="Library for layout and rendering of text"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libwnck/"
-changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611
+changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/libwnck/${version%.*}/libwnck-${version}.tar.xz"
+checksum=905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe
build_options="gir"
build_options_default="gir"
From 7e132f873fc455305d7ca02a6c5b448ddc470e41 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 02/61] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From cda8f9152122094a86581d573ffb4d0a7e723867 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 03/61] evolution-data-server: update to 3.46.2.
---
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 1c852ef3fdff..6b586ced1044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -603,21 +603,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 91ad7799c95b40624066bd3f8ea1f18187018172 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 04/61] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index 6b586ced1044..c2a11c1cf1ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1136,10 +1136,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From ce95b46123430e699758031393059b31e82bdbac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/61] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c2a11c1cf1ef..84a970009f38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,10 +2977,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 c50c1bbdc24599717037fe1fef8f82df59714bb8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 06/61] budgie-desktop: revbump for mutter 43
---
srcpkgs/budgie-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6c32a8d9cbbb..d21c3b94badc 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.4
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From cc8fbfc055a9aea5aa3760332f29be4b553dfe8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 07/61] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 84a970009f38..2cb86c210f0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -674,7 +674,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 571013b24c7d..18e34619b0c4 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,26 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
+version=43.1
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
+ gtk-update-icon-cache"
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# tests timeout:
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=extended
@@ -40,7 +41,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 67d7e827ce9ed0c2fdbc04ed178a56925c06056b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 08/61] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From 27b88e534c2ff3ca4fb20627523d11a81948fa38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 09/61] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From 2c122cbd5fd5db167f064769d59ec1625450aaa4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 10/61] Endeavour: revbump for evolution-data-server 3.46
---
srcpkgs/Endeavour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 0d9cf4e33cf2..5cd95af999fd 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
# Template file for 'Endeavour'
pkgname=Endeavour
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
From 2180fb0618757ba0473da2ecc97abdd273399ff4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 11/61] bijiben: revbump for evolution-data-server 3.46
---
srcpkgs/bijiben/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 604076fdb93c..73e972222b7c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=2
+revision=3
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From 29dd0e4ea2c10e2f3a4be3cc8231c608c8d6ff01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:20:42 +0100
Subject: [PATCH 12/61] gnome-panel: update to 3.46.0.
---
srcpkgs/gnome-panel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 2484b7e4525d..2ef92c56c4f1 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=3.44.0
+version=3.46.0
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -13,8 +13,8 @@ short_desc="Panel Application for GNOME flashback"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomePanel"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
+distfiles="${GNOME_SITE}/gnome-panel/${version%.*}/gnome-panel-${version}.tar.xz"
+checksum=cec7a11b70c524b5e8d76d4d7e4d835ee607abda2eb42f4df7619e62eb06aeb1
gnome-panel-devel_package() {
depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From dff62d47dfe013a1c26464cd0224e1d1fb177513 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:21:27 +0100
Subject: [PATCH 13/61] io.elementary.calendar: update to 6.1.2.
* use libsoup3
---
.../patches/libsoup3.patch | 137 ++++++++++++++++++
srcpkgs/io.elementary.calendar/template | 10 +-
2 files changed, 142 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/io.elementary.calendar/patches/libsoup3.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
new file mode 100644
index 000000000000..61659b902cba
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
@@ -0,0 +1,137 @@
+From 62c20e5786accd68b96c423b04e32c043e726cac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <tintou@noel.tf>
+Date: Sun, 7 Aug 2022 21:18:35 +0200
+Subject: [PATCH] Add support for Evolution Data Server 3.46
+
+EDS 3.46 has switched to libsoup-3
+
+Co-authored-by: Bobby Rong <rjl931189261@126.com>
+---
+ meson.build | 10 ++++++++--
+ plugins/CalDAV/CalDAVBackend.vala | 12 ++++++++++++
+ plugins/Google/GoogleBackend.vala | 26 ++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ff7a2d0f9..703a9686d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -28,14 +28,20 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
+ handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+ libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0')
+ libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0')
+-libsoup_dep = dependency('libsoup-2.4')
++if (libedataserver_dep.version().version_compare ('>=3.46'))
++ libsoup_dep = []
++ geocode_glib_dep = dependency('geocode-glib-2.0')
++ add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala')
++else
++ geocode_glib_dep = dependency('geocode-glib-1.0')
++ libsoup_dep = dependency('libsoup-2.4')
++endif
+ gmodule_dep = dependency('gmodule-2.0')
+ champlain_dep = dependency('champlain-0.12')
+ champlain_gtk_dep = dependency('champlain-gtk-0.12')
+ clutter_dep = dependency('clutter-1.0')
+ clutter_gtk_dep = dependency('clutter-gtk-1.0')
+ folks_dep = dependency('folks')
+-geocode_glib_dep = dependency('geocode-glib-1.0')
+ gclue_dep = dependency('libgeoclue-2.0')
+ libecal_dep = dependency('libecal-2.0')
+ libical_dep = dependency('libical-glib')
+diff --git a/plugins/CalDAV/CalDAVBackend.vala b/plugins/CalDAV/CalDAVBackend.vala
+index e1f6fde53..e4f5e0f5c 100644
+--- a/plugins/CalDAV/CalDAVBackend.vala
++++ b/plugins/CalDAV/CalDAVBackend.vala
+@@ -73,7 +73,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ collection.add (url_entry);
+ if (to_edit != null) {
+ E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
++#if HAS_EDS_3_46
++ var uri = webdav.dup_uri ();
++#else
+ var uri = webdav.dup_soup_uri ();
++#endif
+ if (uri.get_port () != 80) {
+ ((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
+ } else {
+@@ -147,7 +151,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+@@ -190,7 +198,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+diff --git a/plugins/Google/GoogleBackend.vala b/plugins/Google/GoogleBackend.vala
+index 2f9fa3f2b..3f77bd13b 100644
+--- a/plugins/Google/GoogleBackend.vala
++++ b/plugins/Google/GoogleBackend.vala
+@@ -83,12 +83,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
+@@ -128,12 +141,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 96cb63ae1c63..fd37869876fa 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,20 +1,20 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
-version=6.1.0
-revision=2
+version=6.1.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
-checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
+checksum=4051f4d190d2144054c3fb637e53281850a7db858771d73adf157c914dba8f31
libio.elementary.calendar_package() {
short_desc+=" - library"
@@ -26,7 +26,7 @@ libio.elementary.calendar_package() {
libio.elementary.calendar-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.calendar>=${version} evolution-data-server-devel
- granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+ granite-devel gtk+3-devel libglib-devel libical-devel libsoup3-devel
libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
From 2f7242e35f186728d9cf3336d92f8433a478ef6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 14/61] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 6df2dd13b48018c14468757b81959b01de99b977 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 15/61] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From 41588023206d5728d5c0b9f5a7cf543a2caf5ff5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 16/61] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From 863c74f038558ee47756500be9f35a89f4db27d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 17/61] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From b85dac94d492fdff458006bb4f152b102a5dc9c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 18/61] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 a3c175cc8e884121a2e8fcba35b968c13f50f152 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 19/61] gnome-control-center: update to 43.2.
---
srcpkgs/gnome-control-center/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..af6728cd45a1 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=42.3
+version=43.2
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
- polkit python3"
+ polkit python3 gtk-update-icon-cache"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From e1c306addd363ae8023d5beb83780aee548df8b5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 20/61] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From f7433434b8355c7b1e6035a3190625ec6370c021 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 21/61] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From 27b6b2aba29f3cd27ad7f84cdffd949b0728df4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 22/61] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 932ae90438dd612e5b9ae9539aad8ec5ac4bb589 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:25:59 +0100
Subject: [PATCH 23/61] budgie-control-center: revbump for gnome-desktop 43
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index d39469cc2ef4..11c9080925f0 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From 7f0358928a58181e871655daef0bfdfefbb808ab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 24/61] budgie-screensaver: revbump for gnome-desktop 43
---
srcpkgs/budgie-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index d88afb442743..21f96bbd5e7b 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-screensaver'
pkgname=budgie-screensaver
version=5.1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config intltool glib-devel"
makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel
From f719b1ed7107a390b16bb3cfdc212794cf1b2ec3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 25/61] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From 12d51b120d85fd49d2e68cc1afe69f6c9f0b4889 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 26/61] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From ac0dacae788b7820543492486110a3feb97330f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/61] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From e59fd30d3c9b3a8a3b84a33fae8f64642a416533 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/61] 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 0eb8af318ac2..b481d520e2a2 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 c050ecee9a19b30ada6a5d02f20e6808f8b0c7da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 29/61] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From b49f8f12e4d38545ccace543a1d27b938bb39a5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 30/61] 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 a45f10b47bb9..ca02eb97a9ef 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
From f4f366471ec1f566319f0260c4014096cb7da33c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 31/61] gnome-flashback: update to 3.46.0.
---
srcpkgs/gnome-flashback/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 9fc5c992a7db..4fa86747815d 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
-version=3.44.0
+version=3.46.0
revision=1
build_helper=gir
build_style=gnu-configure
@@ -17,8 +17,8 @@ short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
+distfiles="${GNOME_SITE}/gnome-flashback/${version%.*}/gnome-flashback-${version}.tar.xz"
+checksum=7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045
post_extract() {
vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \
From 455d2c366fc335c73b1dcae74da104a2e5df44ab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 32/61] gnome-screensaver: revbump for gnome-desktop 43
---
srcpkgs/gnome-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1a23f6dcfb06..fea1becd504e 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
version=3.6.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-compile-warnings=minimum"
hostmakedepends="pkg-config automake intltool glib-devel"
From 1c7d56eaad1719947f5d36c78faa00635dcf7deb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 33/61] cheese: revbump for gnome-desktop 43
---
srcpkgs/cheese/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index abbadbce4daf..95b1dcb53c38 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
# Template file for 'cheese'
pkgname=cheese
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"
From f1364b7e0da07fea992e81f2fff6e1810d1b0d6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 34/61] 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 1afa0de1dac8..1a5183f69658 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
From 0b15a14b55fcd2b10dcfcf62cf350557bc411c86 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 35/61] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From a65e380f61f802a5e49b86a213babc945181faf5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 36/61] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 f47c4bfc4ea4d3c443668141b488e74fbb0710c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 37/61] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..826a05a773a0 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,17 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
+ gtk-update-icon-cache"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From dffc920f3ee038c9caedb77fe0494cf63a5fd013 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 38/61] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 412ff797113338a9df82a8f20920492934fdcbd9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 39/61] 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 fa21b95b7434..413a971ed87e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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 libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 2d132b0582cb1096591dbbe724c1bc992c64a8c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 40/61] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 75d203be72380e7ce40a87abfd0784cd9aed07e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 41/61] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 0b66ec23f8118ff54cfe6c5d14d04b63d1a6c160 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 42/61] geary: update to 43.0.
---
srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
srcpkgs/geary/template | 15 +++++-----
3 files changed, 8 insertions(+), 72 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..4be416e38a48 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
+ gobject-introspection vala glib-devel gettext gtk-update-icon-cache"
+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 <cam@nohom.org>"
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 933e99a8de9d8f030f42f2d33a06eb520cdcc126 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 43/61] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 288f8aa7dc2f764cfcd2ab779d9173cd0fdf1630 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 44/61] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 4cdd827906c179d74ce5b0a08d5eb53af819ba89 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 45/61] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 82e6773a7819020a583abb51fc477f1b0271b55f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 46/61] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..1dc85f8f1344 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,23 +1,25 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gnome_shell gnome-shell)
-Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
-Dsystemd-user-unit-dir=/usr/lib/systemd"
-hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
+hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
+ desktop-file-utils"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +30,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 2e01bd689e203882768207e3385fa3530993900b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 47/61] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From 4005d1ea3bf9318cdedf28eb0769373785bc1191 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 48/61] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From e7376d74d56d011612e2e3eaff346d7fd763541c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 49/61] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From 05bedf67342c6704e2da7f5a7ac1c6a574f66c01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 50/61] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 033e1d62cfd7a15493eb42edbe65d507f31aa777 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 51/61] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..53e67690f863 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From ca30d132b5b07e69f0213c770e9e5eb8866bb01b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 52/61] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From d86d32e78f812b06bc6b80618b28fe946bd8990b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 53/61] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 13 ++++---
2 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..7c641946341a 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 72993cb3e41f2eb3f6cd051eaea6ca762b2259e8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 54/61] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2cb86c210f0a..b8c2ae161e9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3115,7 +3115,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..0a40abfb42b7 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,20 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils
+ gtk-update-icon-cache"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+ json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 8965ddf2761b660a07cda5c1288431777b264798 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 55/61] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From 5cc6ec2170a83fc27e61a9274c2d9dea599366f4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 56/61] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From 89f453958def2b3928a8dee83c0cda3627c4078a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 57/61] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From bc4a6bcd89875bdf2fc2dd146d072799f8f8a5b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 58/61] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
From 9ca72d890b00f82d2b893b83e68e759f54dbb31b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 21:41:33 +0100
Subject: [PATCH 59/61] nautilus-python: update to 4.0.
---
srcpkgs/nautilus-python/template | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
index b65f4808f4f1..9c9c3393d172 100644
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@@ -1,25 +1,18 @@
# Template file for 'nautilus-python'
pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
+version=4.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="python3-gobject-devel nautilus-devel"
depends="nautilus python3-gobject"
short_desc="Python bindings for the Nautilus extension framework"
maintainer="Nafis <mnabid.25@outlook.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
+distfiles="${GNOME_SITE}/nautilus-python/${version}/nautilus-python-${version}.tar.xz"
+checksum=17243d62eb7d7d839a9461ab8d0701688805c7161a6705e61413a58ec268281a
build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
+build_options_default="gtk_doc"
From 9eb85822d2e74be620e871d882c8264d97a7a3f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:01:11 +0100
Subject: [PATCH 60/61] dropbox: update to 2022.12.05.
---
srcpkgs/dropbox/template | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
index 7b73816c3c5c..21a8f3974a05 100644
--- a/srcpkgs/dropbox/template
+++ b/srcpkgs/dropbox/template
@@ -1,19 +1,22 @@
# Template file for 'dropbox'
pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
+version=2022.12.05
+revision=1
+_commit=8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3
build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
+hostmakedepends="pkg-config gnome-common libtool python3-gobject python3-docutils gdk-pixbuf-devel"
makedepends="nautilus-devel python3-devel python3-gobject-devel"
depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
short_desc="Dropbox file sharing"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
+distfiles="https://github.com/dropbox/nautilus-dropbox/archive/8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3.tar.gz"
+checksum=e6018254963314b63e81b2ab6f936b48e439ba256ad93b5d447fb8e75c20c2ab
+
+do_configure() {
+ ./autogen.sh --disable-static
+}
nautilus-dropbox_package() {
short_desc="Dropbox nautilus plugin"
From b5fceef0c5aa323d7ff2edcbfecf4716f00363f1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:09:52 +0100
Subject: [PATCH 61/61] seahorse-nautilus: update to 3.11.92.2022.10.9.
---
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 21 +++----
5 files changed, 8 insertions(+), 112 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index d80a1258aeae..3c84281e0d19 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,22 +1,17 @@
# Template file for 'seahorse-nautilus'
pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
+version=3.11.92.2022.10.9
+_commit=0fd324c191565bff76ca45a01b2da14b4ab7b3bd
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext"
makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
+ gpgme-devel libcryptui-devel gcr-devel"
depends="gnupg desktop-file-utils"
short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
+distfiles="https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/archive/${_commit}/seahorse-nautilus-${_commit}.tar.gz"
+checksum=8f82b1ffef1a38e1b6d40fb463428037e881ff1e5c88292b24afd436ba6740af
lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (41 preceding siblings ...)
2023-01-01 21:32 ` paper42
@ 2023-01-01 22:29 ` paper42
2023-01-01 23:17 ` [PR REVIEW] " oreo639
` (14 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-01 22:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2267 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
- [ ] https://github.com/void-linux/void-packages/pull/41121
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 129529 bytes --]
From 5c3db04dcfd03c1fdad8007a7f2212c95fefaa1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 20:07:27 +0100
Subject: [PATCH 01/62] libwnck: update to 43.0.
---
srcpkgs/libwnck/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 57d884c9f44d..c0f91a89fdce 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,6 @@
# Template file for 'libwnck'
pkgname=libwnck
-version=40.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -12,9 +12,9 @@ short_desc="Library for layout and rendering of text"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libwnck/"
-changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611
+changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/libwnck/${version%.*}/libwnck-${version}.tar.xz"
+checksum=905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe
build_options="gir"
build_options_default="gir"
From 46a331ac2ea23ffa01a703b32daa2d9917da5459 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 02/62] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From d48df0db6633935aa3f74c2925cfd776a2d1d10a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 03/62] evolution-data-server: update to 3.46.2.
---
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 1c852ef3fdff..6b586ced1044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -603,21 +603,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 6304e8cc5b34..84f2dbbbe742 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.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
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 87435e7dac8c64d5e6290fbe4ab21283a781fe17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 04/62] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index 6b586ced1044..c2a11c1cf1ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1136,10 +1136,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 2b3d47f2589c6b5c41908b6d1e210fd4a7244e05 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/62] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c2a11c1cf1ef..84a970009f38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,10 +2977,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 4acc8f45e3dfed09f46a828e23061f5c2ef4c155 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 06/62] budgie-desktop: revbump for mutter 43
---
srcpkgs/budgie-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6c32a8d9cbbb..d21c3b94badc 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.4
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 05925ce22265e7830b4e5102f17384fc8d402486 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 07/62] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 84a970009f38..2cb86c210f0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -674,7 +674,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 571013b24c7d..18e34619b0c4 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,26 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
+version=43.1
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
+ gtk-update-icon-cache"
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# tests timeout:
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=extended
@@ -40,7 +41,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 218d89cfd1390657c12b2b31a624e24b6c95a4d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 08/62] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From e5ffbcec8c4913491c9d1b50b54217fbdab3d359 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 09/62] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From 88115ec555aec8f74b456a2f7a7ea2c53904c5c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 10/62] Endeavour: revbump for evolution-data-server 3.46
---
srcpkgs/Endeavour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 0d9cf4e33cf2..5cd95af999fd 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
# Template file for 'Endeavour'
pkgname=Endeavour
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
From c367e04f0ac530e1f101ce80a6f087efe43ef621 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 11/62] bijiben: revbump for evolution-data-server 3.46
---
srcpkgs/bijiben/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 604076fdb93c..73e972222b7c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=2
+revision=3
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From 175303c516c7b1d48db1474b88bc2374ae3d6043 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:20:42 +0100
Subject: [PATCH 12/62] gnome-panel: update to 3.46.0.
---
srcpkgs/gnome-panel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 2484b7e4525d..2ef92c56c4f1 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=3.44.0
+version=3.46.0
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -13,8 +13,8 @@ short_desc="Panel Application for GNOME flashback"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomePanel"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
+distfiles="${GNOME_SITE}/gnome-panel/${version%.*}/gnome-panel-${version}.tar.xz"
+checksum=cec7a11b70c524b5e8d76d4d7e4d835ee607abda2eb42f4df7619e62eb06aeb1
gnome-panel-devel_package() {
depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From f75680c1e78336d636f2629ce39985ac8862d47a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:21:27 +0100
Subject: [PATCH 13/62] io.elementary.calendar: update to 6.1.2.
* use libsoup3
---
.../patches/libsoup3.patch | 137 ++++++++++++++++++
srcpkgs/io.elementary.calendar/template | 10 +-
2 files changed, 142 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/io.elementary.calendar/patches/libsoup3.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
new file mode 100644
index 000000000000..61659b902cba
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
@@ -0,0 +1,137 @@
+From 62c20e5786accd68b96c423b04e32c043e726cac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <tintou@noel.tf>
+Date: Sun, 7 Aug 2022 21:18:35 +0200
+Subject: [PATCH] Add support for Evolution Data Server 3.46
+
+EDS 3.46 has switched to libsoup-3
+
+Co-authored-by: Bobby Rong <rjl931189261@126.com>
+---
+ meson.build | 10 ++++++++--
+ plugins/CalDAV/CalDAVBackend.vala | 12 ++++++++++++
+ plugins/Google/GoogleBackend.vala | 26 ++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ff7a2d0f9..703a9686d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -28,14 +28,20 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
+ handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+ libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0')
+ libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0')
+-libsoup_dep = dependency('libsoup-2.4')
++if (libedataserver_dep.version().version_compare ('>=3.46'))
++ libsoup_dep = []
++ geocode_glib_dep = dependency('geocode-glib-2.0')
++ add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala')
++else
++ geocode_glib_dep = dependency('geocode-glib-1.0')
++ libsoup_dep = dependency('libsoup-2.4')
++endif
+ gmodule_dep = dependency('gmodule-2.0')
+ champlain_dep = dependency('champlain-0.12')
+ champlain_gtk_dep = dependency('champlain-gtk-0.12')
+ clutter_dep = dependency('clutter-1.0')
+ clutter_gtk_dep = dependency('clutter-gtk-1.0')
+ folks_dep = dependency('folks')
+-geocode_glib_dep = dependency('geocode-glib-1.0')
+ gclue_dep = dependency('libgeoclue-2.0')
+ libecal_dep = dependency('libecal-2.0')
+ libical_dep = dependency('libical-glib')
+diff --git a/plugins/CalDAV/CalDAVBackend.vala b/plugins/CalDAV/CalDAVBackend.vala
+index e1f6fde53..e4f5e0f5c 100644
+--- a/plugins/CalDAV/CalDAVBackend.vala
++++ b/plugins/CalDAV/CalDAVBackend.vala
+@@ -73,7 +73,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ collection.add (url_entry);
+ if (to_edit != null) {
+ E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
++#if HAS_EDS_3_46
++ var uri = webdav.dup_uri ();
++#else
+ var uri = webdav.dup_soup_uri ();
++#endif
+ if (uri.get_port () != 80) {
+ ((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
+ } else {
+@@ -147,7 +151,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+@@ -190,7 +198,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+diff --git a/plugins/Google/GoogleBackend.vala b/plugins/Google/GoogleBackend.vala
+index 2f9fa3f2b..3f77bd13b 100644
+--- a/plugins/Google/GoogleBackend.vala
++++ b/plugins/Google/GoogleBackend.vala
+@@ -83,12 +83,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
+@@ -128,12 +141,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 96cb63ae1c63..fd37869876fa 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,20 +1,20 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
-version=6.1.0
-revision=2
+version=6.1.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
-checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
+checksum=4051f4d190d2144054c3fb637e53281850a7db858771d73adf157c914dba8f31
libio.elementary.calendar_package() {
short_desc+=" - library"
@@ -26,7 +26,7 @@ libio.elementary.calendar_package() {
libio.elementary.calendar-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.calendar>=${version} evolution-data-server-devel
- granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+ granite-devel gtk+3-devel libglib-devel libical-devel libsoup3-devel
libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
From 58d701ad63e93af47c22d8398e4c2bd051d13e9d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 14/62] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 77c8f3a400dda08b7a2764c07df2d94c2346f5a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 15/62] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From c9506c0360c0f7373f9d7d71eef95875309ef621 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 16/62] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From 0c40608710a13439d1385e3f9dda9bbf39d26244 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 17/62] folks: revbump for evolution-data-server 3.46
---
srcpkgs/folks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..010ccbedc48e 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"
@@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
build_options="gir"
From 9c2d8cc11d062e525d937d96904867d435153104 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 18/62] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 69fdf2241d26ca97589386d7aaaea8bc28634d29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 19/62] gnome-control-center: update to 43.2.
---
srcpkgs/gnome-control-center/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..af6728cd45a1 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=42.3
+version=43.2
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
- polkit python3"
+ polkit python3 gtk-update-icon-cache"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 9057a3cd99cb5aa72b0f502b676f4c7765a9e742 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 20/62] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From a3fbfabeb1aa91b5d94c275dc13272a8620c2f61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 21/62] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From 7537d95d47df0da847402369b4b6ec3228b9c8a7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 22/62] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From bfcd11b3ba078f1f49be01c8f607a69a41c4f99a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:25:59 +0100
Subject: [PATCH 23/62] budgie-control-center: revbump for gnome-desktop 43
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index d39469cc2ef4..11c9080925f0 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From 4980764e6adc2f286d299930610eb179b0a366b2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 24/62] budgie-screensaver: revbump for gnome-desktop 43
---
srcpkgs/budgie-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index d88afb442743..21f96bbd5e7b 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-screensaver'
pkgname=budgie-screensaver
version=5.1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config intltool glib-devel"
makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel
From e26fe370238b64d34bd6e0e4f6c0725ecf986283 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 25/62] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From b08cefeeb23d0f3ef4a831d151a7749c32ee9cc8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 26/62] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From b82c508bc93c97f4533e93f5fd665ee42a9dd354 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/62] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From 4192ea36028c3e22b9a21b044f017fb88ff6a15d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/62] 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 0eb8af318ac2..b481d520e2a2 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 c7929c2657c212fc86c0c03bd9ea6d1950c63c92 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 29/62] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 959d4fb6e1b800b2d6e5a9b0d5796f1d44fb018f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 30/62] 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 a45f10b47bb9..ca02eb97a9ef 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
From f2e9b389ef6ef31b5e1e099bd638b5cc746afe6e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 31/62] gnome-flashback: update to 3.46.0.
---
srcpkgs/gnome-flashback/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 9fc5c992a7db..bb4774a2c74d 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
-version=3.44.0
+version=3.46.0
revision=1
build_helper=gir
build_style=gnu-configure
@@ -9,16 +9,16 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel"
makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
- gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel
+ gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
gsettings-desktop-schemas-devel libXxf86vm-devel"
-depends="gnome-bluetooth1 gnome-session gnome-settings-daemon
+depends="gnome-bluetooth gnome-session gnome-settings-daemon
gnome-panel gnome-themes-extra metacity"
short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
+distfiles="${GNOME_SITE}/gnome-flashback/${version%.*}/gnome-flashback-${version}.tar.xz"
+checksum=7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045
post_extract() {
vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \
From 2d4ebabc6d04e4ac4852ad98cea111f1032b55ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 32/62] gnome-screensaver: revbump for gnome-desktop 43
---
srcpkgs/gnome-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1a23f6dcfb06..fea1becd504e 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
version=3.6.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-compile-warnings=minimum"
hostmakedepends="pkg-config automake intltool glib-devel"
From 4ee747897ee628dfdbd78f840bd846bbecb75dd0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 33/62] cheese: revbump for gnome-desktop 43
---
srcpkgs/cheese/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index abbadbce4daf..95b1dcb53c38 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
# Template file for 'cheese'
pkgname=cheese
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"
From ab01dd7dd9b6e27904f88a3776517258d0d1f211 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 34/62] 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 1afa0de1dac8..1a5183f69658 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
From adc9148b9b0cb9f1abb507fb6a893d9809a6277b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 35/62] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From 4abdf92e1d2a5775ff8acd9927d8ea7be1f131f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 36/62] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 7618d38a92c1844d37e7ceab144615e35d9c8d85 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 37/62] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..826a05a773a0 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,17 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
+ gtk-update-icon-cache"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From 63230e151fd230cc8126bdd684038728926b029c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 38/62] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 7aab037990ce5f504abe9f58dba7b82fa4c862c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 21:41:33 +0100
Subject: [PATCH 39/62] nautilus-python: update to 4.0.
---
srcpkgs/nautilus-python/template | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
index b65f4808f4f1..9c9c3393d172 100644
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@@ -1,25 +1,18 @@
# Template file for 'nautilus-python'
pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
+version=4.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="python3-gobject-devel nautilus-devel"
depends="nautilus python3-gobject"
short_desc="Python bindings for the Nautilus extension framework"
maintainer="Nafis <mnabid.25@outlook.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
+distfiles="${GNOME_SITE}/nautilus-python/${version}/nautilus-python-${version}.tar.xz"
+checksum=17243d62eb7d7d839a9461ab8d0701688805c7161a6705e61413a58ec268281a
build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
+build_options_default="gtk_doc"
From 83bb4a598a62a8672ad01b5a0026e3a37ecc79a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:01:11 +0100
Subject: [PATCH 40/62] dropbox: update to 2022.12.05.
---
srcpkgs/dropbox/template | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
index 7b73816c3c5c..21a8f3974a05 100644
--- a/srcpkgs/dropbox/template
+++ b/srcpkgs/dropbox/template
@@ -1,19 +1,22 @@
# Template file for 'dropbox'
pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
+version=2022.12.05
+revision=1
+_commit=8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3
build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
+hostmakedepends="pkg-config gnome-common libtool python3-gobject python3-docutils gdk-pixbuf-devel"
makedepends="nautilus-devel python3-devel python3-gobject-devel"
depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
short_desc="Dropbox file sharing"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
+distfiles="https://github.com/dropbox/nautilus-dropbox/archive/8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3.tar.gz"
+checksum=e6018254963314b63e81b2ab6f936b48e439ba256ad93b5d447fb8e75c20c2ab
+
+do_configure() {
+ ./autogen.sh --disable-static
+}
nautilus-dropbox_package() {
short_desc="Dropbox nautilus plugin"
From 7cf2ea82697cbd5dfdea34a56018f1d46677db61 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:09:52 +0100
Subject: [PATCH 41/62] seahorse-nautilus: update to 3.11.92.2022.10.9.
---
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 21 +++----
5 files changed, 8 insertions(+), 112 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index d80a1258aeae..3c84281e0d19 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,22 +1,17 @@
# Template file for 'seahorse-nautilus'
pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
+version=3.11.92.2022.10.9
+_commit=0fd324c191565bff76ca45a01b2da14b4ab7b3bd
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext"
makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
+ gpgme-devel libcryptui-devel gcr-devel"
depends="gnupg desktop-file-utils"
short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
+distfiles="https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/archive/${_commit}/seahorse-nautilus-${_commit}.tar.gz"
+checksum=8f82b1ffef1a38e1b6d40fb463428037e881ff1e5c88292b24afd436ba6740af
lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
From 63d62c0c0f9f2465bb3ea95b67c1415dc7a37a08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 42/62] 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 fa21b95b7434..413a971ed87e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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 libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 003f3e618ce3f21e59b57dd0e7a401056f0165a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 43/62] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 4963995a70f579284f759156f82e74551b58f91d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 44/62] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 11be7dca2a314f2afc44b740b51710acd0d561d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 45/62] geary: update to 43.0.
---
srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
srcpkgs/geary/template | 15 +++++-----
3 files changed, 8 insertions(+), 72 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..4be416e38a48 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
+ gobject-introspection vala glib-devel gettext gtk-update-icon-cache"
+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 <cam@nohom.org>"
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 e87a2007f26630201382524c6c8a1f8f3d3998ba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 46/62] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 25e028fe72708a2d02c10e280019dd10fa8e8c5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 47/62] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 47821800989059542a9c821158ce3df703db1355 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 48/62] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 6baf24cc771adbbd7a940ec1dca2d6163288bb2b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 49/62] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..1dc85f8f1344 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,23 +1,25 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gnome_shell gnome-shell)
-Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
-Dsystemd-user-unit-dir=/usr/lib/systemd"
-hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
+hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
+ desktop-file-utils"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +30,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From b82c528ef0f6927b2e69f551b3d74922d2062f46 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 50/62] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From f351e33f209d1f6a9210a01a9c0987d07d8b027e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 51/62] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 27a88db40e0ac86fb7be3aa9f1a640c82571854c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 52/62] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From b82339beffb270dd4f618b543c22b73a69c9dc04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 53/62] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 14ffc04d544c18fa5e2250929101bf3a80204718 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 54/62] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..53e67690f863 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 5d50bf2cc84bee60dd15f621c0ba7e54dd471bfd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 55/62] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From d0ef320eee9e841276362423af0ae6d5076236eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 56/62] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 13 ++++---
2 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..7c641946341a 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 721aa8eabca5ac626b371caae58e9500b3bc9577 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 57/62] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2cb86c210f0a..b8c2ae161e9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3115,7 +3115,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..0a40abfb42b7 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,20 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils
+ gtk-update-icon-cache"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+ json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From a13afe16d95404580861fa37cb56da72cd81b21f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 58/62] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From faa13a92dc4d0a82a9aead62c3e9dfe0b7f8d32b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 59/62] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From 864dbd0050bf2cba6e35fa38ddfd67e5108d733d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 60/62] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 0e7bafa803752a25b84677b0e6397342eb8b2c8c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 61/62] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
From 71531fc2bec6cc9598e5ff2d60bb84d12a351c43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 23:05:34 +0100
Subject: [PATCH 62/62] folks: fix tests
---
srcpkgs/folks/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 010ccbedc48e..e25bbf30105d 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
+checkdepends="dbus bluez"
short_desc="GObject Library to aggregate people into metacontacts"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
@@ -17,6 +18,7 @@ homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
+make_check_pre="dbus-run-session"
build_options="gir"
build_options_default="gir"
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (42 preceding siblings ...)
2023-01-01 22:29 ` paper42
@ 2023-01-01 23:17 ` oreo639
2023-01-02 8:03 ` [PR PATCH] [Updated] " paper42
` (13 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: oreo639 @ 2023-01-01 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r1059804501
Comment:
This should probably be `/usr/lib/systemd/user`
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (43 preceding siblings ...)
2023-01-01 23:17 ` [PR REVIEW] " oreo639
@ 2023-01-02 8:03 ` paper42
2023-01-02 8:07 ` paper42
` (12 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-02 8:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2267 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
- [ ] https://github.com/void-linux/void-packages/pull/41121
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 128568 bytes --]
From 5c3db04dcfd03c1fdad8007a7f2212c95fefaa1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 20:07:27 +0100
Subject: [PATCH 01/61] libwnck: update to 43.0.
---
srcpkgs/libwnck/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 57d884c9f44d..c0f91a89fdce 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,6 @@
# Template file for 'libwnck'
pkgname=libwnck
-version=40.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -12,9 +12,9 @@ short_desc="Library for layout and rendering of text"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libwnck/"
-changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611
+changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/libwnck/${version%.*}/libwnck-${version}.tar.xz"
+checksum=905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe
build_options="gir"
build_options_default="gir"
From 46a331ac2ea23ffa01a703b32daa2d9917da5459 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 02/61] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From 3fd885eb21f99d9f0dff2474ea92f15f62b7babe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 03/61] evolution-data-server: update to 3.46.2.
---
common/shlibs | 19 ++++++++++---------
srcpkgs/evolution-data-server/template | 21 +++++++++++----------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1c852ef3fdff..6b586ced1044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -603,21 +603,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 6304e8cc5b34..33b71f4524ed 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,26 +1,27 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.44.4
+version=3.46.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
+make_check=ci-skip # flaky in CI
build_options="gir"
build_options_default="gir"
@@ -36,7 +37,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 ec5672f74849d229394b186f3540ad4506804239 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 04/61] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index 6b586ced1044..c2a11c1cf1ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1136,10 +1136,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 3c3418489ec39ce7494d910ce724f7a551416434 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/61] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c2a11c1cf1ef..84a970009f38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,10 +2977,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 456d955994e6df60172665164c783d16eef0236d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 06/61] budgie-desktop: revbump for mutter 43
---
srcpkgs/budgie-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6c32a8d9cbbb..d21c3b94badc 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.4
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 8e07033c389e0aaf2e542af489d86a08e993973a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 07/61] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 84a970009f38..2cb86c210f0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -674,7 +674,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 571013b24c7d..18e34619b0c4 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,26 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
+version=43.1
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
+ gtk-update-icon-cache"
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# tests timeout:
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=extended
@@ -40,7 +41,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 7c7cf2cd44a3b0c76a35920d131b6694f14db4b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 08/61] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From 7c18248453e142484ade0ef90fbf495aac19a970 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 09/61] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From d2dcc1b4bff87e755afb944e9e298d34d9ad8795 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 10/61] Endeavour: revbump for evolution-data-server 3.46
---
srcpkgs/Endeavour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 0d9cf4e33cf2..5cd95af999fd 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
# Template file for 'Endeavour'
pkgname=Endeavour
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
From 808c9f89e801b53122729d3510afd645ef157de8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 11/61] bijiben: revbump for evolution-data-server 3.46
---
srcpkgs/bijiben/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 604076fdb93c..73e972222b7c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=2
+revision=3
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From eaabb1b2b7912f53c479ab0a0af3e5dd90173c43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:20:42 +0100
Subject: [PATCH 12/61] gnome-panel: update to 3.46.0.
---
srcpkgs/gnome-panel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 2484b7e4525d..2ef92c56c4f1 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=3.44.0
+version=3.46.0
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -13,8 +13,8 @@ short_desc="Panel Application for GNOME flashback"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomePanel"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
+distfiles="${GNOME_SITE}/gnome-panel/${version%.*}/gnome-panel-${version}.tar.xz"
+checksum=cec7a11b70c524b5e8d76d4d7e4d835ee607abda2eb42f4df7619e62eb06aeb1
gnome-panel-devel_package() {
depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From ec7a860bd292d50614930290cf0821f56d2caf2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:21:27 +0100
Subject: [PATCH 13/61] io.elementary.calendar: update to 6.1.2.
* use libsoup3
---
.../patches/libsoup3.patch | 137 ++++++++++++++++++
srcpkgs/io.elementary.calendar/template | 10 +-
2 files changed, 142 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/io.elementary.calendar/patches/libsoup3.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
new file mode 100644
index 000000000000..61659b902cba
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
@@ -0,0 +1,137 @@
+From 62c20e5786accd68b96c423b04e32c043e726cac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <tintou@noel.tf>
+Date: Sun, 7 Aug 2022 21:18:35 +0200
+Subject: [PATCH] Add support for Evolution Data Server 3.46
+
+EDS 3.46 has switched to libsoup-3
+
+Co-authored-by: Bobby Rong <rjl931189261@126.com>
+---
+ meson.build | 10 ++++++++--
+ plugins/CalDAV/CalDAVBackend.vala | 12 ++++++++++++
+ plugins/Google/GoogleBackend.vala | 26 ++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ff7a2d0f9..703a9686d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -28,14 +28,20 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
+ handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+ libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0')
+ libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0')
+-libsoup_dep = dependency('libsoup-2.4')
++if (libedataserver_dep.version().version_compare ('>=3.46'))
++ libsoup_dep = []
++ geocode_glib_dep = dependency('geocode-glib-2.0')
++ add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala')
++else
++ geocode_glib_dep = dependency('geocode-glib-1.0')
++ libsoup_dep = dependency('libsoup-2.4')
++endif
+ gmodule_dep = dependency('gmodule-2.0')
+ champlain_dep = dependency('champlain-0.12')
+ champlain_gtk_dep = dependency('champlain-gtk-0.12')
+ clutter_dep = dependency('clutter-1.0')
+ clutter_gtk_dep = dependency('clutter-gtk-1.0')
+ folks_dep = dependency('folks')
+-geocode_glib_dep = dependency('geocode-glib-1.0')
+ gclue_dep = dependency('libgeoclue-2.0')
+ libecal_dep = dependency('libecal-2.0')
+ libical_dep = dependency('libical-glib')
+diff --git a/plugins/CalDAV/CalDAVBackend.vala b/plugins/CalDAV/CalDAVBackend.vala
+index e1f6fde53..e4f5e0f5c 100644
+--- a/plugins/CalDAV/CalDAVBackend.vala
++++ b/plugins/CalDAV/CalDAVBackend.vala
+@@ -73,7 +73,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ collection.add (url_entry);
+ if (to_edit != null) {
+ E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
++#if HAS_EDS_3_46
++ var uri = webdav.dup_uri ();
++#else
+ var uri = webdav.dup_soup_uri ();
++#endif
+ if (uri.get_port () != 80) {
+ ((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
+ } else {
+@@ -147,7 +151,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+@@ -190,7 +198,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+diff --git a/plugins/Google/GoogleBackend.vala b/plugins/Google/GoogleBackend.vala
+index 2f9fa3f2b..3f77bd13b 100644
+--- a/plugins/Google/GoogleBackend.vala
++++ b/plugins/Google/GoogleBackend.vala
+@@ -83,12 +83,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
+@@ -128,12 +141,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 96cb63ae1c63..fd37869876fa 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,20 +1,20 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
-version=6.1.0
-revision=2
+version=6.1.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
-checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
+checksum=4051f4d190d2144054c3fb637e53281850a7db858771d73adf157c914dba8f31
libio.elementary.calendar_package() {
short_desc+=" - library"
@@ -26,7 +26,7 @@ libio.elementary.calendar_package() {
libio.elementary.calendar-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.calendar>=${version} evolution-data-server-devel
- granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+ granite-devel gtk+3-devel libglib-devel libical-devel libsoup3-devel
libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
From 930fb63f5e2d2beb2d7a67fc1d1f3989c8b96246 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 14/61] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 847d0566ef87f1682f185ff27f9aba49548124bb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 15/61] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From 76fb3775c57554141cc02832e300af17e56d91ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 16/61] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From a08bc0bcfbf93306dbb64a2aa4e3be4bd97f3925 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 17/61] folks: revbump for evolution-data-server 3.46
* fix tests
---
srcpkgs/folks/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..e25bbf30105d 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"
@@ -10,13 +10,15 @@ hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
+checkdepends="dbus bluez"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
+make_check_pre="dbus-run-session"
build_options="gir"
build_options_default="gir"
From 884ebff20f08d3fd4e490e401b10f6c3bc20a141 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 18/61] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 a0c31e1abb376deb74cbaf3065e716938ee4916c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 19/61] gnome-control-center: update to 43.2.
---
srcpkgs/gnome-control-center/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..af6728cd45a1 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=42.3
+version=43.2
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
- polkit python3"
+ polkit python3 gtk-update-icon-cache"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From dd8fa673065869046978ab08e58264c2abf564dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 20/61] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From 81a425c588e1edfd38d801e6f0026e8e7b67343c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 21/61] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From 7955a42c9955ba0b3f7ae13b06ed277d65c3537a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 22/61] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 6033b4243a05e40cbef17d5600fcda886b4f1a46 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:25:59 +0100
Subject: [PATCH 23/61] budgie-control-center: revbump for gnome-desktop 43
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index d39469cc2ef4..11c9080925f0 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From a6e72976c80445bb151bcb198e599efa4597aa1d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 24/61] budgie-screensaver: revbump for gnome-desktop 43
---
srcpkgs/budgie-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index d88afb442743..21f96bbd5e7b 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-screensaver'
pkgname=budgie-screensaver
version=5.1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config intltool glib-devel"
makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel
From 1ead4ae492e35f46822e2c54c85ce9c8c3778a3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 25/61] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From f5785d133a811e51aee5eef2ee7d551f09e8138f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 26/61] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 1e73d822a0c31c19a32ad5aa608921f7fd95a867 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/61] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From b70a52d3d9c5ade6b93fae67be2a8a173e07a790 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/61] 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 0eb8af318ac2..b481d520e2a2 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 7b0466a2731c95fe08ca3d8a82305231dccd2d4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 29/61] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 009458e121e4f408f51347c84ffdab95fdeee847 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 30/61] 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 a45f10b47bb9..ca02eb97a9ef 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
From db3b16ad1079d69be14a916219e95e5c5f8a5e5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 31/61] gnome-flashback: update to 3.46.0.
---
srcpkgs/gnome-flashback/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 9fc5c992a7db..bb4774a2c74d 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
-version=3.44.0
+version=3.46.0
revision=1
build_helper=gir
build_style=gnu-configure
@@ -9,16 +9,16 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel"
makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
- gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel
+ gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
gsettings-desktop-schemas-devel libXxf86vm-devel"
-depends="gnome-bluetooth1 gnome-session gnome-settings-daemon
+depends="gnome-bluetooth gnome-session gnome-settings-daemon
gnome-panel gnome-themes-extra metacity"
short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
+distfiles="${GNOME_SITE}/gnome-flashback/${version%.*}/gnome-flashback-${version}.tar.xz"
+checksum=7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045
post_extract() {
vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \
From 06491ba2137dd19eea3e17df50c0ab6351440e63 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 32/61] gnome-screensaver: revbump for gnome-desktop 43
---
srcpkgs/gnome-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1a23f6dcfb06..fea1becd504e 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
version=3.6.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-compile-warnings=minimum"
hostmakedepends="pkg-config automake intltool glib-devel"
From b9d6171f503bb5499bac56d13c05794aeb5fa11a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 33/61] cheese: revbump for gnome-desktop 43
---
srcpkgs/cheese/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index abbadbce4daf..95b1dcb53c38 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
# Template file for 'cheese'
pkgname=cheese
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"
From 1b4a98f775029c8c72cb0aa65d5d0b61bf89b222 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 34/61] 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 1afa0de1dac8..1a5183f69658 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
From d3209dbbff94bcbbf37f3923035e8d0aaad7e26c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 35/61] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From 21905f63db3d2ce7012866f1d17b347522ccf0a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 36/61] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 87ff0a88f3b3ed64942a7a7c46094a59b456d5e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 37/61] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..826a05a773a0 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,17 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
+ gtk-update-icon-cache"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From af0e0f3ff7624f606600bddcdaf0a9a0192afdaa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 38/61] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 65a5231b6d39f3bea1f31570c3f890da83e1e273 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 21:41:33 +0100
Subject: [PATCH 39/61] nautilus-python: update to 4.0.
---
srcpkgs/nautilus-python/template | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
index b65f4808f4f1..9c9c3393d172 100644
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@@ -1,25 +1,18 @@
# Template file for 'nautilus-python'
pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
+version=4.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="python3-gobject-devel nautilus-devel"
depends="nautilus python3-gobject"
short_desc="Python bindings for the Nautilus extension framework"
maintainer="Nafis <mnabid.25@outlook.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
+distfiles="${GNOME_SITE}/nautilus-python/${version}/nautilus-python-${version}.tar.xz"
+checksum=17243d62eb7d7d839a9461ab8d0701688805c7161a6705e61413a58ec268281a
build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
+build_options_default="gtk_doc"
From 7d32200ae3f5b21843940e1a759e68970e870994 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:01:11 +0100
Subject: [PATCH 40/61] dropbox: update to 2022.12.05.
---
srcpkgs/dropbox/template | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
index 7b73816c3c5c..aebb8a34a72f 100644
--- a/srcpkgs/dropbox/template
+++ b/srcpkgs/dropbox/template
@@ -1,19 +1,22 @@
# Template file for 'dropbox'
pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
+version=2022.12.05
+revision=1
+_commit=8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3
build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
+hostmakedepends="pkg-config gnome-common libtool python3-gobject python3-docutils gdk-pixbuf-devel"
makedepends="nautilus-devel python3-devel python3-gobject-devel"
depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
short_desc="Dropbox file sharing"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
+distfiles="https://github.com/dropbox/nautilus-dropbox/archive/8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3.tar.gz"
+checksum=e6018254963314b63e81b2ab6f936b48e439ba256ad93b5d447fb8e75c20c2ab
+
+do_configure() {
+ ./autogen.sh ${configure_args} --disable-static
+}
nautilus-dropbox_package() {
short_desc="Dropbox nautilus plugin"
From 3b0fb8a0d58d73817273f3bfae1d8bacaa76e314 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:09:52 +0100
Subject: [PATCH 41/61] seahorse-nautilus: update to 3.11.92.2022.10.9.
---
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 21 +++----
5 files changed, 8 insertions(+), 112 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index d80a1258aeae..f14bcbf39434 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,22 +1,17 @@
# Template file for 'seahorse-nautilus'
pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
+version=3.11.92.2022.10.9
+_commit=0fd324c191565bff76ca45a01b2da14b4ab7b3bd
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext gnupg glib-devel"
makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
+ gpgme-devel libcryptui-devel gcr-devel"
depends="gnupg desktop-file-utils"
short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
+distfiles="https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/archive/${_commit}/seahorse-nautilus-${_commit}.tar.gz"
+checksum=8f82b1ffef1a38e1b6d40fb463428037e881ff1e5c88292b24afd436ba6740af
lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
From b7d98bfd9c1b8ff1e03e402b4a68f1abfceb2773 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 42/61] 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 fa21b95b7434..413a971ed87e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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 libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From fa5558dbdae12f059ae1efe159d7875a4842bfe5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 43/61] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 83c394d4be106b9999ee619dbf0d011f2711ad8f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 44/61] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From b9e389af4e6adc8af833892f7399ce324f5bccd8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 45/61] geary: update to 43.0.
---
srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
srcpkgs/geary/template | 15 +++++-----
3 files changed, 8 insertions(+), 72 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..4be416e38a48 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
+ gobject-introspection vala glib-devel gettext gtk-update-icon-cache"
+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 <cam@nohom.org>"
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 dca5c073a3114791952abd7250c472a9e5dc87bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 46/61] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 62d02bac02ed354d849da37fab36ed691ede1a8d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 47/61] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 ba31b0b4b7a1765d5c87eecfb24f713017bec88d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 48/61] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 2360fd50744a6828ee348c7a6494eb8d647316d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 49/61] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..1dc85f8f1344 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,23 +1,25 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gnome_shell gnome-shell)
-Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
-Dsystemd-user-unit-dir=/usr/lib/systemd"
-hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
+hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
+ desktop-file-utils"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +30,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 91d0f5d2c3286ba12a3ffc025b31989994346947 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 50/61] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From 845ef31ef42bbb1b8b8b6ab5efa16d64799a47a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 51/61] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 572c0dd906adf37e2c0c468d732a2f464fbc4e65 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 52/61] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From c493f9eb1a35f6042b0ddf24491bca7ba5c3a029 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 53/61] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 4409a4f4cb0816008b1c3595860e8dfa3062a6ce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 54/61] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..53e67690f863 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From b0ec6510caf3cdb55a44456259c675d7a2d38a20 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 55/61] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From 9204095bddf588cae3d723dc89c190179935880b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 56/61] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 13 ++++---
2 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..7c641946341a 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From 6b13805420e8d6c3e26d47242d3888df3486f4bd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 57/61] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2cb86c210f0a..b8c2ae161e9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3115,7 +3115,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..0a40abfb42b7 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,20 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils
+ gtk-update-icon-cache"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+ json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 0de9f44db520a14d289b0cfd215295f569d3ecb2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 58/61] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From f19e76a4f73035353706ae3d7b03b7d552cb93b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 59/61] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From a47b72077139a4004a5c55c4b47b42f06876d578 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 60/61] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 3a4c9ec4deebf3775aea759525cc187d4829103b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 61/61] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Updated] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (44 preceding siblings ...)
2023-01-02 8:03 ` [PR PATCH] [Updated] " paper42
@ 2023-01-02 8:07 ` paper42
2023-01-02 10:51 ` [PR REVIEW] " paper42
` (11 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-02 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2267 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome43
https://github.com/void-linux/void-packages/pull/39513
[WIP]: GNOME 43
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
- [ ] https://github.com/void-linux/void-packages/pull/41121
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39513.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome43-39513.patch --]
[-- Type: text/x-diff, Size: 128568 bytes --]
From 5c3db04dcfd03c1fdad8007a7f2212c95fefaa1c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 20:07:27 +0100
Subject: [PATCH 01/61] libwnck: update to 43.0.
---
srcpkgs/libwnck/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 57d884c9f44d..c0f91a89fdce 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -1,6 +1,6 @@
# Template file for 'libwnck'
pkgname=libwnck
-version=40.1
+version=43.0
revision=1
build_style=meson
build_helper="gir"
@@ -12,9 +12,9 @@ short_desc="Library for layout and rendering of text"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libwnck/"
-changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/gnome-40/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03134fa114ef3fbe34075aa83678f58aa2debe9fcef4ea23c0779e28601d6611
+changelog="https://gitlab.gnome.org/GNOME/libwnck/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/libwnck/${version%.*}/libwnck-${version}.tar.xz"
+checksum=905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe
build_options="gir"
build_options_default="gir"
From 46a331ac2ea23ffa01a703b32daa2d9917da5459 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:50:59 +0100
Subject: [PATCH 02/61] adwaita-icon-theme: update to 43.
---
srcpkgs/adwaita-icon-theme/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 983ae9b69d55..b42a1efb0a90 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,13 +1,14 @@
# Template file for 'adwaita-icon-theme'
pkgname=adwaita-icon-theme
-version=42.0
+version=43
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
depends="librsvg"
short_desc="Theme consisting of a set of icons for GTK+"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
-checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0
+changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz"
+checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6
From 3fd885eb21f99d9f0dff2474ea92f15f62b7babe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:03:27 +0200
Subject: [PATCH 03/61] evolution-data-server: update to 3.46.2.
---
common/shlibs | 19 ++++++++++---------
srcpkgs/evolution-data-server/template | 21 +++++++++++----------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1c852ef3fdff..6b586ced1044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -603,21 +603,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 6304e8cc5b34..33b71f4524ed 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,26 +1,27 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.44.4
+version=3.46.2
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 <gottox@voidlinux.org>"
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=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0
+make_check=ci-skip # flaky in CI
build_options="gir"
build_options_default="gir"
@@ -36,7 +37,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 ec5672f74849d229394b186f3540ad4506804239 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:10:24 +0200
Subject: [PATCH 04/61] gnome-desktop: update to 43.
---
common/shlibs | 8 +-
.../patches/optional_introspection.patch | 93 -------------------
srcpkgs/gnome-desktop/template | 13 +--
3 files changed, 11 insertions(+), 103 deletions(-)
delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch
diff --git a/common/shlibs b/common/shlibs
index 6b586ced1044..c2a11c1cf1ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1136,10 +1136,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 b960ef27c588..000000000000
--- 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 <leio@gentoo.org>
-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 86b8ca890776..ec82aeb9d2bf 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.6
+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
@@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
short_desc="GNOME desktop management utilities"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b
+#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}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz"
+checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69
build_options="gir"
build_options_default="gir"
From 3c3418489ec39ce7494d910ce724f7a551416434 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:36:08 +0200
Subject: [PATCH 05/61] mutter: update to 43.2.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c2a11c1cf1ef..84a970009f38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,10 +2977,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.2_1
+libmutter-clutter-11.so.0 mutter-43.2_1
+libmutter-cogl-11.so.0 mutter-43.2_1
+libmutter-cogl-pango-11.so.0 mutter-43.2_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub-0.6.so.0 libgepub-0.6.0_4
libslopy.so.7.6 slop-7.6_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 6e71320cef44..4adf8a458957 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=42.6
+version=43.2
revision=1
build_helper="gir"
build_style=meson
@@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
depends="gsettings-desktop-schemas desktop-file-utils zenity"
short_desc="Wayland display server, X11 window manager and compositor library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1
-shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so
- libmutter-cogl-pango-10.so"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
+checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84
+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 456d955994e6df60172665164c783d16eef0236d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 06/61] budgie-desktop: revbump for mutter 43
---
srcpkgs/budgie-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6c32a8d9cbbb..d21c3b94badc 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.4
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 8e07033c389e0aaf2e542af489d86a08e993973a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 07/61] nautilus: update to 43.1.
---
common/shlibs | 2 +-
srcpkgs/nautilus/template | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 84a970009f38..2cb86c210f0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -674,7 +674,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 571013b24c7d..18e34619b0c4 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -1,25 +1,26 @@
# Template file for 'nautilus'
pkgname=nautilus
-version=42.2
+version=43.1
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
+ gtk-update-icon-cache"
+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"
short_desc="GNOME file manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz"
+checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf
# tests timeout:
# 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s
make_check=extended
@@ -40,7 +41,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 7c7cf2cd44a3b0c76a35920d131b6694f14db4b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 13 Sep 2022 00:32:21 +0200
Subject: [PATCH 08/61] gnome-shell: update to 43.2.
---
srcpkgs/gnome-shell/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 7621c5fa8ee1..6aa67cd1a46b 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,27 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=42.6
+version=43.2
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"
short_desc="GNOME core user interface"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d
+checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860
do_check() {
mkdir /tmp/gnome-shell-xdg
From 7c18248453e142484ade0ef90fbf495aac19a970 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:12:52 +0100
Subject: [PATCH 09/61] gnome-shell-extensions: update to 43.1.
---
srcpkgs/gnome-shell-extensions/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 414961a95f40..8b358e73b199 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=42.3
+version=43.1
revision=1
build_style=meson
configure_args="-Dextension_set=all"
hostmakedepends="pkg-config gettext"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc
+distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
+checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
From d2dcc1b4bff87e755afb944e9e298d34d9ad8795 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 10/61] Endeavour: revbump for evolution-data-server 3.46
---
srcpkgs/Endeavour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Endeavour/template b/srcpkgs/Endeavour/template
index 0d9cf4e33cf2..5cd95af999fd 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,7 @@
# Template file for 'Endeavour'
pkgname=Endeavour
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)"
From 808c9f89e801b53122729d3510afd645ef157de8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:19:45 +0100
Subject: [PATCH 11/61] bijiben: revbump for evolution-data-server 3.46
---
srcpkgs/bijiben/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 604076fdb93c..73e972222b7c 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
version=40.1
-revision=2
+revision=3
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From eaabb1b2b7912f53c479ab0a0af3e5dd90173c43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:20:42 +0100
Subject: [PATCH 12/61] gnome-panel: update to 3.46.0.
---
srcpkgs/gnome-panel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 2484b7e4525d..2ef92c56c4f1 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-panel'
pkgname=gnome-panel
-version=3.44.0
+version=3.46.0
revision=1
build_style=gnu-configure
configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
@@ -13,8 +13,8 @@ short_desc="Panel Application for GNOME flashback"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GnomePanel"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa
+distfiles="${GNOME_SITE}/gnome-panel/${version%.*}/gnome-panel-${version}.tar.xz"
+checksum=cec7a11b70c524b5e8d76d4d7e4d835ee607abda2eb42f4df7619e62eb06aeb1
gnome-panel-devel_package() {
depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From ec7a860bd292d50614930290cf0821f56d2caf2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:21:27 +0100
Subject: [PATCH 13/61] io.elementary.calendar: update to 6.1.2.
* use libsoup3
---
.../patches/libsoup3.patch | 137 ++++++++++++++++++
srcpkgs/io.elementary.calendar/template | 10 +-
2 files changed, 142 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/io.elementary.calendar/patches/libsoup3.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/libsoup3.patch b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
new file mode 100644
index 000000000000..61659b902cba
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/libsoup3.patch
@@ -0,0 +1,137 @@
+From 62c20e5786accd68b96c423b04e32c043e726cac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <tintou@noel.tf>
+Date: Sun, 7 Aug 2022 21:18:35 +0200
+Subject: [PATCH] Add support for Evolution Data Server 3.46
+
+EDS 3.46 has switched to libsoup-3
+
+Co-authored-by: Bobby Rong <rjl931189261@126.com>
+---
+ meson.build | 10 ++++++++--
+ plugins/CalDAV/CalDAVBackend.vala | 12 ++++++++++++
+ plugins/Google/GoogleBackend.vala | 26 ++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ff7a2d0f9..703a9686d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -28,14 +28,20 @@ gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
+ handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+ libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0')
+ libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0')
+-libsoup_dep = dependency('libsoup-2.4')
++if (libedataserver_dep.version().version_compare ('>=3.46'))
++ libsoup_dep = []
++ geocode_glib_dep = dependency('geocode-glib-2.0')
++ add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala')
++else
++ geocode_glib_dep = dependency('geocode-glib-1.0')
++ libsoup_dep = dependency('libsoup-2.4')
++endif
+ gmodule_dep = dependency('gmodule-2.0')
+ champlain_dep = dependency('champlain-0.12')
+ champlain_gtk_dep = dependency('champlain-gtk-0.12')
+ clutter_dep = dependency('clutter-1.0')
+ clutter_gtk_dep = dependency('clutter-gtk-1.0')
+ folks_dep = dependency('folks')
+-geocode_glib_dep = dependency('geocode-glib-1.0')
+ gclue_dep = dependency('libgeoclue-2.0')
+ libecal_dep = dependency('libecal-2.0')
+ libical_dep = dependency('libical-glib')
+diff --git a/plugins/CalDAV/CalDAVBackend.vala b/plugins/CalDAV/CalDAVBackend.vala
+index e1f6fde53..e4f5e0f5c 100644
+--- a/plugins/CalDAV/CalDAVBackend.vala
++++ b/plugins/CalDAV/CalDAVBackend.vala
+@@ -73,7 +73,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ collection.add (url_entry);
+ if (to_edit != null) {
+ E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
++#if HAS_EDS_3_46
++ var uri = webdav.dup_uri ();
++#else
+ var uri = webdav.dup_soup_uri ();
++#endif
+ if (uri.get_port () != 80) {
+ ((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
+ } else {
+@@ -147,7 +151,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+@@ -190,7 +198,11 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
+ foreach (var widget in widgets) {
+ switch (widget.ref_name) {
+ case "url_entry":
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
++#else
+ webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
++#endif
+ break;
+ case "user_entry":
+ auth.user = ((Gtk.Entry)widget.widget).text;
+diff --git a/plugins/Google/GoogleBackend.vala b/plugins/Google/GoogleBackend.vala
+index 2f9fa3f2b..3f77bd13b 100644
+--- a/plugins/Google/GoogleBackend.vala
++++ b/plugins/Google/GoogleBackend.vala
+@@ -83,12 +83,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
+@@ -128,12 +141,25 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
+ }
+
+ auth.user = decoded_user;
++#if HAS_EDS_3_46
++ webdav.uri = GLib.Uri.build (
++ GLib.UriFlags.NONE,
++ "https",
++ null,
++ "www.google.com",
++ -1,
++ "/calendar/dav/%s/events".printf (decoded_user),
++ null,
++ null
++ );
++#else
+ var soup_uri = new Soup.URI (null);
+ soup_uri.set_host ("www.google.com");
+ soup_uri.set_scheme ("https");
+ soup_uri.set_user (decoded_user);
+ soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
+ webdav.soup_uri = soup_uri;
++#endif
+ break;
+ case "keep_copy":
+ offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index 96cb63ae1c63..fd37869876fa 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,20 +1,20 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
-version=6.1.0
-revision=2
+version=6.1.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
homepage="https://github.com/elementary/calendar"
distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
-checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
+checksum=4051f4d190d2144054c3fb637e53281850a7db858771d73adf157c914dba8f31
libio.elementary.calendar_package() {
short_desc+=" - library"
@@ -26,7 +26,7 @@ libio.elementary.calendar_package() {
libio.elementary.calendar-devel_package() {
short_desc+=" - library development files"
depends="libio.elementary.calendar>=${version} evolution-data-server-devel
- granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+ granite-devel gtk+3-devel libglib-devel libical-devel libsoup3-devel
libhandy1-devel"
pkg_install() {
vmove "usr/lib/*.so"
From 930fb63f5e2d2beb2d7a67fc1d1f3989c8b96246 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 14/61] evolution: update to 3.46.2.
---
srcpkgs/evolution/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index fd9d12a73e74..2dfb497a2968 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,31 +1,31 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.44.4
-revision=2
+version=3.46.2
+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 <gottox@voidlinux.org>"
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=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d
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 847d0566ef87f1682f185ff27f9aba49548124bb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:05:51 +0200
Subject: [PATCH 15/61] sushi: update to 43.0.
---
srcpkgs/sushi/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 4b9b2fbe1c0b..7abffcb1f708 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -1,20 +1,21 @@
# 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
+hostmakedepends="glib-devel gettext 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 libsoup3-devel libwebkit2gtk41-devel"
depends="evince nautilus"
short_desc="Quick image previewer over DBus for Nautilus"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sushi"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820
+changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz"
+checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b
lib32disabled=yes
build_options="gir"
From 76fb3775c57554141cc02832e300af17e56d91ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 16/61] evolution-ews: update to 3.46.2.
---
srcpkgs/evolution-ews/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 2446b3edd159..df96dec71cfd 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.2
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 <masaj@gmx.com>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3
+changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
+checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41
From a08bc0bcfbf93306dbb64a2aa4e3be4bd97f3925 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:01 +0200
Subject: [PATCH 17/61] folks: revbump for evolution-data-server 3.46
* fix tests
---
srcpkgs/folks/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index fbc56862bde7..e25bbf30105d 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"
@@ -10,13 +10,15 @@ hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
depends="zeitgeist"
+checkdepends="dbus bluez"
short_desc="GObject Library to aggregate people into metacontacts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Folks"
changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
+make_check_pre="dbus-run-session"
build_options="gir"
build_options_default="gir"
From 884ebff20f08d3fd4e490e401b10f6c3bc20a141 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 15:25:02 +0200
Subject: [PATCH 18/61] 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 c60afea1d67b..51401d93aa18 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
# Template file for 'pidgin'
pkgname=pidgin
version=2.14.10
-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 a0c31e1abb376deb74cbaf3065e716938ee4916c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:06 +0200
Subject: [PATCH 19/61] gnome-control-center: update to 43.2.
---
srcpkgs/gnome-control-center/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 84ff92b93ae8..af6728cd45a1 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=42.3
+version=43.2
revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
- polkit python3"
+ polkit python3 gtk-update-icon-cache"
makedepends="ModemManager-devel accountsservice-devel alsa-plugins
colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel
gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel
@@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins
depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd"
short_desc="GNOME control center"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
+checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From dd8fa673065869046978ab08e58264c2abf564dd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:24:08 +0200
Subject: [PATCH 20/61] gdm: update to 43.0.
---
srcpkgs/gdm/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index b504f4ba2adf..424128db0fad 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
# Template file for 'gdm'
pkgname=gdm
-version=42.0
-revision=3
+version=43.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="
@@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra
gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb"
checkdepends="check-devel"
short_desc="GNOME Display Manager"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
+checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
conf_files="
/etc/gdm/custom.conf
From 81a425c588e1edfd38d801e6f0026e8e7b67343c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 20:51:14 +0200
Subject: [PATCH 21/61] gnome-session: update to 43.0.
---
srcpkgs/gnome-session/template | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 76b1f49f1cdc..062d5b8b5033 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 <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
-}
+changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
+checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
From 7955a42c9955ba0b3f7ae13b06ed277d65c3537a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 21:54:44 +0200
Subject: [PATCH 22/61] gnome-settings-daemon: update to 43.0.
---
srcpkgs/gnome-settings-daemon/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ea3ac6838044..f22bdbdb61f4 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
-revision=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
@@ -15,12 +15,12 @@ depends="hicolor-icon-theme"
checkdepends="elogind libnotify python3-dbusmock python3-gobject
python3-pycodestyle which hwids eudev"
short_desc="GNOME settings daemon"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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
+distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
+checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 6033b4243a05e40cbef17d5600fcda886b4f1a46 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:25:59 +0100
Subject: [PATCH 23/61] budgie-control-center: revbump for gnome-desktop 43
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index d39469cc2ef4..11c9080925f0 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From a6e72976c80445bb151bcb198e599efa4597aa1d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 24/61] budgie-screensaver: revbump for gnome-desktop 43
---
srcpkgs/budgie-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index d88afb442743..21f96bbd5e7b 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-screensaver'
pkgname=budgie-screensaver
version=5.1.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config intltool glib-devel"
makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel
From 1ead4ae492e35f46822e2c54c85ce9c8c3778a3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:00:07 +0200
Subject: [PATCH 25/61] gnome-contacts: revbump for gnome-desktop 43
---
srcpkgs/gnome-contacts/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 64ecf75826b7..cee511c32883 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-contacts'
pkgname=gnome-contacts
-version=42.0
-revision=2
+version=43.0
+revision=1
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
+makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel
libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Contacts"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216
+distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz"
+checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1
From f5785d133a811e51aee5eef2ee7d551f09e8138f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 22:37:58 +0200
Subject: [PATCH 26/61] gnome-calendar: update to 43.1.
---
srcpkgs/gnome-calendar/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index 086915b3988f..70cc9f9dfcda 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
-revision=2
+version=43.1
+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-libsoup2-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
- libgweather-devel libical-devel libpeas-devel libsoup-devel"
+ libgweather-devel libical-devel libpeas-devel libsoup3-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd
+#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}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz"
+checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2
build_options="gir"
build_options_default="gir"
From 1e73d822a0c31c19a32ad5aa608921f7fd95a867 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 27/61] 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 bfe74853c0c3..e6cde7202b63 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,7 +1,7 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc)
From b70a52d3d9c5ade6b93fae67be2a8a173e07a790 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:11:51 +0200
Subject: [PATCH 28/61] 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 0eb8af318ac2..b481d520e2a2 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 7b0466a2731c95fe08ca3d8a82305231dccd2d4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:33:08 +0100
Subject: [PATCH 29/61] xdg-desktop-portal-gnome: revbump for gnome-desktop 43
---
srcpkgs/xdg-desktop-portal-gnome/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index fe0c1b213f1f..4f0ea1e9b00a 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
version=43.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
From 009458e121e4f408f51347c84ffdab95fdeee847 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 30/61] 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 a45f10b47bb9..ca02eb97a9ef 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,7 +1,7 @@
# Template file for 'eog'
pkgname=eog
version=43.1
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dintrospection=$(vopt_if gir true false)"
From db3b16ad1079d69be14a916219e95e5c5f8a5e5a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 31/61] gnome-flashback: update to 3.46.0.
---
srcpkgs/gnome-flashback/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template
index 9fc5c992a7db..bb4774a2c74d 100644
--- a/srcpkgs/gnome-flashback/template
+++ b/srcpkgs/gnome-flashback/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-flashback'
pkgname=gnome-flashback
-version=3.44.0
+version=3.46.0
revision=1
build_helper=gir
build_style=gnu-configure
@@ -9,16 +9,16 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel"
makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel
pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel
libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel
- gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel
+ gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel
gsettings-desktop-schemas-devel libXxf86vm-devel"
-depends="gnome-bluetooth1 gnome-session gnome-settings-daemon
+depends="gnome-bluetooth gnome-session gnome-settings-daemon
gnome-panel gnome-themes-extra metacity"
short_desc="GNOME session with similar user experience to the GNOME 2.x series"
maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeFlashback"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a
+distfiles="${GNOME_SITE}/gnome-flashback/${version%.*}/gnome-flashback-${version}.tar.xz"
+checksum=7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045
post_extract() {
vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \
From 06491ba2137dd19eea3e17df50c0ab6351440e63 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:01 +0100
Subject: [PATCH 32/61] gnome-screensaver: revbump for gnome-desktop 43
---
srcpkgs/gnome-screensaver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index 1a23f6dcfb06..fea1becd504e 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
version=3.6.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-compile-warnings=minimum"
hostmakedepends="pkg-config automake intltool glib-devel"
From b9d6171f503bb5499bac56d13c05794aeb5fa11a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 33/61] cheese: revbump for gnome-desktop 43
---
srcpkgs/cheese/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index abbadbce4daf..95b1dcb53c38 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
# Template file for 'cheese'
pkgname=cheese
version=43.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"
From 1b4a98f775029c8c72cb0aa65d5d0b61bf89b222 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 21:26:00 +0100
Subject: [PATCH 34/61] 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 1afa0de1dac8..1a5183f69658 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=43.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
From d3209dbbff94bcbbf37f3923035e8d0aaad7e26c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 18:22:36 +0100
Subject: [PATCH 35/61] brasero: don't build nautilus extension
doesn't work with nautilus 43
---
srcpkgs/brasero/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index da86c9a66699..8830cf51e488 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,14 +1,13 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.3
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
hostmakedepends="pkg-config intltool cdrtools itstool"
makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
- libcanberra-devel nautilus-devel libisofs-devel
- libburn-devel libSM-devel dconf-devel"
+ libcanberra-devel libisofs-devel libburn-devel libSM-devel dconf-devel"
depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Orphaned <orphan@voidlinux.org>"
From 21905f63db3d2ce7012866f1d17b347522ccf0a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:25:11 +0200
Subject: [PATCH 36/61] 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 e6cde7202b63..841968f28958 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -1,16 +1,17 @@
# Template file for 'evince'
pkgname=evince
version=43.1
-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 87ff0a88f3b3ed64942a7a7c46094a59b456d5e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 28 Sep 2022 23:35:02 +0200
Subject: [PATCH 37/61] file-roller: update to 43.0.
---
srcpkgs/file-roller/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 1baaf1e1922f..826a05a773a0 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,16 +1,17 @@
# Template file for 'file-roller'
pkgname=file-roller
-version=3.42.0
+version=43.0
revision=1
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
+hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils
+ gtk-update-icon-cache"
makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel
- libnotify-devel nautilus-devel libhandy1-devel"
+ libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/FileRoller"
changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7
+distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz"
+checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1
From af0e0f3ff7624f606600bddcdaf0a9a0192afdaa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 20:38:19 +0100
Subject: [PATCH 38/61] gnome-mplayer: remove nautilus plugin
doesn't work with nautilus 43
---
srcpkgs/gnome-mplayer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 1004710eee41..e5546815de72 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
# XXX missing libgpod
makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
- libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
+ libXScrnSaver-devel alsa-lib-devel pulseaudio-devel
libgda-devel desktop-file-utils hicolor-icon-theme mplayer"
depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="Simple MPlayer GUI for GNOME"
From 65a5231b6d39f3bea1f31570c3f890da83e1e273 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 21:41:33 +0100
Subject: [PATCH 39/61] nautilus-python: update to 4.0.
---
srcpkgs/nautilus-python/template | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template
index b65f4808f4f1..9c9c3393d172 100644
--- a/srcpkgs/nautilus-python/template
+++ b/srcpkgs/nautilus-python/template
@@ -1,25 +1,18 @@
# Template file for 'nautilus-python'
pkgname=nautilus-python
-version=1.2.3
-revision=6
-build_style=gnu-configure
-configure_args="$(vopt_enable gtk_doc gtk-doc) PYTHON=python3
- PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/${py3_inc}
- PYTHON_LIBS=-lpython${py3_ver}"
-hostmakedepends="automake libtool pkg-config which python3
- $(vopt_if gtk_doc gtk-doc)"
-makedepends="python3-devel python3-gobject-devel nautilus-devel"
+version=4.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
+makedepends="python3-gobject-devel nautilus-devel"
depends="nautilus python3-gobject"
short_desc="Python bindings for the Nautilus extension framework"
maintainer="Nafis <mnabid.25@outlook.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NautilusPython"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
-
-CFLAGS="-fcommon"
+distfiles="${GNOME_SITE}/nautilus-python/${version}/nautilus-python-${version}.tar.xz"
+checksum=17243d62eb7d7d839a9461ab8d0701688805c7161a6705e61413a58ec268281a
build_options="gtk_doc"
-if [ ! "$CROSS_BUILD" ]; then
- build_options_default="gtk_doc"
-fi
+build_options_default="gtk_doc"
From 7d32200ae3f5b21843940e1a759e68970e870994 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:01:11 +0100
Subject: [PATCH 40/61] dropbox: update to 2022.12.05.
---
srcpkgs/dropbox/template | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template
index 7b73816c3c5c..aebb8a34a72f 100644
--- a/srcpkgs/dropbox/template
+++ b/srcpkgs/dropbox/template
@@ -1,19 +1,22 @@
# Template file for 'dropbox'
pkgname=dropbox
-version=2020.03.04
-revision=2
-_fullname="nautilus-dropbox"
+version=2022.12.05
+revision=1
+_commit=8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3
build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config python3-gobject python3-docutils gdk-pixbuf-devel"
+hostmakedepends="pkg-config gnome-common libtool python3-gobject python3-docutils gdk-pixbuf-devel"
makedepends="nautilus-devel python3-devel python3-gobject-devel"
depends="libxslt python3-gobject python3-gpg gdk-pixbuf"
short_desc="Dropbox file sharing"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.dropbox.com"
-distfiles="https://linux.dropbox.com/packages/${_fullname}-${version}.tar.bz2"
-checksum=f3704103e8c646ec48cd9daf9af2183c6b492c59edf93d8768c14861cb404cca
+distfiles="https://github.com/dropbox/nautilus-dropbox/archive/8cc1635a0e0e6edf90beb4b6f9c9ecb2b39e41f3.tar.gz"
+checksum=e6018254963314b63e81b2ab6f936b48e439ba256ad93b5d447fb8e75c20c2ab
+
+do_configure() {
+ ./autogen.sh ${configure_args} --disable-static
+}
nautilus-dropbox_package() {
short_desc="Dropbox nautilus plugin"
From e56e4025c85abb91ef21ab8b455c554dbbc97e48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 Jan 2023 22:09:52 +0100
Subject: [PATCH 41/61] seahorse-nautilus: update to 3.11.92.2022.10.9.
---
.../patches/fix-desktop-files.patch | 56 -------------------
.../seahorse-nautilus/patches/locale.patch | 12 ----
.../seahorse-nautilus/patches/new-gnupg.patch | 13 -----
.../patches/remove-unused-gnome-keyring.patch | 18 ------
srcpkgs/seahorse-nautilus/template | 21 +++----
5 files changed, 8 insertions(+), 112 deletions(-)
delete mode 100644 srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/locale.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
delete mode 100644 srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
diff --git a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch b/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
deleted file mode 100644
index 89c2313aa986..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/fix-desktop-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Carlos Maddela <e7appew@gmail.com>
-Date: Sun, 8 Jan 2017 23:27:27 +1100
-Subject: Fix desktop files to use valid field code with Exec key.
-
-Description: Fix desktop files to use valid field code with Exec key.
-Author: Carlos Maddela <e7appew@gmail.com>
-Origin: vendor
-Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=790254
-Last-Update: 2017-11-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- tool/seahorse-pgp-encrypted.desktop.in.in | 2 +-
- tool/seahorse-pgp-keys.desktop.in.in | 2 +-
- tool/seahorse-pgp-signature.desktop.in.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tool/seahorse-pgp-encrypted.desktop.in.in b/tool/seahorse-pgp-encrypted.desktop.in.in
-index 2d631e8..0897aa0 100644
---- a/tool/seahorse-pgp-encrypted.desktop.in.in
-+++ b/tool/seahorse-pgp-encrypted.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Decrypt File
- MimeType=application/pgp-encrypted;
--Exec=seahorse-tool --decrypt
-+Exec=seahorse-tool --decrypt %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-keys.desktop.in.in b/tool/seahorse-pgp-keys.desktop.in.in
-index 36cb153..5b4bd73 100644
---- a/tool/seahorse-pgp-keys.desktop.in.in
-+++ b/tool/seahorse-pgp-keys.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Import Key
- MimeType=application/pgp-keys;
--Exec=seahorse-tool --import
-+Exec=seahorse-tool --import %U
- Type=Application
- Terminal=false
- NoDisplay=true
-diff --git a/tool/seahorse-pgp-signature.desktop.in.in b/tool/seahorse-pgp-signature.desktop.in.in
-index 00b9562..77820f7 100644
---- a/tool/seahorse-pgp-signature.desktop.in.in
-+++ b/tool/seahorse-pgp-signature.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Verify Signature
- MimeType=application/pgp-signature;
--Exec=seahorse-tool --verify
-+Exec=seahorse-tool --verify %U
- Type=Application
- Terminal=false
- NoDisplay=true
diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch
deleted file mode 100644
index 06867e0432e0..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
-
- GLIB_GSETTINGS
- AM_GLIB_GNU_GETTEXT
-+DATADIRNAME=share
-
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 gio-2.0)
-
diff --git a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch b/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
deleted file mode 100644
index 01d944a3cac9..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/new-gnupg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(gpg-check,
- DO_CHECK=$enableval, DO_CHECK=yes)
-
- if test "$DO_CHECK" = "yes"; then
-- accepted_versions="1.2 1.4 2.0"
-+ accepted_versions="1.2 1.4 2.0 2.1 2.2 2.3"
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
- ok="no"
- if test "$GNUPG" != "no"; then
diff --git a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch b/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
deleted file mode 100644
index befc0d669eca..000000000000
--- a/srcpkgs/seahorse-nautilus/patches/remove-unused-gnome-keyring.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: seahorse-nautilus-3.10.1/configure.ac
-===================================================================
---- seahorse-nautilus-3.10.1.orig/configure.ac
-+++ seahorse-nautilus-3.10.1/configure.ac
-@@ -148,13 +148,6 @@ fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
- # -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
--# -----------------------------------------------------------------------------
- # DBus
-
- DBUS_GLIB_REQUIRED=0.35
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index d80a1258aeae..fa20d6134565 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -1,22 +1,17 @@
# Template file for 'seahorse-nautilus'
pkgname=seahorse-nautilus
-version=3.10.1
-revision=6
-build_style=gnu-configure
-configure_args="--disable-schemas-compile"
-hostmakedepends="automake libtool pkg-config intltool gpgme-devel gnupg
- glib-devel gettext-devel-tools"
+version=3.11.92.2022.10.9
+revision=1
+_commit=0fd324c191565bff76ca45a01b2da14b4ab7b3bd
+build_style=meson
+hostmakedepends="pkg-config gettext gnupg glib-devel"
makedepends="gtk+3-devel nautilus-devel libnotify-devel
- gpgme-devel libcryptui-devel gcr-devel libgnome-keyring-devel"
+ gpgme-devel libcryptui-devel gcr-devel"
depends="gnupg desktop-file-utils"
short_desc="Nautilus plugin for OpenPGP file encryption/decryption"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org/projects/seahorse/"
-distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
-checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
+distfiles="https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/archive/${_commit}/seahorse-nautilus-${_commit}.tar.gz"
+checksum=8f82b1ffef1a38e1b6d40fb463428037e881ff1e5c88292b24afd436ba6740af
lib32disabled=yes
-
-pre_configure() {
- autoreconf -fi
-}
From c5456642e4e3dbfb0fefa0a0a2c3b3366ac6ef54 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:24:44 +0200
Subject: [PATCH 42/61] 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 fa21b95b7434..413a971ed87e 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
-revision=2
-build_style=gnu-configure
+version=3.46.0
+revision=1
+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 rest0-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 libxslt"
+makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel
+ rest-devel gcr-devel mit-krb5-devel libsoup3-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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"
+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=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
build_options="gir"
build_options_default="gir"
From 122e75d251bbae04d1bb294f862b636e99dd5077 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:44:30 +0200
Subject: [PATCH 43/61] gnome-console: update to 43.0.
console nautilus plugin is now included in nautilus
---
srcpkgs/gnome-console/template | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
index 7e09b6cc9945..c041023d594b 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 <oreo6391@gmail.org>"
+maintainer="oreo639 <oreo6391@gmail.com>"
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 fb80313b69b5b61e9d13f2e9211de051b6972f44 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:37:19 +0200
Subject: [PATCH 44/61] libgweather: update to 4.2.0.
---
srcpkgs/libgweather/patches/cross.patch | 21 ++++++++
.../patches/fix-cross-introspection.patch | 14 -----
...metar-test-dont-use-known-duplicates.patch | 51 -------------------
srcpkgs/libgweather/template | 15 +++---
4 files changed, 29 insertions(+), 72 deletions(-)
create mode 100644 srcpkgs/libgweather/patches/cross.patch
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/cross.patch b/srcpkgs/libgweather/patches/cross.patch
new file mode 100644
index 000000000000..fdd5ff957520
--- /dev/null
+++ b/srcpkgs/libgweather/patches/cross.patch
@@ -0,0 +1,21 @@
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,7 @@ py = import('python').find_installation('python3', modules: ['gi'])
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
+
+ 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()
+ build_docs = get_option('gtk_doc') and build_gir
+
+ schemas_srcdir = meson.project_source_root() / 'schemas'
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -1,6 +1,7 @@
+ if build_docs
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch
deleted file mode 100644
index fbec0c3317fa..000000000000
--- 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 5646cd24cc21..000000000000
--- 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 <pierre.labastie@neuf.fr>
-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 b4fcfcb12563..fdcdffd1c355 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=3
+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)
- $(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
+hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel json-glib-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
+changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
-checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
+checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
From 078bc52e0659feda3c55ae9cca11de5013711952 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:06 +0200
Subject: [PATCH 45/61] geary: update to 43.0.
---
srcpkgs/geary/patches/vala-0.56a.patch | 25 ----------------
srcpkgs/geary/patches/vala-0.56b.patch | 40 --------------------------
srcpkgs/geary/template | 15 +++++-----
3 files changed, 8 insertions(+), 72 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 df2c3902db14..000000000000
--- 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 <ricotz@ubuntu.com>
-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<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> 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 2d071a133751..000000000000
--- 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 <ricotz@ubuntu.com>
-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 e1360898bfdc..4be416e38a48 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
+ gobject-introspection vala glib-devel gettext gtk-update-icon-cache"
+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 <cam@nohom.org>"
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 1253d302e2adadbece8b932f31ba446f363fb1b1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 14:43:12 +0200
Subject: [PATCH 46/61] gnome-initial-setup: update to 43.2.
---
srcpkgs/gnome-initial-setup/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index d8d472d4bfd9..b6adfa30f8fb 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,21 +1,21 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=42.2
-revision=2
+version=43.2
+revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
+ rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libadwaita-devel geocode-glib-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
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}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
+checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
From 8e3a5b36ac36e2f1c03af084003fdf06e4002d29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 18:40:02 +0200
Subject: [PATCH 47/61] 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 d49a8ec8b200..8fbcaeb4fed8 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=2
+revision=3
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 rest0-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 88c48c5a0af8135c421b06f36d72060eedb97769 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 10:57:02 +0100
Subject: [PATCH 48/61] gsettings-desktop-schemas: update to 43.0.
---
srcpkgs/gsettings-desktop-schemas/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 1779e26f56df..636b7a5cabf6 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
@@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext pkg-config glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2
+distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
+checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
# Package build options
build_options="gir"
From 8dfd9a0ba343389064958f3514fe54cf6f4251ab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 19:05:46 +0100
Subject: [PATCH 49/61] GPaste: update to 43.0.
---
srcpkgs/GPaste/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 17f2e3122ba5..1dc85f8f1344 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,23 +1,25 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=42.1
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="$(vopt_bool gnome_shell gnome-shell)
-Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings
-Dsystemd-user-unit-dir=/usr/lib/systemd"
-hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection"
+hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection
+ desktop-file-utils"
makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel
libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel
- $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel"
short_desc="Clipboard management system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.imagination-land.org/tags/GPaste.html"
-changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS"
+changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9
+checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
@@ -28,7 +30,7 @@ post_install() {
}
GPaste-devel_package() {
- depends="libgpaste-${version}_${revision}"
+ depends="libgpaste>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 962dca52b0fe7fa4c38f7328922514a612bac20d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Nov 2022 21:08:05 +0100
Subject: [PATCH 50/61] gnome-terminal: update to 3.46.7.
---
srcpkgs/gnome-terminal/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index f12986cc45af..6e6d4241be04 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-terminal'
pkgname=gnome-terminal
-version=3.44.1
+version=3.46.7
revision=1
build_style=meson
-configure_args="-Dnautilus_extension=true -Db_ndebug=false"
-hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt"
+configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false"
+hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt"
makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel
nautilus-devel vte3-devel"
depends="desktop-file-utils"
@@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GFDL-1.3-only"
homepage="https://wiki.gnome.org/Apps/Terminal"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b
+distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
+checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad
lib32disabled=yes
if [ "$CROSS_BUILD" ]; then
@@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - nautilus integration"
pkg_install() {
- vmove usr/lib/nautilus/extensions-3.0
+ vmove usr/lib/nautilus/extensions-4
}
}
From 858e2cddede55ce5185279945dbad8d3f9382c50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:59:18 +0100
Subject: [PATCH 51/61] gnome-user-docs: update to 43.0.
---
srcpkgs/gnome-user-docs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 773c9913d74f..2f03d3bdb057 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,15 +1,15 @@
# Template file for 'gnome-user-docs'
pkgname=gnome-user-docs
-version=42.0
+version=43.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
makedepends="yelp"
depends="yelp"
short_desc="User documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905
+changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz"
+checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee
From 51139e2e6b1734d89d20a884120394ffa4b56837 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:37:00 +0100
Subject: [PATCH 52/61] gnome-font-viewer: update to 43.0.
---
srcpkgs/gnome-font-viewer/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index bdc99f9a8d8c..73344ff10aa6 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-font-viewer'
pkgname=gnome-font-viewer
-version=42.0
+version=43.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel
gnome-desktop-devel harfbuzz-devel libadwaita-devel"
depends="desktop-file-utils"
short_desc="Font viewer for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc
+changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz"
+checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9
From b422fe2a866c44e9fc983943209ca6f383742985 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:53:07 +0100
Subject: [PATCH 53/61] orca: update to 43.0.
---
srcpkgs/orca/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template
index ad4d14ce838e..2b235df6f70b 100644
--- a/srcpkgs/orca/template
+++ b/srcpkgs/orca/template
@@ -1,7 +1,7 @@
# Template file for 'orca'
pkgname=orca
-version=42.3
-revision=2
+version=43.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext itstool pkg-config"
makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel"
@@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Orca"
-changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724
+#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz"
+checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-gobject-devel"
From 24a7502bbd36bd6199f582deba400462be63fb55 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:57:53 +0100
Subject: [PATCH 54/61] freerdp: update to 2.9.0.
---
srcpkgs/freerdp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 62b4f17634ef..53e67690f863 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.7.0
-revision=2
+version=2.9.0
+revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
-DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON
@@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://www.freerdp.com/"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415
+checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From d75dbcd37d4fb777ca9be19fbfba47d1891b55a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:56:10 +0100
Subject: [PATCH 55/61] gnome-remote-desktop: update to 43.2.
---
.../patches/remove-systemd-dep.patch | 26 -------------------
srcpkgs/gnome-remote-desktop/template | 10 +++----
2 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
deleted file mode 100644
index 129a59dcfa7b..000000000000
--- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68')
- gio_dep = dependency('gio-2.0')
- gio_unix_dep = dependency('gio-unix-2.0')
- pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0')
--systemd_dep = dependency('systemd', required: get_option('systemd'))
- libsecret_dep = dependency('libsecret-1')
- libnotify_dep = dependency('libnotify')
- epoxy_dep = dependency('epoxy')
-@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson',
- configinc = include_directories('.')
-
- servicedir = get_option('systemd_user_unit_dir')
--if systemd_dep.found()
-- if servicedir == ''
-- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
-- endif
--
-- if servicedir == ''
-- error('Couldn\'t determine systemd user unit service directory')
-- endif
--endif
-
- top_srcdir = meson.current_source_dir()
- builddir = meson.current_build_dir()
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index b826155a3ab7..4a7278c35ab7 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=42.3
+version=43.2
revision=1
build_style=meson
-configure_args="-Drdp=true -Dvnc=true
+configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
-Dsystemd_user_unit_dir=/var/lib/systemd/user"
-hostmakedepends="pkg-config gettext glib-devel"
+hostmakedepends="pkg-config gettext glib-devel asciidoc"
makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel
freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel
- libgudev-devel nv-codec-headers"
+ libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel"
short_desc="GNOME remote desktop server"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"
distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz"
-checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642
+checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
make_check=no # xvfb failed to start
From 59769165941c56f0f145b921c8c8c3dc67c8eb21 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:06:56 +0100
Subject: [PATCH 56/61] devhelp: update to 43.0.
---
srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------
srcpkgs/devhelp/template | 13 ++++---
2 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch
diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
deleted file mode 100644
index dfea339688e3..000000000000
--- a/srcpkgs/devhelp/patches/meson-0.61.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
-- appdata,
- input: configure_file(
- input: 'org.gnome.Devhelp.appdata.xml.in.in',
- output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
-- desktop,
- type: 'desktop',
- input: configure_file(
- input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
-
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
-- plugin_info_file,
- type: 'desktop',
- input: plugin_info_file + '.desktop.in',
- output: plugin_info_file,
---
-GitLab
-
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 9a9693598317..7c641946341a 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
-version=41.2
+version=43.0
revision=1
build_helper="gir"
build_style=meson
-hostmakedepends="gettext glib-devel itstool pkg-config"
-makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
+hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
+makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
+changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
+checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
- depends="gsettings-desktop-schemas-devel webkit2gtk-devel
+ depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include
From b31eddc3ae40d6fd20d3e126c18f2fd476c86c9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 20:29:57 +0100
Subject: [PATCH 57/61] sysprof: update to 3.46.0.
---
common/shlibs | 2 +-
srcpkgs/sysprof/template | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2cb86c210f0a..b8c2ae161e9c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3115,7 +3115,7 @@ libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
-libsysprof-ui-4.so sysprof-3.37.90_1
+libsysprof-ui-5.so sysprof-3.46.0_1
libvala-0.56.so.0 libvala-0.56.0_1
libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
libvalaccodegen.so libvala-0.44.0_1
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index 4d644691bee4..0a40abfb42b7 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -1,20 +1,20 @@
# Template file for 'sysprof'
pkgname=sysprof
-reverts="3.46.0_1"
-version=3.44.0
+version=3.46.0
revision=2
build_style=meson
-configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd"
-hostmakedepends="gettext pkg-config itstool glib-devel"
-makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel
- json-glib-devel libunwind-devel"
+configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd"
+hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils
+ gtk-update-icon-cache"
+makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel
+ json-glib-devel libunwind-devel libadwaita-devel"
short_desc="System-wide profiler for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/sysprof"
changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b
+distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz"
+checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071
# for ITS rules
if [ "$CROSS_BUILD" ]; then
From 2e18fc4716fadd2195ddf59a6bb48416704477e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 21:34:31 +0100
Subject: [PATCH 58/61] gnome-builder: update to 43.4.
---
srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 726853f194fa..b89928e1c7e4 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,34 +1,32 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=42.1
-revision=3
+version=43.4
+revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
- gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
- libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
- libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection
- python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel
- libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel"
-depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
-checkdepends="xvfb-run"
+ llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+makedepends="cairo-devel clang enchant2-devel flatpak-devel
+ gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
+ libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
+ python3-gobject-devel sysprof-devel libportal-gtk4-devel
+ libsoup3-devel cmark-devel pango-devel libportal-devel
+ libpanel-devel d-spy-devel editorconfig-devel"
+depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
+checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
+checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LIBS="-lexecinfo"
fi
-
-do_check() {
- xvfb-run ninja -C build test
-}
From bdfb0f9b477dd4fadc5a9262900c9efc2dcf6480 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 15 Dec 2022 16:57:49 +0100
Subject: [PATCH 59/61] zenity: update to 3.43.0.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e5513bcbedf8..e12e09c0afb4 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.42.1
+version=3.43.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
hostmakedepends="gettext itstool perl pkg-config"
-makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)"
+makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)"
short_desc="Display GNOME dialogs from the command line"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://help.gnome.org/users/zenity/"
changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c
+distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
+checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
build_options="webkit"
build_options_default="webkit"
From 9accc653398b1221b5193a8838670f49b7dc41f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 18:46:18 +0100
Subject: [PATCH 60/61] gnome-core: update to 43.0.
---
srcpkgs/gnome-core/template | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 3c749515351e..a281f5705318 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=42.0
-revision=4
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-only, LGPL-2.0-only"
homepage="https://www.gnome.org"
@@ -14,24 +14,24 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.${version}
- folks>=0.15.4
+ evolution-data-server>=3.46.0
+ folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib-libsoup2>=3.26.2
- gjs>=1.72.0
- glib>=2.72.0
- glib-networking>=2.72.0
+ geocode-glib>=3.26.4
+ gjs>=1.74.0
+ glib>=2.74.0
+ glib-networking>=2.74.0
gmime>=3.2.7
gnome-backgrounds>=${version}
- gnome-bluetooth>=${version}
+ gnome-bluetooth>=42.4
gnome-color-manager>=3.36.0
gnome-control-center>=${version}
gnome-desktop>=${version}
gnome-initial-setup>=${version}
- gnome-keyring>=40.0
- gnome-online-accounts>=3.44.0
+ gnome-keyring>=42.0
+ gnome-online-accounts>=3.46.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -43,8 +43,8 @@ depends="
gvfs>=1.50.0
mutter>=${version}
nautilus>=${version}
- sushi>=41.0
- tracker>=3.3.0
- yelp>=${version}
+ sushi>=43.0
+ tracker>=3.4.0
+ yelp>=42
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 77545befea09c993f7c62403f3de11262ee069c7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 11 Dec 2022 19:14:22 +0100
Subject: [PATCH 61/61] gnome: update to 43.0.
* replace gnome-terminal with gnome-console
---
srcpkgs/gnome/template | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 72507f88501e..974196feb393 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=42.0
-revision=5
+version=43.0
+revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -11,10 +11,10 @@ homepage="https://www.gnome.org"
depends="
gnome-core>=${version}
baobab>=${version}
- cheese>=41.1
+ cheese>=${version}
eog>=${version}
evince>=${version}
- file-roller>=3.${version}
+ file-roller>=${version}
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,26 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-remote-desktop>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
- gspell>=1.10.0
+ gspell>=1.11.0
mousetweaks>=3.32.0
orca>=${version}
- phodav>=2.5
- simple-scan>=${version}
+ phodav>=3.0
+ simple-scan>=42
totem>=${version}"
_apps_depends="
Endeavour>=${version}
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=41.2
+ devhelp>=${version}
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,13 +58,13 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=${version}
+ gnome-music>=42
gnome-nettool>=${version}
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=${version}
- gnome-system-monitor>=${version}
- gnome-terminal>=3.${version}
+ gnome-system-monitor>=42
+ gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
polari>=3.38.0
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR REVIEW] [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (45 preceding siblings ...)
2023-01-02 8:07 ` paper42
@ 2023-01-02 10:51 ` paper42
2023-01-02 10:52 ` [PR PATCH] [Closed]: " paper42
` (10 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-02 10:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#discussion_r1059959736
Comment:
thanks, done in 14a20ebadfe5e4db3c7f913c07ce20f44f3b1b37
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (47 preceding siblings ...)
2023-01-02 10:52 ` [PR PATCH] [Closed]: " paper42
@ 2023-01-02 10:52 ` paper42
2023-01-02 14:03 ` motorto
` (8 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-02 10:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1368835257
Comment:
merged
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (46 preceding siblings ...)
2023-01-02 10:51 ` [PR REVIEW] " paper42
@ 2023-01-02 10:52 ` paper42
2023-01-02 10:52 ` paper42
` (9 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-02 10:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]
There's a closed pull request on the void-packages repository
[WIP]: GNOME 43
https://github.com/void-linux/void-packages/pull/39513
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~very WIP, many shlibs are not resolved, many packages need to be revbumped, many packages updated, many commits have to be improved, etc. Feel free to test this PR, but expect to have to fix a few things at this point.~~
depends on:
- [x] https://github.com/void-linux/void-packages/pull/39488
- [x] https://github.com/void-linux/void-packages/pull/39498
- [x] https://github.com/void-linux/void-packages/pull/39515
- [x] https://github.com/void-linux/void-packages/pull/39514
- [x] https://github.com/void-linux/void-packages/pull/40701
- [x] https://github.com/void-linux/void-packages/pull/40702
- [x] https://github.com/void-linux/void-packages/pull/41019
- [x] https://github.com/void-linux/void-packages/pull/41020
- [ ] https://github.com/void-linux/void-packages/pull/41021
- [x] https://github.com/void-linux/void-packages/pull/41022
- [x] https://github.com/void-linux/void-packages/pull/41023
- [x] https://github.com/void-linux/void-packages/pull/41024
- [x] https://github.com/void-linux/void-packages/pull/41026
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (48 preceding siblings ...)
2023-01-02 10:52 ` paper42
@ 2023-01-02 14:03 ` motorto
2023-01-03 21:46 ` thegarlynch
` (7 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: motorto @ 2023-01-02 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New comment by motorto on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1368972813
Comment:
Thanks for the hard work @paper42 and everyone else involved (@oreo639 , and all the others) !!!
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (49 preceding siblings ...)
2023-01-02 14:03 ` motorto
@ 2023-01-03 21:46 ` thegarlynch
2023-01-04 14:51 ` paper42
` (6 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: thegarlynch @ 2023-01-03 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by thegarlynch on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1370256439
Comment:
Do we disabled device security settings like ubuntu too ?
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (50 preceding siblings ...)
2023-01-03 21:46 ` thegarlynch
@ 2023-01-04 14:51 ` paper42
2023-01-09 4:46 ` thegarlynch
` (5 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: paper42 @ 2023-01-04 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1371026373
Comment:
> Do we disabled device security settings like ubuntu too ?
It was not disabled.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (51 preceding siblings ...)
2023-01-04 14:51 ` paper42
@ 2023-01-09 4:46 ` thegarlynch
2023-01-09 4:46 ` thegarlynch
` (4 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: thegarlynch @ 2023-01-09 4:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 418 bytes --]
New comment by thegarlynch on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1375102835
Comment:
seems like do to chassis system-d hostname system. it become invisible for void ?
https://www.reddit.com/r/gnome/comments/xc2ryq/gnome_43_device_security_page_missing/
https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/0245329949957e7f7ab56f240faaf336408ced86
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (52 preceding siblings ...)
2023-01-09 4:46 ` thegarlynch
@ 2023-01-09 4:46 ` thegarlynch
2023-01-09 4:47 ` thegarlynch
` (3 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: thegarlynch @ 2023-01-09 4:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
New comment by thegarlynch on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1375102835
Comment:
seems like due to chassis system-d hostname system. it become invisible for void ?
https://www.reddit.com/r/gnome/comments/xc2ryq/gnome_43_device_security_page_missing/
https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/0245329949957e7f7ab56f240faaf336408ced86
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (53 preceding siblings ...)
2023-01-09 4:46 ` thegarlynch
@ 2023-01-09 4:47 ` thegarlynch
2023-01-10 17:57 ` lane-brain
` (2 subsequent siblings)
57 siblings, 0 replies; 59+ messages in thread
From: thegarlynch @ 2023-01-09 4:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
New comment by thegarlynch on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1375102835
Comment:
seems like due to chassis system-d hostname system. it become invisible for void ?
https://www.reddit.com/r/gnome/comments/xc2ryq/gnome_43_device_security_page_missing/
https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/0245329949957e7f7ab56f240faaf336408ced86
is it appeared to you ?
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (54 preceding siblings ...)
2023-01-09 4:47 ` thegarlynch
@ 2023-01-10 17:57 ` lane-brain
2023-01-10 18:00 ` JamiKettunen
2023-01-10 18:09 ` lane-brain
57 siblings, 0 replies; 59+ messages in thread
From: lane-brain @ 2023-01-10 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1838 bytes --]
New comment by lane-brain on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1377642623
Comment:
I think this update has plunged my system into some shlib hell, just wanted to note it for anyone else having the same issue
```
[*] Updating repository `https://repo-default.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata' ...
gnome-calendar-42.2_2: broken, unresolvable shlib `libecal-2.0.so.1'
gnome-shell-42.4_1: broken, unresolvable shlib `libecal-2.0.so.1'
gnome-calendar-42.2_2: broken, unresolvable shlib `libedataserver-1.2.so.26'
gnome-shell-42.4_1: broken, unresolvable shlib `libedataserver-1.2.so.26'
gnome-control-center-42.3_1: broken, unresolvable shlib `libgnome-bg-4.so.1'
xdg-desktop-portal-gnome-43.1_1: broken, unresolvable shlib `libgnome-bg-4.so.1'
gnome-session-42.0_2: broken, unresolvable shlib `libgnome-desktop-3.so.19'
gnome-settings-daemon-42.2_2: broken, unresolvable shlib `libgnome-desktop-3.so.19'
gnome-shell-42.4_1: broken, unresolvable shlib `libgnome-desktop-3.so.19'
mutter-42.4_1: broken, unresolvable shlib `libgnome-desktop-3.so.19'
gnome-clocks-42.0_2: broken, unresolvable shlib `libgnome-desktop-4.so.1'
gnome-control-center-42.3_1: broken, unresolvable shlib `libgnome-desktop-4.so.1'
gnome-initial-setup-42.2_2: broken, unresolvable shlib `libgnome-desktop-4.so.1'
xdg-desktop-portal-gnome-43.1_1: broken, unresolvable shlib `libgnome-desktop-4.so.1'
gnome-control-center-42.3_1: broken, unresolvable shlib `libgnome-rr-4.so.1'
```
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (55 preceding siblings ...)
2023-01-10 17:57 ` lane-brain
@ 2023-01-10 18:00 ` JamiKettunen
2023-01-10 18:09 ` lane-brain
57 siblings, 0 replies; 59+ messages in thread
From: JamiKettunen @ 2023-01-10 18:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1377645685
Comment:
@lane-brain what command exactly did you try to run, `xbps-install -Su` or?
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [WIP]: GNOME 43
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
` (56 preceding siblings ...)
2023-01-10 18:00 ` JamiKettunen
@ 2023-01-10 18:09 ` lane-brain
57 siblings, 0 replies; 59+ messages in thread
From: lane-brain @ 2023-01-10 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
New comment by lane-brain on void-packages repository
https://github.com/void-linux/void-packages/pull/39513#issuecomment-1377656486
Comment:
> @lane-brain what command exactly did you try to run, `xbps-install -Su` or?
I had always assumed that `xi -u` was equivalent to `xbps-install -Su`, but after running the normal command I was able to update my packages. Thanks.
^ permalink raw reply [flat|nested] 59+ messages in thread
end of thread, other threads:[~2023-01-10 18:09 UTC | newest]
Thread overview: 59+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-28 21:39 [PR PATCH] [WIP]: GNOME 43 paper42
2022-09-28 22:10 ` [PR PATCH] [Updated] " paper42
2022-09-28 22:47 ` paper42
2022-09-28 22:57 ` [PR REVIEW] " oreo639
2022-09-28 22:57 ` oreo639
2022-09-28 23:15 ` paper42
2022-09-28 23:29 ` oreo639
2022-09-29 1:41 ` oreo639
2022-09-29 15:48 ` [PR PATCH] [Updated] " paper42
2022-09-29 15:48 ` [PR REVIEW] " paper42
2022-09-29 15:48 ` paper42
2022-09-30 20:17 ` [PR PATCH] [Updated] " paper42
2022-10-12 10:04 ` paper42
2022-10-26 19:06 ` paper42
2022-11-03 21:38 ` [PR REVIEW] " oreo639
2022-11-03 21:38 ` oreo639
2022-11-22 19:17 ` oreo639
2022-11-22 19:19 ` oreo639
2022-11-22 21:11 ` [PR PATCH] [Updated] " paper42
2022-11-22 21:54 ` paper42
2022-11-23 1:38 ` [PR REVIEW] " oreo639
2022-11-23 1:39 ` oreo639
2022-11-23 1:59 ` oreo639
2022-11-23 2:00 ` oreo639
2022-11-23 2:01 ` oreo639
2022-11-23 6:04 ` oreo639
2022-11-23 6:04 ` oreo639
2022-11-23 17:39 ` oreo639
2022-11-23 20:08 ` [PR PATCH] [Updated] " paper42
2022-12-02 7:27 ` oreo639
2022-12-02 7:27 ` oreo639
2022-12-09 17:32 ` [PR PATCH] [Updated] " paper42
2022-12-11 20:53 ` paper42
2022-12-11 21:00 ` paper42
2022-12-11 21:53 ` paper42
2022-12-13 20:00 ` paper42
2022-12-15 16:39 ` paper42
2022-12-15 17:09 ` paper42
2022-12-15 19:48 ` paper42
2022-12-15 20:13 ` paper42
2022-12-15 20:54 ` paper42
2023-01-01 20:26 ` paper42
2023-01-01 21:32 ` paper42
2023-01-01 22:29 ` paper42
2023-01-01 23:17 ` [PR REVIEW] " oreo639
2023-01-02 8:03 ` [PR PATCH] [Updated] " paper42
2023-01-02 8:07 ` paper42
2023-01-02 10:51 ` [PR REVIEW] " paper42
2023-01-02 10:52 ` [PR PATCH] [Closed]: " paper42
2023-01-02 10:52 ` paper42
2023-01-02 14:03 ` motorto
2023-01-03 21:46 ` thegarlynch
2023-01-04 14:51 ` paper42
2023-01-09 4:46 ` thegarlynch
2023-01-09 4:46 ` thegarlynch
2023-01-09 4:47 ` thegarlynch
2023-01-10 17:57 ` lane-brain
2023-01-10 18:00 ` JamiKettunen
2023-01-10 18:09 ` lane-brain
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).