* [PR PATCH] [RFC] GNOME 44
@ 2023-03-24 0:53 oreo639
2023-03-24 0:55 ` [PR PATCH] [Updated] " oreo639
` (25 more replies)
0 siblings, 26 replies; 27+ messages in thread
From: oreo639 @ 2023-03-24 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
This is a WIP tracking PR for GNOME 44.
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
Related:
+ https://github.com/void-linux/void-packages/pull/42935
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 80387 bytes --]
From 2d64e3446a291a9fcb723563ef55d951b75b49f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/29] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 3acfe3a95f95a8ad21bc23c838cb50583eaedd1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/29] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 3806f174b8e7da52361fb48fb89bd059a40c420b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/29] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 0082879fb95d242f5f9615d27431078b13f2c145 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/29] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 290f283f44bc8d4d1546f12deab693288143dfba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/29] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From 6950d76013d5d9e9cf1746a0cec6363414367fc8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/29] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From fdd8494dc9767cd4fec1fd9ac87c5274f8b371bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/29] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 2d2fc41ec8f238e425a3ae6d31dff524a2a7e8f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/29] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 5a4b9e308583a9bb603058e5a6b9d97ad06eff42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/29] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From 8639c3fe81293b45550360ddfa20bc07aa2accd6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/29] gnome-desktop: update to 40.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From ccf4d05a3d6accaf2cb0667459313216ec564f32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/29] gnome-session: update to 40.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From d4c824a67c73ee7d55f88830596dc23ae787a4c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/29] mutter: update to 40.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 4f717337c36f1ec8f8ccf370fa90052a608e9f2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/29] gnome-shell: update to 40.0.
---
srcpkgs/gnome-shell/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From c9010dcea3b31ae398a5f649a23fdba9507fa8d9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/29] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From 8a58dcacc278a74c9cbd2cfb5a0f3086e4102516 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/29] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From ae6b087a883c34aa79cb1fc0edb6e21750ee0710 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/29] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From 7c7e5189129fb196b129219e185f337cf21ddb86 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/29] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 402169684ad450edfc170e1f360aad35778dec16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/29] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From fa099bc7009a7208b20d63f78f23a2176b04f8e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/29] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From fd8b6269f9b11724e383a117c7b5c5feeaca3d09 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/29] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..96fe282d0195 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From c124c5144ef060e2b75a094bbee5d7c8b3cb71d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/29] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 9ecc92ae02637035fdd7a084ce38089e26cbf617 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 22/29] tracker: update to 3.5.0.
---
srcpkgs/tracker/patches/disable-cli-test.patch | 14 +++++++-------
srcpkgs/tracker/template | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
fails to create database and then times out at creating a http server
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
- 'collation',
- 'ontology-changes',
- 'ontology-rollback',
-- 'cli',
- 'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
+ functional_tests = [
+- 'test_cli',
+ 'test_coalesce',
+ 'test_collation',
+ 'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..16f14211f4b5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.4.2
+version=3.5.0
revision=1
build_style=meson
build_helper="gir"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From cbae9e6d6ce3b10f242627cbcdc02aa583b3cc0c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 23/29] tracker-miners: update to 3.5.0.
---
srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
srcpkgs/tracker-miners/template | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
-
- libtracker_miner = library(
- 'tracker-miner-' + tracker_api_version,
-- miner_enums[0], miner_enums[1], miner_sources,
-+ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
- c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
---
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
From 4252db900ba390fae1051c06dde8c4398f62a8c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 24/29] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 4f0ea1e9b00a..4fdb2688117f 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=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -13,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 3c83ff4a86ddb2de47baaa932f96f51c40df03cd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 25/29] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From ac3090665049ea201b9f4e9e8712826f07cefee2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 26/29] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From eef6dfd39e332f35bd181760e97b13c78641775d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 27/29] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 85bea39a4c77f6aedefadd53a0d542baea9959b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 28/29] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From 0f4fc7e0a030120f1903f237e02bb08c3431c280 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 29/29] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
@ 2023-03-24 0:55 ` oreo639
2023-03-24 10:41 ` oreo639
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-24 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This is a WIP tracking PR for GNOME 44.
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 80387 bytes --]
From 2d64e3446a291a9fcb723563ef55d951b75b49f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/29] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 3acfe3a95f95a8ad21bc23c838cb50583eaedd1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/29] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 3806f174b8e7da52361fb48fb89bd059a40c420b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/29] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 0082879fb95d242f5f9615d27431078b13f2c145 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/29] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 290f283f44bc8d4d1546f12deab693288143dfba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/29] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From 6950d76013d5d9e9cf1746a0cec6363414367fc8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/29] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From fdd8494dc9767cd4fec1fd9ac87c5274f8b371bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/29] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 2d2fc41ec8f238e425a3ae6d31dff524a2a7e8f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/29] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 5a4b9e308583a9bb603058e5a6b9d97ad06eff42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/29] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From 8639c3fe81293b45550360ddfa20bc07aa2accd6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/29] gnome-desktop: update to 40.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From ccf4d05a3d6accaf2cb0667459313216ec564f32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/29] gnome-session: update to 40.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From d4c824a67c73ee7d55f88830596dc23ae787a4c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/29] mutter: update to 40.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 4f717337c36f1ec8f8ccf370fa90052a608e9f2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/29] gnome-shell: update to 40.0.
---
srcpkgs/gnome-shell/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From c9010dcea3b31ae398a5f649a23fdba9507fa8d9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/29] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From 8a58dcacc278a74c9cbd2cfb5a0f3086e4102516 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/29] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From ae6b087a883c34aa79cb1fc0edb6e21750ee0710 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/29] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From 7c7e5189129fb196b129219e185f337cf21ddb86 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/29] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 402169684ad450edfc170e1f360aad35778dec16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/29] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From fa099bc7009a7208b20d63f78f23a2176b04f8e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/29] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From fd8b6269f9b11724e383a117c7b5c5feeaca3d09 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/29] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..96fe282d0195 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From c124c5144ef060e2b75a094bbee5d7c8b3cb71d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/29] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 9ecc92ae02637035fdd7a084ce38089e26cbf617 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 22/29] tracker: update to 3.5.0.
---
srcpkgs/tracker/patches/disable-cli-test.patch | 14 +++++++-------
srcpkgs/tracker/template | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
fails to create database and then times out at creating a http server
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
- 'collation',
- 'ontology-changes',
- 'ontology-rollback',
-- 'cli',
- 'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
+ functional_tests = [
+- 'test_cli',
+ 'test_coalesce',
+ 'test_collation',
+ 'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..16f14211f4b5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.4.2
+version=3.5.0
revision=1
build_style=meson
build_helper="gir"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From cbae9e6d6ce3b10f242627cbcdc02aa583b3cc0c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 23/29] tracker-miners: update to 3.5.0.
---
srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
srcpkgs/tracker-miners/template | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
-
- libtracker_miner = library(
- 'tracker-miner-' + tracker_api_version,
-- miner_enums[0], miner_enums[1], miner_sources,
-+ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
- c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
---
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
From 4252db900ba390fae1051c06dde8c4398f62a8c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 24/29] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 4f0ea1e9b00a..4fdb2688117f 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=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -13,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 3c83ff4a86ddb2de47baaa932f96f51c40df03cd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 25/29] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From ac3090665049ea201b9f4e9e8712826f07cefee2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 26/29] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From eef6dfd39e332f35bd181760e97b13c78641775d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 27/29] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 85bea39a4c77f6aedefadd53a0d542baea9959b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 28/29] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From 896ddca103d7b19e1a1a8039d7af74769ba1be71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 29/29] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
2023-03-24 0:55 ` [PR PATCH] [Updated] " oreo639
@ 2023-03-24 10:41 ` oreo639
2023-03-26 9:45 ` [PR REVIEW] " paper42
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-24 10:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This is a WIP tracking PR for GNOME 44.
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42966
+ https://github.com/void-linux/void-packages/pull/42967
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 81499 bytes --]
From 2d64e3446a291a9fcb723563ef55d951b75b49f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/29] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 3acfe3a95f95a8ad21bc23c838cb50583eaedd1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/29] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 3806f174b8e7da52361fb48fb89bd059a40c420b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/29] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 0082879fb95d242f5f9615d27431078b13f2c145 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/29] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 290f283f44bc8d4d1546f12deab693288143dfba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/29] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From 6950d76013d5d9e9cf1746a0cec6363414367fc8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/29] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From fdd8494dc9767cd4fec1fd9ac87c5274f8b371bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/29] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 2d2fc41ec8f238e425a3ae6d31dff524a2a7e8f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/29] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 5a4b9e308583a9bb603058e5a6b9d97ad06eff42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/29] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From 8639c3fe81293b45550360ddfa20bc07aa2accd6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/29] gnome-desktop: update to 40.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From ccf4d05a3d6accaf2cb0667459313216ec564f32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/29] gnome-session: update to 40.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From d4c824a67c73ee7d55f88830596dc23ae787a4c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/29] mutter: update to 40.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From f1d569f521bb973f2bd9d3b68ef6cce48635808e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/29] gnome-shell: update to 40.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From 3f1ac8bfad137d8d01a2c9c81b7197f446554884 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/29] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From f5aefa0b9c0ead30848fa39b9b8914eab9cbecf6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/29] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From b2df948c2338388f9b98f59bcdde597f1233fd6b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/29] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From fa51f0a7f0ef30c759c07c36fa95b9d7917c8bfd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/29] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From ffd3d1c91ecfae641970477952ffc2e7ffaf01dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/29] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From d74f6056530f334b8753de2644cafa4effc791d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/29] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From b0f32460735647bc7dbc6d0c78392493675a6e6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/29] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..96fe282d0195 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From f7f095a0fc658ae720429a884e4d0d6148a76a18 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/29] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 1e1e109c62e022cf15afa07c5084c713f5ae0dfe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 22/29] tracker: update to 3.5.0.
---
srcpkgs/tracker/patches/disable-cli-test.patch | 14 +++++++-------
srcpkgs/tracker/template | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
fails to create database and then times out at creating a http server
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
- 'collation',
- 'ontology-changes',
- 'ontology-rollback',
-- 'cli',
- 'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
+ functional_tests = [
+- 'test_cli',
+ 'test_coalesce',
+ 'test_collation',
+ 'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..16f14211f4b5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.4.2
+version=3.5.0
revision=1
build_style=meson
build_helper="gir"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From fc58ff071a64476023cdf5bce5917be6f1b7590c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 23/29] tracker-miners: update to 3.5.0.
---
srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
srcpkgs/tracker-miners/template | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
-
- libtracker_miner = library(
- 'tracker-miner-' + tracker_api_version,
-- miner_enums[0], miner_enums[1], miner_sources,
-+ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
- c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
---
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
From 127a6b66af8e6b2469099bcf4ae357cd4d5c132b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 24/29] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 4f0ea1e9b00a..4fdb2688117f 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=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -13,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 279c5a9111c2d8fd7559d44bee13395577ef27a8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 25/29] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From d7b329eb4a25da66c5b7e3f5e937d8bd010baf92 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 26/29] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 455f823fe5321f1ddce96e3da0dfd79e9fb0bc50 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 27/29] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 701d4a88b202c85f9d6456c5fd94e500bb64a6df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 28/29] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From d427a343b9c4daee143f569ea5e3661da1e5c016 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 29/29] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
2023-03-24 0:55 ` [PR PATCH] [Updated] " oreo639
2023-03-24 10:41 ` oreo639
@ 2023-03-26 9:45 ` paper42
2023-03-26 9:45 ` paper42
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2023-03-26 9:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42965#discussion_r1148108229
Comment:
the gnome package should also be updated
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (2 preceding siblings ...)
2023-03-26 9:45 ` [PR REVIEW] " paper42
@ 2023-03-26 9:45 ` paper42
2023-03-26 10:39 ` [PR PATCH] [Updated] " oreo639
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2023-03-26 9:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42965#discussion_r1148110661
Comment:
probably a bit useless, but it's a changelog
```suggestion
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
```
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (3 preceding siblings ...)
2023-03-26 9:45 ` paper42
@ 2023-03-26 10:39 ` oreo639
2023-03-26 10:40 ` [PR REVIEW] " oreo639
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-26 10:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1946 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This is a WIP tracking PR for GNOME 44.
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42966
+ https://github.com/void-linux/void-packages/pull/42967
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
Depends on gnome-desktop 44:
+ gnome-clocks
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 81637 bytes --]
From 2d64e3446a291a9fcb723563ef55d951b75b49f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/29] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 3acfe3a95f95a8ad21bc23c838cb50583eaedd1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/29] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 3806f174b8e7da52361fb48fb89bd059a40c420b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/29] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 0082879fb95d242f5f9615d27431078b13f2c145 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/29] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 290f283f44bc8d4d1546f12deab693288143dfba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/29] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From 6950d76013d5d9e9cf1746a0cec6363414367fc8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/29] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From fdd8494dc9767cd4fec1fd9ac87c5274f8b371bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/29] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 2d2fc41ec8f238e425a3ae6d31dff524a2a7e8f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/29] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 5a4b9e308583a9bb603058e5a6b9d97ad06eff42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/29] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From a5b0e50d7f0dda8484d28ae8e2421b6104a25e17 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/29] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 0b03b1b8da629e0ffbf1e1dee4008114f0e42fcc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/29] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 2fbf49dd672fa060acd61e21caa47dcb1fd96d12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/29] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From fef4fa320f19c495b9a114025fe36ca6ed7ad6b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/29] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From e9597b120b7107c5a87770f12cdcdccca8d4ebf3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/29] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From 9f273e976332b9d3601e7984090714d662c47951 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/29] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 2d302b85094726609a4ee1dcd6479a47d36e8e48 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/29] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From 9861a14268c24785fe9945ee5e1b9cc81a1d9285 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/29] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 2c39f7d2de461ae72e354d25299fee2a6c17adc7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/29] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 54f3f319ef83f07e072162e832814625d706b054 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/29] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From f918f6d5a648d9de8274ff682ec5423ffdcda68e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/29] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 7e4f86cf65928c378866f2def618442fbbac3c56 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/29] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 5a5824dd65db00d47c2eff7eaeb640e3d67d309f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:33:41 -0700
Subject: [PATCH 22/29] tracker: update to 3.5.0.
---
srcpkgs/tracker/patches/disable-cli-test.patch | 14 +++++++-------
srcpkgs/tracker/template | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/tracker/patches/disable-cli-test.patch b/srcpkgs/tracker/patches/disable-cli-test.patch
index 7b3f90302925..98db4cbf3fe9 100644
--- a/srcpkgs/tracker/patches/disable-cli-test.patch
+++ b/srcpkgs/tracker/patches/disable-cli-test.patch
@@ -1,11 +1,11 @@
fails to create database and then times out at creating a http server
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
-@@ -35,7 +35,6 @@ functional_tests = [
- 'collation',
- 'ontology-changes',
- 'ontology-rollback',
-- 'cli',
- 'portal',
- ]
+@@ -18,7 +18,6 @@ testconf.set('TEST_TAP_ENABLED', get_opt
+ subdir('config')
+ functional_tests = [
+- 'test_cli',
+ 'test_coalesce',
+ 'test_collation',
+ 'test_concurrent_query',
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index df004713e155..16f14211f4b5 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,6 +1,6 @@
# Template file for 'tracker'
pkgname=tracker
-version=3.4.2
+version=3.5.0
revision=1
build_style=meson
build_helper="gir"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Tracker"
changelog="https://gitlab.gnome.org/GNOME/tracker/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz"
-checksum=4e6df142a4f704878fca98ebb5a224750e5ea546aa2aaabaa726a73540bd1731
+checksum=13294275dbbbad9634b3a8390c08e6f12bebfe84f6ccafb72b27b0c23ba8da2f
make_check_pre="dbus-run-session"
if [ "$CROSS_BUILD" ]; then
From ec8b4c7bcbc5913a91b10935914a00cde0754c58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:34:00 -0700
Subject: [PATCH 23/29] tracker-miners: update to 3.5.0.
---
srcpkgs/tracker-miners/patches/build.patch | 25 ----------------------
srcpkgs/tracker-miners/template | 4 ++--
2 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/tracker-miners/patches/build.patch
diff --git a/srcpkgs/tracker-miners/patches/build.patch b/srcpkgs/tracker-miners/patches/build.patch
deleted file mode 100644
index 9fd55b1d6324..000000000000
--- a/srcpkgs/tracker-miners/patches/build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d709c3b55dc92621d5871fb429a02c78cc4b2d8 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 23:57:32 +0200
-Subject: [PATCH] fix build
-
----
- src/libtracker-miner/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build
-index a226623..9eacee3 100644
---- a/src/libtracker-miner/meson.build
-+++ b/src/libtracker-miner/meson.build
-@@ -40,7 +40,7 @@ endif
-
- libtracker_miner = library(
- 'tracker-miner-' + tracker_api_version,
-- miner_enums[0], miner_enums[1], miner_sources,
-+ miner_enums[0], miner_enums[1], tracker_miners_common_enum_header, miner_sources,
- c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
---
-2.28.0
-
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 3e7966c2b4a9..09af42dbc977 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,6 +1,6 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
-version=3.4.3
+version=3.5.0
revision=1
build_style=meson
build_helper=qemu
@@ -27,7 +27,7 @@ license="GPL-2.0-or-later"
homepage="https://tracker.gnome.org/"
changelog="https://gitlab.gnome.org/GNOME/tracker-miners/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz"
-checksum=8e4f3976472641b648d0f8f20debae1b1629ca5b560b8616e117d29d756fbeeb
+checksum=17966603dc432a98526b490586a48acd7f9f59935f7895dfc51729a46a6901a3
make_check=no # relies on unsupported ops in chroot
tracker3-miners_package() {
From 26dfffecdf01fb7fef7b19df330ffd1a13868127 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 24/29] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index 4f0ea1e9b00a..4fdb2688117f 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=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -13,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 992d448e7c378f96b23003d2da86c3446ceb27e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 25/29] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From a665d313b877b8096444e6ce98427246af0aa033 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 26/29] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From c00adfce546f037707fa30e7a1f590d8859b25b0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 27/29] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 5af4d119f6bcf5b91a669c54f1701b8d1e56d45d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 28/29] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From aa1cdfac20a0c30e2c3137be77096f968485dcf0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 29/29] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR REVIEW] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (4 preceding siblings ...)
2023-03-26 10:39 ` [PR PATCH] [Updated] " oreo639
@ 2023-03-26 10:40 ` oreo639
2023-03-26 20:25 ` [PR PATCH] [Updated] " oreo639
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-26 10:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/42965#discussion_r1148526692
Comment:
Will get to that later.
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (5 preceding siblings ...)
2023-03-26 10:40 ` [PR REVIEW] " oreo639
@ 2023-03-26 20:25 ` oreo639
2023-03-26 21:35 ` oreo639
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-26 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1916 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This is a WIP tracking PR for GNOME 44.
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
Depends on gnome-desktop 44:
+ gnome-clocks
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 77384 bytes --]
From 62f7d65a7b8f9ccc5f66ee720588ee1997c91e31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/27] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From bc0b8d896d773f8b3950c19019448510121016e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/27] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From cf7abb9cd895a6c6fa121eff8680b38f93cb6e32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/27] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From e0ba6ad6ed7f9646f85940dc109df53c51389adb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/27] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 6c02e3e5d3b5b97956bd616e96d786df347f9197 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/27] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From a4449073093902f5d2d41e1c4986527a9ed7957f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/27] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From 77f455c7fa987b512e6e392b3bb784d2b68dc347 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/27] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 366b1460753275036e2a98c7fcf66e6403d71626 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/27] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From f4ae968f86e4c2a472d4433ced1889c48688975d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/27] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From f68f8f95641b79f0d19307582f8c70454945a570 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/27] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From b06421e1a97351267c2e9f113a5ccb7234501044 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/27] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 8b85a23546a574f690ec2b18cd2aba4cc57f9928 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/27] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From a7f750e6e9ed248fdf71c49271513cfc98c00319 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/27] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From f4cfae42aeebce118d1cd724fe5d92a028231ac5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/27] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From e4049923830a59326893eb3a77e6575506a5304e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/27] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From d437d0ec744aa0f666b23e4ef8704b6e74c6c2bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/27] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From e650f1be00c4cc7c034db7fc6cff98668d2abfbf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/27] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From dab446679e25c948ad26ef1471879e9c0f6dc784 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/27] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 8621363873b45cbaa8f71ca2e145e98fef7bbc38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/27] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From cbc6ee2148878eaf97747c6560227f92f1b14828 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/27] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 9401ce7d8044217e473e98eeccc28a652d8bd910 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/27] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 2246920ede1fad6813358874db13eadc8688796a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 22/27] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 6f219ab7471e8e49e8ff3f0711827348839e3b00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 23/27] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From c217b052067bb1c81c06448b37406cf943024b12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 24/27] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From b944829cbb298ad0e9f0e7543273e724510b586a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 25/27] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 1de5846d68e501bd3db58aed672e503106a591d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 26/27] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From 24570292b603a55dcca2a68c2d1955932f1fbb22 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 27/27] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (6 preceding siblings ...)
2023-03-26 20:25 ` [PR PATCH] [Updated] " oreo639
@ 2023-03-26 21:35 ` oreo639
2023-03-26 21:38 ` oreo639
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-26 21:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1974 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This is a WIP tracking PR for GNOME 44.
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
Depends on gnome-desktop 44:
+ gnome-clocks
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 88621 bytes --]
From 62f7d65a7b8f9ccc5f66ee720588ee1997c91e31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/36] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From bc0b8d896d773f8b3950c19019448510121016e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/36] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From cf7abb9cd895a6c6fa121eff8680b38f93cb6e32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/36] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From e0ba6ad6ed7f9646f85940dc109df53c51389adb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/36] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 6c02e3e5d3b5b97956bd616e96d786df347f9197 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/36] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From a4449073093902f5d2d41e1c4986527a9ed7957f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/36] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From 77f455c7fa987b512e6e392b3bb784d2b68dc347 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/36] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 366b1460753275036e2a98c7fcf66e6403d71626 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/36] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From f4ae968f86e4c2a472d4433ced1889c48688975d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/36] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From f68f8f95641b79f0d19307582f8c70454945a570 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/36] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From b06421e1a97351267c2e9f113a5ccb7234501044 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/36] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 8b85a23546a574f690ec2b18cd2aba4cc57f9928 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/36] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From a7f750e6e9ed248fdf71c49271513cfc98c00319 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/36] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From f4cfae42aeebce118d1cd724fe5d92a028231ac5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/36] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From e4049923830a59326893eb3a77e6575506a5304e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/36] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From d437d0ec744aa0f666b23e4ef8704b6e74c6c2bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/36] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From e650f1be00c4cc7c034db7fc6cff98668d2abfbf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/36] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From dab446679e25c948ad26ef1471879e9c0f6dc784 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/36] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 8621363873b45cbaa8f71ca2e145e98fef7bbc38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/36] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From cbc6ee2148878eaf97747c6560227f92f1b14828 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/36] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 9401ce7d8044217e473e98eeccc28a652d8bd910 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/36] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 2246920ede1fad6813358874db13eadc8688796a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 22/36] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 6f219ab7471e8e49e8ff3f0711827348839e3b00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 23/36] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From c217b052067bb1c81c06448b37406cf943024b12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 24/36] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From b944829cbb298ad0e9f0e7543273e724510b586a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 25/36] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 1de5846d68e501bd3db58aed672e503106a591d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 26/36] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From 24570292b603a55dcca2a68c2d1955932f1fbb22 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 27/36] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 90b57e578d768db4116452af4437afe75bd6a8c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:26:29 -0700
Subject: [PATCH 28/36] vala: update to 0.56.5.
---
srcpkgs/vala/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index e1c4078b863b..a724fb0d20bc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
# Template file for 'vala'
pkgname=vala
# Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.56.3
+version=0.56.5
revision=1
build_style=gnu-configure
configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Vala"
changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf
+checksum=2b4292e7301de5fe904e67618116bc4027f60130a242b4a2228a295e6357b48c
shlib_provides="libvalaccodegen.so"
make_check=extended
From c1a72fe795b1ab8481c26287a9cd4cf1b275e677 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:26:37 -0700
Subject: [PATCH 29/36] valadoc: update to 0.56.5.
---
srcpkgs/valadoc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 0343359eb186..cb4e2178f866 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
# Template file for 'valadoc'
pkgname=valadoc
# Should be kept in sync with 'vala' (shared distfiles)
-version=0.56.3
+version=0.56.5
revision=1
build_style=gnu-configure
configure_args="--with-cgraph=yes"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Vala"
changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf
+checksum=2b4292e7301de5fe904e67618116bc4027f60130a242b4a2228a295e6357b48c
pre_configure() {
autoreconf -if
From 5f846cd114457eb06dd2e06f11370c704e6d5e9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:27:00 -0700
Subject: [PATCH 30/36] gnome-clocks: update to 44.0.
---
srcpkgs/gnome-clocks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 1a5183f69658..02a4b3e8cc59 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=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
@@ -17,4 +17,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
-checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
+checksum=17d7a97365cb8f1a023a1d78f7501f3353217fa7577d73afe7d0ca1e3b4f3838
From 4625e3e207e213aa742e6e8394a752d891b4ea39 Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Fri, 24 Mar 2023 20:45:53 -0400
Subject: [PATCH 31/36] freerdp: update to 2.10.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 53e67690f863..25e8aa9677f0 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.9.0
+version=2.10.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -18,9 +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"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/2.10.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
+checksum=88fa59f8e8338d5cb2490d159480564562a5624f3a3572c89fa3070b9626835c
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 671696be7dc1340d26c72d7c83083339029836a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 13:53:08 -0700
Subject: [PATCH 32/36] gnome-remote-desktop: update to 44.0.
---
srcpkgs/gnome-remote-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index 4a7278c35ab7..dd2d70b3f58b 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=43.2
+version=44.0
revision=1
build_style=meson
configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
- -Dsystemd_user_unit_dir=/var/lib/systemd/user"
+ -Dsystemd_user_unit_dir=/usr/lib/systemd/user"
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
@@ -14,5 +14,5 @@ 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=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
+checksum=f7e5088c18fdb08690ae034bf76a1aead59a7dcd17b26e1f7c9975480510a0fd
make_check=no # xvfb failed to start
From d42606c7e69dbc9fd4ac88f34c474847ea3ee93c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 13:59:31 -0700
Subject: [PATCH 33/36] gnome-disk-utility: update to 44.0.
---
srcpkgs/gnome-disk-utility/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index f574ddd1666f..24fcab038e0d 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
@@ -15,5 +15,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
distfiles="${GNOME_SITE}/gnome-disk-utility/${version%.*}/gnome-disk-utility-${version}.tar.xz"
-checksum=7afca9805a6b92db6933dd7efcec4af8386c01bbc1f871e2dae4def7e192a2c5
+checksum=02031097896cdb37d8717a5823f93e3723d4dfce7fdc4002c9dfcb16b7e7a3ef
lib32disabled=yes
From 30164dae179f10961b59ad6f7e6d107503f9d711 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:02:38 -0700
Subject: [PATCH 34/36] gnome-font-viewer: update to 44.0.
---
srcpkgs/gnome-font-viewer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index 73344ff10aa6..ca50c47418bc 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=43.0
+version=44.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
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
+checksum=a1511df30b228cc2ef1175dd9d2b93438ea912e25913404b263cf3d457bb9f97
From e1d4e13ebf5f267ff649bb7c9db0fcfd7319c387 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:09:42 -0700
Subject: [PATCH 35/36] gnote: update to 44.0.
---
srcpkgs/gnote/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index d07480b8f7a3..4be91570b945 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
# Template file for 'gnote'
pkgname=gnote
-version=43.0
+version=44.0
revision=1
build_style=meson
hostmakedepends="pkg-config gettext itstool
@@ -15,5 +15,5 @@ license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gnote"
changelog="https://gitlab.gnome.org/GNOME/gnote/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=2a5bf84490346fbc3e96cc3285ddd19946ae5ce93d465426010c7b6c051fc161
+checksum=dc3bd79268fe99d4ed56679ac076cc9d9aaaf62796138d371cf08815f7e6492d
lib32disabled=yes
From 1a583abe3b5b22980e02f8d41a6a45f5c60eadce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 36/36] gnome: update to 44.0.
---
srcpkgs/gnome/template | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..ce492f4a7441 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -36,13 +36,13 @@ depends="
orca>=${version}
phodav>=3.0
simple-scan>=42
- totem>=${version}"
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (7 preceding siblings ...)
2023-03-26 21:35 ` oreo639
@ 2023-03-26 21:38 ` oreo639
2023-03-26 23:24 ` oreo639
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-26 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2190 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
This is a WIP tracking PR for GNOME 44.
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 90450 bytes --]
From 62f7d65a7b8f9ccc5f66ee720588ee1997c91e31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/37] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From bc0b8d896d773f8b3950c19019448510121016e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/37] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From cf7abb9cd895a6c6fa121eff8680b38f93cb6e32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/37] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From e0ba6ad6ed7f9646f85940dc109df53c51389adb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/37] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 6c02e3e5d3b5b97956bd616e96d786df347f9197 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/37] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From a4449073093902f5d2d41e1c4986527a9ed7957f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/37] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From 77f455c7fa987b512e6e392b3bb784d2b68dc347 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/37] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 366b1460753275036e2a98c7fcf66e6403d71626 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/37] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From f4ae968f86e4c2a472d4433ced1889c48688975d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/37] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From f68f8f95641b79f0d19307582f8c70454945a570 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/37] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From b06421e1a97351267c2e9f113a5ccb7234501044 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/37] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 8b85a23546a574f690ec2b18cd2aba4cc57f9928 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/37] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From a7f750e6e9ed248fdf71c49271513cfc98c00319 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/37] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From f4cfae42aeebce118d1cd724fe5d92a028231ac5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/37] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From e4049923830a59326893eb3a77e6575506a5304e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/37] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From d437d0ec744aa0f666b23e4ef8704b6e74c6c2bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/37] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From e650f1be00c4cc7c034db7fc6cff98668d2abfbf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/37] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From dab446679e25c948ad26ef1471879e9c0f6dc784 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/37] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 8621363873b45cbaa8f71ca2e145e98fef7bbc38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/37] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From cbc6ee2148878eaf97747c6560227f92f1b14828 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/37] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 9401ce7d8044217e473e98eeccc28a652d8bd910 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/37] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 2246920ede1fad6813358874db13eadc8688796a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 22/37] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 6f219ab7471e8e49e8ff3f0711827348839e3b00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 23/37] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From c217b052067bb1c81c06448b37406cf943024b12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 24/37] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From b944829cbb298ad0e9f0e7543273e724510b586a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 25/37] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 1de5846d68e501bd3db58aed672e503106a591d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 26/37] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From 24570292b603a55dcca2a68c2d1955932f1fbb22 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 27/37] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 90b57e578d768db4116452af4437afe75bd6a8c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:26:29 -0700
Subject: [PATCH 28/37] vala: update to 0.56.5.
---
srcpkgs/vala/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index e1c4078b863b..a724fb0d20bc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
# Template file for 'vala'
pkgname=vala
# Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.56.3
+version=0.56.5
revision=1
build_style=gnu-configure
configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Vala"
changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf
+checksum=2b4292e7301de5fe904e67618116bc4027f60130a242b4a2228a295e6357b48c
shlib_provides="libvalaccodegen.so"
make_check=extended
From c1a72fe795b1ab8481c26287a9cd4cf1b275e677 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:26:37 -0700
Subject: [PATCH 29/37] valadoc: update to 0.56.5.
---
srcpkgs/valadoc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 0343359eb186..cb4e2178f866 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
# Template file for 'valadoc'
pkgname=valadoc
# Should be kept in sync with 'vala' (shared distfiles)
-version=0.56.3
+version=0.56.5
revision=1
build_style=gnu-configure
configure_args="--with-cgraph=yes"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Vala"
changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf
+checksum=2b4292e7301de5fe904e67618116bc4027f60130a242b4a2228a295e6357b48c
pre_configure() {
autoreconf -if
From 5f846cd114457eb06dd2e06f11370c704e6d5e9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:27:00 -0700
Subject: [PATCH 30/37] gnome-clocks: update to 44.0.
---
srcpkgs/gnome-clocks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 1a5183f69658..02a4b3e8cc59 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=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
@@ -17,4 +17,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
-checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
+checksum=17d7a97365cb8f1a023a1d78f7501f3353217fa7577d73afe7d0ca1e3b4f3838
From 4625e3e207e213aa742e6e8394a752d891b4ea39 Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Fri, 24 Mar 2023 20:45:53 -0400
Subject: [PATCH 31/37] freerdp: update to 2.10.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 53e67690f863..25e8aa9677f0 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.9.0
+version=2.10.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -18,9 +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"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/2.10.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
+checksum=88fa59f8e8338d5cb2490d159480564562a5624f3a3572c89fa3070b9626835c
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 671696be7dc1340d26c72d7c83083339029836a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 13:53:08 -0700
Subject: [PATCH 32/37] gnome-remote-desktop: update to 44.0.
---
srcpkgs/gnome-remote-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index 4a7278c35ab7..dd2d70b3f58b 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=43.2
+version=44.0
revision=1
build_style=meson
configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
- -Dsystemd_user_unit_dir=/var/lib/systemd/user"
+ -Dsystemd_user_unit_dir=/usr/lib/systemd/user"
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
@@ -14,5 +14,5 @@ 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=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
+checksum=f7e5088c18fdb08690ae034bf76a1aead59a7dcd17b26e1f7c9975480510a0fd
make_check=no # xvfb failed to start
From d42606c7e69dbc9fd4ac88f34c474847ea3ee93c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 13:59:31 -0700
Subject: [PATCH 33/37] gnome-disk-utility: update to 44.0.
---
srcpkgs/gnome-disk-utility/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index f574ddd1666f..24fcab038e0d 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
@@ -15,5 +15,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
distfiles="${GNOME_SITE}/gnome-disk-utility/${version%.*}/gnome-disk-utility-${version}.tar.xz"
-checksum=7afca9805a6b92db6933dd7efcec4af8386c01bbc1f871e2dae4def7e192a2c5
+checksum=02031097896cdb37d8717a5823f93e3723d4dfce7fdc4002c9dfcb16b7e7a3ef
lib32disabled=yes
From 30164dae179f10961b59ad6f7e6d107503f9d711 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:02:38 -0700
Subject: [PATCH 34/37] gnome-font-viewer: update to 44.0.
---
srcpkgs/gnome-font-viewer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index 73344ff10aa6..ca50c47418bc 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=43.0
+version=44.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
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
+checksum=a1511df30b228cc2ef1175dd9d2b93438ea912e25913404b263cf3d457bb9f97
From e1d4e13ebf5f267ff649bb7c9db0fcfd7319c387 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:09:42 -0700
Subject: [PATCH 35/37] gnote: update to 44.0.
---
srcpkgs/gnote/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index d07480b8f7a3..4be91570b945 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
# Template file for 'gnote'
pkgname=gnote
-version=43.0
+version=44.0
revision=1
build_style=meson
hostmakedepends="pkg-config gettext itstool
@@ -15,5 +15,5 @@ license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gnote"
changelog="https://gitlab.gnome.org/GNOME/gnote/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=2a5bf84490346fbc3e96cc3285ddd19946ae5ce93d465426010c7b6c051fc161
+checksum=dc3bd79268fe99d4ed56679ac076cc9d9aaaf62796138d371cf08815f7e6492d
lib32disabled=yes
From e8f3ecba74830fdfd2c6134e2b8cb4cadc6c0815 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 36/37] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From c205f649d098d42d88bc9d01c6be0c189a6c466a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 37/37] gnome: update to 44.0.
---
srcpkgs/gnome/template | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..ce492f4a7441 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -36,13 +36,13 @@ depends="
orca>=${version}
phodav>=3.0
simple-scan>=42
- totem>=${version}"
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (8 preceding siblings ...)
2023-03-26 21:38 ` oreo639
@ 2023-03-26 23:24 ` oreo639
2023-03-27 23:07 ` oreo639
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-26 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 92377 bytes --]
From 62f7d65a7b8f9ccc5f66ee720588ee1997c91e31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/38] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From bc0b8d896d773f8b3950c19019448510121016e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/38] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From cf7abb9cd895a6c6fa121eff8680b38f93cb6e32 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/38] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From e0ba6ad6ed7f9646f85940dc109df53c51389adb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/38] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 6c02e3e5d3b5b97956bd616e96d786df347f9197 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/38] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From a4449073093902f5d2d41e1c4986527a9ed7957f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/38] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From 77f455c7fa987b512e6e392b3bb784d2b68dc347 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/38] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 366b1460753275036e2a98c7fcf66e6403d71626 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/38] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From f4ae968f86e4c2a472d4433ced1889c48688975d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/38] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From f68f8f95641b79f0d19307582f8c70454945a570 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/38] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From b06421e1a97351267c2e9f113a5ccb7234501044 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/38] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 8b85a23546a574f690ec2b18cd2aba4cc57f9928 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/38] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From a7f750e6e9ed248fdf71c49271513cfc98c00319 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/38] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From f4cfae42aeebce118d1cd724fe5d92a028231ac5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/38] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From e4049923830a59326893eb3a77e6575506a5304e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/38] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From d437d0ec744aa0f666b23e4ef8704b6e74c6c2bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:57:58 -0700
Subject: [PATCH 16/38] gjs: update to 1.76.0.
---
...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++
.../gjs/patches/ignore-encoding-test.patch | 8 +--
srcpkgs/gjs/template | 6 +--
3 files changed, 56 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
new file mode 100644
index 000000000000..52743a99f6cf
--- /dev/null
+++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch
@@ -0,0 +1,49 @@
+From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001
+From: Dominik Opyd <dominik.opyd@gmail.com>
+Date: Wed, 8 Mar 2023 15:13:56 +0100
+Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
+
+---
+ installed-tests/js/meson.build | 10 +++++++---
+ meson.build | 4 ----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
+index 6db887d22..1e953ceb7 100644
+--- a/installed-tests/js/meson.build
++++ b/installed-tests/js/meson.build
+@@ -203,9 +203,13 @@ endif
+ # during build should be run using dbus-run-session
+
+ dbus_tests = ['GDBus']
+-if have_gtk4 and not get_option('skip_gtk_tests')
+- # FIXME: find out why GTK4 tries to acquire a message bus
+- dbus_tests += 'Gtk4'
++if not get_option('skip_gtk_tests')
++ have_gtk4 = dependency('gtk4', required: false).found()
++
++ if have_gtk4
++ # FIXME: find out why GTK4 tries to acquire a message bus
++ dbus_tests += 'Gtk4'
++ endif
+ endif
+
+ bus_config = files('../../test/test-bus.conf')
+diff --git a/meson.build b/meson.build
+index 3ac372a16..5c7703935 100644
+--- a/meson.build
++++ b/meson.build
+@@ -679,10 +679,6 @@ endif
+
+ ### Tests and test setups ######################################################
+
+-if not get_option('skip_gtk_tests')
+- have_gtk4 = dependency('gtk4', required: false).found()
+-endif
+-
+ subdir('installed-tests')
+
+ # Note: The test program in test/ needs to be ported
+--
+GitLab
+
diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch
index e0f9390a204c..98c42ad10109 100644
--- a/srcpkgs/gjs/patches/ignore-encoding-test.patch
+++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch
@@ -1,11 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
-@@ -243,7 +243,6 @@
- modules_tests = [
+@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
+ 'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
- ]
- if build_cairo
+ 'Global',
+ 'Timers',
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 968f103d74b8..8e8698e3388a 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,6 +1,6 @@
# Template file for 'gjs'
pkgname=gjs
-version=1.74.1
+version=1.76.0
revision=1
build_style=meson
build_helper="gir qemu"
@@ -13,9 +13,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
-checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459
+checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
From e650f1be00c4cc7c034db7fc6cff98668d2abfbf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 17/38] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From dab446679e25c948ad26ef1471879e9c0f6dc784 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 18/38] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 8621363873b45cbaa8f71ca2e145e98fef7bbc38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 19/38] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From cbc6ee2148878eaf97747c6560227f92f1b14828 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 20/38] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 9401ce7d8044217e473e98eeccc28a652d8bd910 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 21/38] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 2246920ede1fad6813358874db13eadc8688796a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 22/38] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 6f219ab7471e8e49e8ff3f0711827348839e3b00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 23/38] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From c217b052067bb1c81c06448b37406cf943024b12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 24/38] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From b944829cbb298ad0e9f0e7543273e724510b586a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 25/38] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 1de5846d68e501bd3db58aed672e503106a591d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 26/38] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From 24570292b603a55dcca2a68c2d1955932f1fbb22 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 27/38] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 90b57e578d768db4116452af4437afe75bd6a8c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:26:29 -0700
Subject: [PATCH 28/38] vala: update to 0.56.5.
---
srcpkgs/vala/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index e1c4078b863b..a724fb0d20bc 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
# Template file for 'vala'
pkgname=vala
# Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.56.3
+version=0.56.5
revision=1
build_style=gnu-configure
configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Vala"
changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf
+checksum=2b4292e7301de5fe904e67618116bc4027f60130a242b4a2228a295e6357b48c
shlib_provides="libvalaccodegen.so"
make_check=extended
From c1a72fe795b1ab8481c26287a9cd4cf1b275e677 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:26:37 -0700
Subject: [PATCH 29/38] valadoc: update to 0.56.5.
---
srcpkgs/valadoc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index 0343359eb186..cb4e2178f866 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
# Template file for 'valadoc'
pkgname=valadoc
# Should be kept in sync with 'vala' (shared distfiles)
-version=0.56.3
+version=0.56.5
revision=1
build_style=gnu-configure
configure_args="--with-cgraph=yes"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Vala"
changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf
+checksum=2b4292e7301de5fe904e67618116bc4027f60130a242b4a2228a295e6357b48c
pre_configure() {
autoreconf -if
From 5f846cd114457eb06dd2e06f11370c704e6d5e9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:27:00 -0700
Subject: [PATCH 30/38] gnome-clocks: update to 44.0.
---
srcpkgs/gnome-clocks/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 1a5183f69658..02a4b3e8cc59 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=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
@@ -17,4 +17,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Clocks"
changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz"
-checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d
+checksum=17d7a97365cb8f1a023a1d78f7501f3353217fa7577d73afe7d0ca1e3b4f3838
From 4625e3e207e213aa742e6e8394a752d891b4ea39 Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Fri, 24 Mar 2023 20:45:53 -0400
Subject: [PATCH 31/38] freerdp: update to 2.10.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 53e67690f863..25e8aa9677f0 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.9.0
+version=2.10.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -18,9 +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"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/2.10.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
+checksum=88fa59f8e8338d5cb2490d159480564562a5624f3a3572c89fa3070b9626835c
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 671696be7dc1340d26c72d7c83083339029836a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 13:53:08 -0700
Subject: [PATCH 32/38] gnome-remote-desktop: update to 44.0.
---
srcpkgs/gnome-remote-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index 4a7278c35ab7..dd2d70b3f58b 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=43.2
+version=44.0
revision=1
build_style=meson
configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
- -Dsystemd_user_unit_dir=/var/lib/systemd/user"
+ -Dsystemd_user_unit_dir=/usr/lib/systemd/user"
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
@@ -14,5 +14,5 @@ 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=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
+checksum=f7e5088c18fdb08690ae034bf76a1aead59a7dcd17b26e1f7c9975480510a0fd
make_check=no # xvfb failed to start
From d42606c7e69dbc9fd4ac88f34c474847ea3ee93c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 13:59:31 -0700
Subject: [PATCH 33/38] gnome-disk-utility: update to 44.0.
---
srcpkgs/gnome-disk-utility/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index f574ddd1666f..24fcab038e0d 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-disk-utility'
pkgname=gnome-disk-utility
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dlogind=none"
@@ -15,5 +15,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Disks"
distfiles="${GNOME_SITE}/gnome-disk-utility/${version%.*}/gnome-disk-utility-${version}.tar.xz"
-checksum=7afca9805a6b92db6933dd7efcec4af8386c01bbc1f871e2dae4def7e192a2c5
+checksum=02031097896cdb37d8717a5823f93e3723d4dfce7fdc4002c9dfcb16b7e7a3ef
lib32disabled=yes
From 30164dae179f10961b59ad6f7e6d107503f9d711 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:02:38 -0700
Subject: [PATCH 34/38] gnome-font-viewer: update to 44.0.
---
srcpkgs/gnome-font-viewer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index 73344ff10aa6..ca50c47418bc 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=43.0
+version=44.0
revision=1
build_style=meson
hostmakedepends="pkg-config glib-devel gettext"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
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
+checksum=a1511df30b228cc2ef1175dd9d2b93438ea912e25913404b263cf3d457bb9f97
From e1d4e13ebf5f267ff649bb7c9db0fcfd7319c387 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:09:42 -0700
Subject: [PATCH 35/38] gnote: update to 44.0.
---
srcpkgs/gnote/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index d07480b8f7a3..4be91570b945 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
# Template file for 'gnote'
pkgname=gnote
-version=43.0
+version=44.0
revision=1
build_style=meson
hostmakedepends="pkg-config gettext itstool
@@ -15,5 +15,5 @@ license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gnote"
changelog="https://gitlab.gnome.org/GNOME/gnote/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=2a5bf84490346fbc3e96cc3285ddd19946ae5ce93d465426010c7b6c051fc161
+checksum=dc3bd79268fe99d4ed56679ac076cc9d9aaaf62796138d371cf08815f7e6492d
lib32disabled=yes
From e8f3ecba74830fdfd2c6134e2b8cb4cadc6c0815 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 36/38] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From c205f649d098d42d88bc9d01c6be0c189a6c466a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 37/38] gnome: update to 44.0.
---
srcpkgs/gnome/template | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..ce492f4a7441 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -36,13 +36,13 @@ depends="
orca>=${version}
phodav>=3.0
simple-scan>=42
- totem>=${version}"
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 9fa118d4b7fad9d76d90d030cc93399b55849e27 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 38/38] budgie-desktop: update to 10.7.1.
---
srcpkgs/budgie-desktop/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..52f90513c66c 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=2
+version=10.7.1
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
@@ -10,7 +10,8 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
- gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
+ gnome-settings-daemon-devel vala libuuid-devel libupower-glib3 libgee-devel
+ libcanberra-devel"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
short_desc="Modern desktop environment from the Solus Project"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=f8b277fb674f4c9e9d1dac9e45a7f93a1364d2f25cb1b3b513ec8154cfd7d6bd
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (9 preceding siblings ...)
2023-03-26 23:24 ` oreo639
@ 2023-03-27 23:07 ` oreo639
2023-03-27 23:11 ` oreo639
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-27 23:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 83320 bytes --]
From 4196202a6b49e5bca2aea0235645a6ead068503c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/32] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From d8e716241bae0a030c1a5c47bd3ef072e4a26897 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/32] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From b454824530591aa977caecb885e6df17f5f37b60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/32] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 2e4788b97e41a36fd1faf4d89e9cdefd147cb9c1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/32] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 839f097e26227f1d1b4753224d4627984bc7270d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/32] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From bfed252d0dc2b4eebe9846d80ce124d1a2d647d2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/32] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From c8314b4a11884a8be27a8dcddc9e91591967ff5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/32] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 6dc5b167c9cdac6a4524d45b798a43876f7f6f3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/32] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 71990ce2ae9866985f2c2bb0e5fbfa17063006cd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/32] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From 9e30295b8039eae9e1264bf6715cf26942ab37f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/32] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 7855d068d32b3ad03560c333c78d8c1ce411ffde Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/32] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From c8ad0a55af61915ff4a68876d424a6085be1268b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/32] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 824deda5c0784d6eb44c5fb3520eb9c016e3ce5e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/32] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From a7c950cfc0d46886ef47fff4e97d825eaacb7182 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/32] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From cb1fe1ad93e89346ecf4e60fab85b14fb6d33b0d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/32] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 50ab8117e4a67a5fad559bb39dc333743ca9d009 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 16/32] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 5d8994b612d126637b18c3e8d2a584ed02ab135c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 17/32] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 10d1019c97efbe874cb18ce6873f6744e7483006 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 18/32] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 13875d521511182fd30232de0cedae369accdb72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 19/32] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 730c18427554b4305e35fae9bb87494ed959eca0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 20/32] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 24306da045b47ab6981898a69d86a49f691f3362 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 21/32] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 6780da24c44c5b202d140be732f8f6604ff70842 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 22/32] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From b2d255865c44ac51dfddac7136b0a16bda11d690 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 23/32] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 909cd4ad99d6b68c9b3498ac45204abd3eedd83e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 24/32] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 8b342c82a488319179e89a0fc88d40bcd2d59f29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 25/32] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From a7eb340f2d437dda70d92ecb16f0a119a1f3d161 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 26/32] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 447e5ddc51f5159d1964c1ac0b119630c4324971 Mon Sep 17 00:00:00 2001
From: Owen Law <owenlaw222@gmail.com>
Date: Fri, 24 Mar 2023 20:45:53 -0400
Subject: [PATCH 27/32] freerdp: update to 2.10.0.
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index 53e67690f863..25e8aa9677f0 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
# Template file for 'freerdp'
pkgname=freerdp
-version=2.9.0
+version=2.10.0
revision=1
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -18,9 +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"
+changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/2.10.0/ChangeLog"
distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27
+checksum=88fa59f8e8338d5cb2490d159480564562a5624f3a3572c89fa3070b9626835c
CFLAGS="-Wno-dev"
case "$XBPS_TARGET_MACHINE" in
From 0927e1939dcc9618500530105fc805d0ab89eb24 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 13:53:08 -0700
Subject: [PATCH 28/32] gnome-remote-desktop: update to 44.0.
---
srcpkgs/gnome-remote-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template
index 4a7278c35ab7..dd2d70b3f58b 100644
--- a/srcpkgs/gnome-remote-desktop/template
+++ b/srcpkgs/gnome-remote-desktop/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-remote-desktop'
pkgname=gnome-remote-desktop
-version=43.2
+version=44.0
revision=1
build_style=meson
configure_args="-Drdp=true -Dvnc=true -Dsystemd=false
- -Dsystemd_user_unit_dir=/var/lib/systemd/user"
+ -Dsystemd_user_unit_dir=/usr/lib/systemd/user"
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
@@ -14,5 +14,5 @@ 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=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771
+checksum=f7e5088c18fdb08690ae034bf76a1aead59a7dcd17b26e1f7c9975480510a0fd
make_check=no # xvfb failed to start
From 09ff1871812f865fb565eb306e063abad533412d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:09:42 -0700
Subject: [PATCH 29/32] gnote: update to 44.0.
---
srcpkgs/gnote/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index d07480b8f7a3..4be91570b945 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
# Template file for 'gnote'
pkgname=gnote
-version=43.0
+version=44.0
revision=1
build_style=meson
hostmakedepends="pkg-config gettext itstool
@@ -15,5 +15,5 @@ license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Gnote"
changelog="https://gitlab.gnome.org/GNOME/gnote/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=2a5bf84490346fbc3e96cc3285ddd19946ae5ce93d465426010c7b6c051fc161
+checksum=dc3bd79268fe99d4ed56679ac076cc9d9aaaf62796138d371cf08815f7e6492d
lib32disabled=yes
From 4e2911f7f03766a149971054dd7cde52b6a065a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 30/32] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 17e70e5d721b19e790afc3354b6178b13688bd9c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 31/32] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From c9e868a559152230f13528c6c5af3f0cf3e28acc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 32/32] budgie-desktop: update to 10.7.1.
---
srcpkgs/budgie-desktop/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..52f90513c66c 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=2
+version=10.7.1
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
@@ -10,7 +10,8 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
- gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
+ gnome-settings-daemon-devel vala libuuid-devel libupower-glib3 libgee-devel
+ libcanberra-devel"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
short_desc="Modern desktop environment from the Solus Project"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=f8b277fb674f4c9e9d1dac9e45a7f93a1364d2f25cb1b3b513ec8154cfd7d6bd
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (10 preceding siblings ...)
2023-03-27 23:07 ` oreo639
@ 2023-03-27 23:11 ` oreo639
2023-03-30 23:00 ` oreo639
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-27 23:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 79569 bytes --]
From 4e03a23de352cfb4941df8d198c8f62e7120a65c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/29] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index b8d161c2d932..c5cdc607054c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From a4a9e32aa4fb009ef46b8a1ecc5ff95729c050eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/29] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 1125554fa140d070d95abae40de845f1c4f46fb1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/29] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c5cdc607054c..5e6a93fc4f0f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 0768ade30978e6065846e6073ff324c55eed7188 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/29] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From c89d1882c181e03517848053c4fba19c38f8a6ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/29] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From 5ad7c4fd0565de2d7f0a20ea5b54308b5cea5a90 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 06/29] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From 16a00d3bcff892b20c1ffcb00e2b898d8df58cab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 07/29] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 5ac2f91129bc78ebc619af1da45acbd4d23fe372 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 08/29] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 54d1fe4e489bffc502f09c9d04a5b0304d9cc655 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 09/29] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From 31b55535961dbeeefb8b4cbd7a8248658ec50907 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 10/29] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 6e9940238457d24969b8e9f1b6d43ec6b6ae51b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 11/29] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 865ab8c197b121806dd50642b9e4301b2b9343ae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 12/29] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5e6a93fc4f0f..afb775cc3e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From b87be2b1fbc8bdce2aae6d9b71c733a40c124279 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 13/29] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From b7c07cf1d3bc004512626b51d7592d559fc1a843 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 14/29] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From a142c720ba0e9af25be6bd67f651cc778475457d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 15/29] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 93d74c044d09056d44e39060d4f94808139e4948 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 16/29] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 3b0df0c57a57660cbbed33af0fd3152a14b96429 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 17/29] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 8a092dfbe3b1fd8530abd9daeedf64dc19e9b657 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 18/29] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 118190ea2cca02f9a7d0ec0d8980956d602a0e99 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 19/29] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From d427aef7218c1d07e652ed7a5bd45ced0b6a7971 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 20/29] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 0a857fd14106367f8b710330491e730071e7337f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 21/29] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From b5e1a6f4c62009de755f79e91cab4effc6f05cff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 22/29] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From e893561c6052acee52ef33b64cededf6c5f1f1da Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 23/29] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 8ecc0a16f8d7604e001620c55cc9f377c854a53a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 24/29] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From e0c39e7116ceb6d30e87b0b3ecafa391024a50c1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:45:08 -0700
Subject: [PATCH 25/29] glib-networking: update to 2.76.0.
---
srcpkgs/glib-networking/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 50328d0e9ac4..680a064ffec5 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
# Template file for 'glib-networking'
pkgname=glib-networking
-version=2.74.0
+version=2.76.0
revision=1
build_style=meson
configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,8 +13,8 @@ short_desc="Network-related giomodules for glib"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
-#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-76/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b
+checksum=149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a
lib32disabled=yes
From 408ddfe5ec4748dc12afbd2251af050f4f1474b9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 26/29] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 41fb9d8ca371328cafaaa84218ecd737d207ac94 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 27/29] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 64096863764c265138ab4c589c8569d0c0a6ede9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 28/29] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 04a2c64ff99408646642a716ac76865e26ea95f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 29/29] budgie-desktop: update to 10.7.1.
---
srcpkgs/budgie-desktop/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..52f90513c66c 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=2
+version=10.7.1
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
@@ -10,7 +10,8 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
- gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
+ gnome-settings-daemon-devel vala libuuid-devel libupower-glib3 libgee-devel
+ libcanberra-devel"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
short_desc="Modern desktop environment from the Solus Project"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=f8b277fb674f4c9e9d1dac9e45a7f93a1364d2f25cb1b3b513ec8154cfd7d6bd
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (11 preceding siblings ...)
2023-03-27 23:11 ` oreo639
@ 2023-03-30 23:00 ` oreo639
2023-04-03 8:45 ` oreo639
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-03-30 23:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 59424 bytes --]
From aec5b20e3b835ba06fa8d465f227fe5db25e5482 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/27] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index 840a0c3197ab..3fb4353d06ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1141,6 +1141,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 659c8eb51a5495f4aea8d941af990088c61b013b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/27] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 00b6197e9824515cef9fe9253db497aa5d157ef9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/27] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3fb4353d06ef..87f4dbe2a316 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 7791096e7a12b8c3cab1d63075ade36745b7dc67 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/27] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From d8c82e9044f24e4ba4e2f545f2685abd15ec5ca5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/27] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From e62465eb4d8319a92bafa3e84d2fb30c6c20a231 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 06/27] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 30250dddced29ed4f2bf821c78a07859c96fa32f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 07/27] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 489362e2f0e887556c5d45b58b1858b126fd3142 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 08/27] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
From 7abff6b394c1b70399d52b3e9046607b5a6216b2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 09/27] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 36aec48dc3608396af86de44e99a264191fad7db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 10/27] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 3a9c8136c1a7793b7da8733a05a30b933632d346 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 11/27] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 87f4dbe2a316..340b3207e46a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2984,10 +2984,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From b6f4d43c5903b7e1e786ee77ab7a9acc6fc2af82 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 12/27] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From 624961fd1e1c916beb3f32e1fb1639197e5d9e03 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 13/27] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From cd4532c5787aa6b5d9077c0fbf5a1f41e2e90164 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 14/27] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 0fdf4eaa9dcd9bc51772291aaf1e8ec35ca7678e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 15/27] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From eb219aa99b6b4f934e680a6484f938301d7ba029 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 16/27] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 7c756fca069ddfa4b9734adb3f7c6b6dc2903d8d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 17/27] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From b958a979bf982faaf5b357d9495ce1b609abb8e1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 18/27] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From d4b195ca5ab03e642e0808d3a59ca46ce8dc26ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 19/27] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From ba70783e04d94c307f062fc0a1887500099dd0d9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 20/27] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From f3002c9d1c3380f361adf700959267ecc6d0eb87 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 21/27] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From fa4e758e2efb30e29ebbc36c9f8da2e1754ca9f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 22/27] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 53de05519d957c0523e2ef33a1deede136a3cb96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 23/27] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From a3fd0f1d93804950863d367f2f86a63379687564 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 24/27] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 20ca93bbdb3fcb132b832c4d7c95a0038faa7783 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 25/27] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 0f44b27fadc2c674b4b616f1a4195b9773e17aa7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 26/27] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 107ef27ff26ce37f746aab3e6564b65c0e6e507e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 27/27] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (12 preceding siblings ...)
2023-03-30 23:00 ` oreo639
@ 2023-04-03 8:45 ` oreo639
2023-04-03 8:47 ` oreo639
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-03 8:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 59570 bytes --]
From 00630747fb169b079fec6b225deae6613df96227 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/27] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..f2f392b6b45f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1143,6 +1143,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 371e7a5821efdc1e41f7ee65c1ad7550f2d3904b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/27] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 89ab41cab648e628ca2fa6ce6641482b042149b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/27] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f2f392b6b45f..4af39bae735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 7f0cd4aea2ab1c58e36cf4cd5c6824b89a65f7bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/27] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 27032da12efbee411a3d8ab60ce5aea96319920e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/27] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From 1941d958df324d6568f438ef45916a2b6646aac3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 06/27] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a92360e98674..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
-revision=2
+version=44.1
+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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 0fbe4ef58d743e19983b22c1d0e0aff7a5d984e7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 07/27] Komikku: rebuild for libwebkitgtk60
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 8 ++--
2 files changed, 43 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..7386e9efdf34 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,15 +1,15 @@
# Template file for 'Komikku'
pkgname=Komikku
version=1.17.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic python3-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
python3-piexif"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
From 69f5799dd38a751789ed7c46c5ae75e50b1b7e5b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 08/27] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 60a9b6607440d7b80748a7ffa5a01e0e2b227f49 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 09/27] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From a74d7c6dd07aacfb254dc4cce8306d013b2e5ae1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 10/27] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4af39bae735e..3fd42775e107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 1305c49274045342c524a9670438127963a02106 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 11/27] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From 5f1049a8cefcdb55f461ff4a63e50ad2607e1b7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 12/27] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From 06614c9a41c06115636e141db0d55680638d2def Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 13/27] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 811ffc974fb61ae28fe16909c86edf3e4b855be2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 14/27] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 8fc8eb2b4b214a0193d25f2111c98d9b5c09898d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 15/27] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From ae038685a90821eb325e19ab594d7734881f469c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 16/27] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From d3f9412ed3e922a7ce06384ec52bfb7aa8b34f10 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 17/27] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 33f96c9c83974da3cf1693a96fdff5185d8ef500 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 18/27] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 3af22260b1be569d5129e0e3e9bcc81329d6f558 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 19/27] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From a129d4bb96c36d5260b203bdf59456e87f05be66 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 20/27] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 7acd2e88e768e638ce8321472431f29bebe208f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 21/27] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 968a747f31873da2142e1f433b9f6d18fecd7752 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 22/27] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From efc8176b5530600893e8b31e8105413c10d1ed57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 23/27] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From b98183b0f646c17e386201144c9f56fa01d56f15 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 24/27] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From f19bd9be032d44d6f987447f59d9daaddf79207e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 25/27] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 32294627e067a06c318928859c23efe67b7fdc8c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 26/27] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 96d3e5d184b29932c8106378a3c8e33b937c2bce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 27/27] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (13 preceding siblings ...)
2023-04-03 8:45 ` oreo639
@ 2023-04-03 8:47 ` oreo639
2023-04-03 19:18 ` oreo639
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-03 8:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 56802 bytes --]
From 00630747fb169b079fec6b225deae6613df96227 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/27] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/patches/initial-exec.patch | 23 ++++++++++
srcpkgs/webkit2gtk/template | 46 +++++++++----------
9 files changed, 54 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch
diff --git a/common/shlibs b/common/shlibs
index ddd0a3266a36..f2f392b6b45f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -548,8 +548,8 @@ 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
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.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
@@ -1143,6 +1143,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
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
+libgsttranscoder-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.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 03d7dbe80713..540a14726eb1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -303,6 +303,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch
new file mode 100644
index 000000000000..579084bd6065
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch
@@ -0,0 +1,23 @@
+Source: https://bugs.webkit.org/show_bug.cgi?id=254286
+
+Usage initial-exec TLS is incompatible with dlopen() on musl.
+
+See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39
+ .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp
+@@ -108,7 +108,11 @@ RefPtr<PixelBuffer> GraphicsContextGLANGLE::readCompositedResults()
+
+ bool GraphicsContextGLANGLE::makeContextCurrent()
+ {
+- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #ifdef __GLIBC__
++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #else
++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr };
++ #endif
+
+ if (s_currentContext == this)
+ return true;
+--
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ 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 python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc '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 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
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-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="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
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"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 371e7a5821efdc1e41f7ee65c1ad7550f2d3904b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/27] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 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.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
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 libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -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=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From 89ab41cab648e628ca2fa6ce6641482b042149b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/27] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f2f392b6b45f..4af39bae735e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -617,6 +617,7 @@ 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-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
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=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From 7f0cd4aea2ab1c58e36cf4cd5c6824b89a65f7bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/27] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 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.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ 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}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 27032da12efbee411a3d8ab60ce5aea96319920e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/27] gnome-initial-setup: update to 44.0.
---
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 b6adfa30f8fb..e07a42917c4f 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.2
+version=44.0
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 libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-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=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From 1941d958df324d6568f438ef45916a2b6646aac3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 06/27] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a92360e98674..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
-revision=2
+version=44.1
+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
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-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"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 0b5135145b84fbd0bf666752e0c5552292e874b2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:47:31 -0700
Subject: [PATCH 07/27] Komikku: rebuild for libwebkitgtk60
---
srcpkgs/Komikku/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index fad699b5d4ac..ceb56424353c 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
# Template file for 'Komikku'
pkgname=Komikku
version=1.17.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
@@ -9,7 +9,7 @@ makedepends="gtk4-devel libadwaita-devel"
depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic python3-rarfile
- python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50
+ python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60
python3-piexif"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
From c3155fe6e601ec79af79fadc8c6e919032e1fecc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 08/27] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 87915a92e814cd699b8b24abdc83070b3894c197 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 09/27] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 7d606719c46166c805b8686900ab428118ae2d21 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 10/27] mutter: update to 44.0.
---
common/shlibs | 8 ++++----
srcpkgs/mutter/template | 23 ++++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4af39bae735e..3fd42775e107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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 4705d3c72deb..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 499cbb9575f8cd1f744dc0ff29a22f0dd2f3ee69 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 11/27] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From d4a0db44cd63d9caab8d1bb57ca94332ddafa84e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 12/27] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From 41aed8cd1696a8e82500db2759c5f98ffc3accd2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 13/27] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From e320dea4c7dfd1e4894341c921974974c1918711 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 14/27] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 1a82472eccc241c70e89bffe35ae57ac3f6b2356 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 15/27] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 4003057dc2dfd809aefb5e1fe37a2d9475c25def Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 16/27] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 1a204626342bda27b80f60a3583d2d4b17102620 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 17/27] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 9ab30d05387c202b5a7ce29ae24ae9cb5a1b857e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 18/27] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From cae22fe94ae022fddbec2e9fda1cc268f9e7c3bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 19/27] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 438ce8d6292ed39ae740e608ac7162436ff1f234 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 20/27] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 09f46dc23e72c1c721b3aece3e6e6f3cced554ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 21/27] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 5014f6700e9febb3331470f90fe2f872911c6129 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 22/27] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From c2456a79d7785a2ce8e409fcfbd5f236079831be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 23/27] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From e9963daabcc6c75d7b8dcfa683146a283b48e376 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 24/27] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 018122467f5ada00a58831b9fb16af744c1a6d0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 25/27] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 5dc9716fe5df6a16b419ef7e9217fea2039096ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 26/27] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 92e755ebb45701a192a60a9553bfebc88624aa42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 27/27] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (14 preceding siblings ...)
2023-04-03 8:47 ` oreo639
@ 2023-04-03 19:18 ` oreo639
2023-04-03 19:25 ` oreo639
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-03 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 37534 bytes --]
From f6cda20f192c8f727c9849856af4a96b1f022b28 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 01/21] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 264943b2328b..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -7,7 +7,7 @@ build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-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 libwebkitgtk60-devel
From 93db7d9e687550ef4820c2236a2b31698e029d0d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 02/21] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From ec8c2448869ac57c7e4de7861b480faf4f7b9c58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 03/21] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 851d5509564169878e7b5f1a7ae8cd5007f0270b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 04/21] mutter: update to 44.0.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index 4af39bae735e..3fd42775e107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 4b3ada7e9cdfa5a56f89683270161e3c62a04820 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 05/21] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From b3cebd0ab435f1b7b6de958a2d46653c1183b451 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 06/21] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From 3fd7374b6cd9736de2f523ef7823103659262eeb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 07/21] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 0a24f2144225548f659c04bea7862d0cb654bacf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 08/21] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 21fcb0e39c1182083c14cd6e3f059125dd0594ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 09/21] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From b6a2a2a87d1cbf82eca70449faad7670dfd10edc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 10/21] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 7e8bc56e6ecf136c4463090262fdcf5dfdccfc03 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 11/21] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 03309058b69c7c30022e7d645b9d025fa230095f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 12/21] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 6b8a2159cb64fddcd3630368e971d80d5f895397 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 13/21] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 87a20dafe9acbc69afbe581172ea395685035d81 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 14/21] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 6bf1e01f0bf66918cdc8b285ac2ef1c5222fe569 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 15/21] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 492291edbcbf784189340ec1af94549fc0be170c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 16/21] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 9b827b2afb5a957374085620f09467dca49db985 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 17/21] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 9e4c6e80cc9c0cc813ebc0370c65b112d823e8a5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 18/21] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 20b227b0d530f78d4aab35eda73c39645df9505e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 19/21] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 37e12ca9a05f604356be2b63890c6de02fb68752 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 20/21] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 256a8ca51cda8b516e1b3a2ef8c97aa8c7ac6a64 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 21/21] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (15 preceding siblings ...)
2023-04-03 19:18 ` oreo639
@ 2023-04-03 19:25 ` oreo639
2023-04-07 20:38 ` oreo639
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-03 19:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
[ci skip]
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 36453 bytes --]
From af5b114ba7cafcd3425e80198d8c23a1a4257e9f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/20] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From e99e46724fdfcf2ee8a1613680d393e75fd58c83 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/20] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 32c357caa186ba65da41e88ec48f5afdc761294c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/20] mutter: update to 44.0.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index 4af39bae735e..3fd42775e107 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 98e87d667c64495d670ba87d8864e5b24441e9d2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/20] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From bc256c12cde1f97b22e1ca4f2d707e047fbf8152 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/20] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From ee0014467cba72538448fff8aa0b73e69ae229e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From a715d29275ba7bf30340ac0196e8b98706ae133f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From f3c677a21205ee063edfc96fd39e2d2195080ee4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 14fb9ae65de9c13bfc651403be9f97aa21a093aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/20] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 96bb4d1b8fb7cc99fde982ff1bec3872f8693371 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 23e992e679c0ab987a34408fade85ff2dea097dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/20] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 0469346c3aecbe2d5dd3e70b69e1a4179de97035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 9fa20cbef1dcec21af399b5b6353054fa21dd6f2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 9986eb5aa52eaf5573afc31bd95cf46a709de298 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/20] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From c083ea5c81e1bf840d691ec5f42f5d197d60634f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/20] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 3f5070858dcf11621f834bac4d5049c60e5fca5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/20] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 90f67fd5f3f17444839b0bf6403b555d0cb9f48e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 17/20] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 2c4f7214bb2c0a7f2c717e0dc64247e9e893263d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 18/20] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 5d4a18873851dbcd7e5ffd74047e661a4053667d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 19/20] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 2bf54ec6460ff47802f9d12cefa596842e9b0e2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 20/20] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (16 preceding siblings ...)
2023-04-03 19:25 ` oreo639
@ 2023-04-07 20:38 ` oreo639
2023-04-07 20:54 ` oreo639
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-07 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2308 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
Related:
+ https://github.com/void-linux/void-packages/pull/42935
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 36453 bytes --]
From b290aee64acc8a2271020d9f04c82c01ca46af71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/20] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 8410ff7089d026dc68cd6b9d14c2dbee05b6b98b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/20] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 20eaae45e34ccaa916d6e024bc2bce32b3ad75d5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/20] mutter: update to 44.0.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index 39fed5ffbcf5..e3a5ba611f5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 2458128dbb74200f4e0279e24e4a5086cd2536ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/20] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From 9803b4583a06e010003671163a1d50bbe12eb4f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/20] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From f95a478287b93316bae6a546b2180ac4adc3211e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From eec2f2bf1b54e92d6b65fddc4d27012b74de0361 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 52a3ffe9f8fdd977c4a4f4c90b2bdd5dc2518c60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From be3501346246c653fc96b8226a782f52d1177b7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/20] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From e3d84e1d31d1c525f8c399bd4de2d69fa9df8964 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From de7d2af8fa4d01d86c4d878b13f904713829c81b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/20] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From b3feb9fe7e426c4e16f08005e5ed50478a54aa78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 904e304c1f32442a9c0bf2c357e7c6555b959606 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 9405dd99255df79849e9e4573fb44688161ad020 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/20] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 0604bee7020d959f0c9c709a44988e45eb1b3b11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/20] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..573d9c2c7a4e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,6 +1,6 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From a09d7e3933d3c892ed8a5aa3043d3bee5673f5af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/20] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From ef582d99dcf4eaba50232781a106acd368568c2c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 17/20] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 700537bccac40a64b732ba2f4c5fa18be04e7c18 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 18/20] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 20a605fbd37713124a2545145b613776492b0902 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 19/20] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From a60d762468abbe1c2f4040a9b2962ac412425859 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 20/20] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (17 preceding siblings ...)
2023-04-07 20:38 ` oreo639
@ 2023-04-07 20:54 ` oreo639
2023-04-07 20:56 ` oreo639
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-07 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2308 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 36785 bytes --]
From b290aee64acc8a2271020d9f04c82c01ca46af71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/20] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 8410ff7089d026dc68cd6b9d14c2dbee05b6b98b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/20] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 20eaae45e34ccaa916d6e024bc2bce32b3ad75d5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/20] mutter: update to 44.0.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index 39fed5ffbcf5..e3a5ba611f5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 2458128dbb74200f4e0279e24e4a5086cd2536ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/20] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From 9803b4583a06e010003671163a1d50bbe12eb4f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/20] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From f95a478287b93316bae6a546b2180ac4adc3211e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From eec2f2bf1b54e92d6b65fddc4d27012b74de0361 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 52a3ffe9f8fdd977c4a4f4c90b2bdd5dc2518c60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From be3501346246c653fc96b8226a782f52d1177b7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/20] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From e3d84e1d31d1c525f8c399bd4de2d69fa9df8964 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From de7d2af8fa4d01d86c4d878b13f904713829c81b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/20] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From b3feb9fe7e426c4e16f08005e5ed50478a54aa78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 904e304c1f32442a9c0bf2c357e7c6555b959606 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 9405dd99255df79849e9e4573fb44688161ad020 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/20] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From a5265eab8a85b662d235a9a12ea5e909dc53d90c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/20] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..fc200050750e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,10 +1,10 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
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>"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 587433e0b334d72103f5651e15f07fb633d63aa6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/20] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 0181553a529483c228074d48c80b90bc617d4200 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 17/20] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 974ca561f84ba9decaf627f0f7671efb20e44dc9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 18/20] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From daf709dbafc0db798b95c2884cacfc069ae5d251 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 19/20] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 92b63c3f862eacacaf00e476ef36566ae34745e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 20/20] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (18 preceding siblings ...)
2023-04-07 20:54 ` oreo639
@ 2023-04-07 20:56 ` oreo639
2023-04-07 22:54 ` oreo639
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-07 20:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2308 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 36785 bytes --]
From b290aee64acc8a2271020d9f04c82c01ca46af71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/20] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 8410ff7089d026dc68cd6b9d14c2dbee05b6b98b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/20] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 20eaae45e34ccaa916d6e024bc2bce32b3ad75d5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/20] mutter: update to 44.0.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index 39fed5ffbcf5..e3a5ba611f5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 2458128dbb74200f4e0279e24e4a5086cd2536ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/20] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From 9803b4583a06e010003671163a1d50bbe12eb4f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/20] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From f95a478287b93316bae6a546b2180ac4adc3211e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From eec2f2bf1b54e92d6b65fddc4d27012b74de0361 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 52a3ffe9f8fdd977c4a4f4c90b2bdd5dc2518c60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From be3501346246c653fc96b8226a782f52d1177b7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/20] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From e3d84e1d31d1c525f8c399bd4de2d69fa9df8964 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From de7d2af8fa4d01d86c4d878b13f904713829c81b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/20] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From b3feb9fe7e426c4e16f08005e5ed50478a54aa78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..256ee0ec3b4f 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,8 +1,7 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
@@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 904e304c1f32442a9c0bf2c357e7c6555b959606 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 9405dd99255df79849e9e4573fb44688161ad020 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/20] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From a5265eab8a85b662d235a9a12ea5e909dc53d90c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/20] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..fc200050750e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,10 +1,10 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
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>"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 587433e0b334d72103f5651e15f07fb633d63aa6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/20] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 0181553a529483c228074d48c80b90bc617d4200 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 17/20] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 974ca561f84ba9decaf627f0f7671efb20e44dc9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 18/20] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From daf709dbafc0db798b95c2884cacfc069ae5d251 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 19/20] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 0f852536e17c9224f8f7e8707225a23196cd2534 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 20/20] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (19 preceding siblings ...)
2023-04-07 20:56 ` oreo639
@ 2023-04-07 22:54 ` oreo639
2023-04-28 21:19 ` oreo639
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-07 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2308 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42961
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 37006 bytes --]
From b290aee64acc8a2271020d9f04c82c01ca46af71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/20] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 8410ff7089d026dc68cd6b9d14c2dbee05b6b98b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/20] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 20eaae45e34ccaa916d6e024bc2bce32b3ad75d5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/20] mutter: update to 44.0.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index 39fed5ffbcf5..e3a5ba611f5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2986,10 +2986,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..ee2e3a873303 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.0
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 2458128dbb74200f4e0279e24e4a5086cd2536ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/20] gnome-shell: update to 44.0.
---
.../patches/no-exe-introspection.patch | 25 +++++++++++++++++++
srcpkgs/gnome-shell/template | 7 +++---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..36e6a1dfd11e 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.3
+version=44.0
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a
do_check() {
mkdir /tmp/gnome-shell-xdg
From 9803b4583a06e010003671163a1d50bbe12eb4f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/20] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From f95a478287b93316bae6a546b2180ac4adc3211e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From eec2f2bf1b54e92d6b65fddc4d27012b74de0361 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From 52a3ffe9f8fdd977c4a4f4c90b2bdd5dc2518c60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From be3501346246c653fc96b8226a782f52d1177b7e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/20] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From e3d84e1d31d1c525f8c399bd4de2d69fa9df8964 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From de7d2af8fa4d01d86c4d878b13f904713829c81b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/20] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From 006a4cb95469d0e200b87b376d1bc8eb3a6c6ca2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.0.
---
srcpkgs/xdg-desktop-portal-gnome/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..2882d784543b 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,11 +1,11 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.0
+revision=2
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext
+ wayland-devel"
makedepends="gtk4-devel libadwaita-devel libglib-devel
gnome-desktop-devel gsettings-desktop-schemas-devel
xdg-desktop-portal"
@@ -14,7 +14,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
-#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34
From 3b10165f368cd51ebdc4478937984d4f6a23f787 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 172c929599d2764945675788f7e0d0b2c6b9a42f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/20] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 024fa6ade6a9555f82169fa2d639b180c41348b9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/20] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..fc200050750e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,10 +1,10 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
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>"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 7395943cb23fb5513330bcffef30127d627ae784 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/20] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From a143677c79dfcbd7999eee9520a815be85e9e703 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 14:04:27 -0700
Subject: [PATCH 17/20] epiphany: update to 44.0.
---
srcpkgs/epiphany/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index a23f04b32ebb..6a090ccb6cf3 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,21 +1,21 @@
# Template file for 'epiphany'
pkgname=epiphany
-version=43.0
+version=44.0
revision=1
build_style=meson
configure_args="-Dunit_tests=disabled"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache
desktop-file-utils"
-makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel
- gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel
+makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel
+ gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel
libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel
- nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel
+ nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel
libarchive-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="oreo639 <oreo6391@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Web"
-changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz"
-checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227
+checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1
From 9d51ce2cb6d59afd437a7b9d40902135d2fbc571 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 18/20] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From da662d2e47ea9c6429dfa27da4c4ac22e1254145 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 19/20] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 34b6cdfad5ad9b09eb248ac10ca2668ee54568ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 20/20] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (20 preceding siblings ...)
2023-04-07 22:54 ` oreo639
@ 2023-04-28 21:19 ` oreo639
2023-06-08 8:41 ` oreo639
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-04-28 21:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2250 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 37027 bytes --]
From 89f40f3a5973d4650c48031293a86797510d5584 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/19] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 479897c5460d1743478e1a65eb09364b1373c795 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/19] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From d7bb27513592e495e878ddc592c619a64987795c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/19] mutter: update to 44.1.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index e282bbd1f588..65f8e7db8705 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2990,10 +2990,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..e4b3ab16eacc 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.1
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=973aeafab42f06f934a0994fc84878958cdb4d2766a4c867a5ccdc547dd57056
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 34d85ac09130ea79f0c2f2b01c08554ba506caa0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/19] gnome-shell: update to 44.1.
---
...2e61a9882edc722ac64da80804e75f832155.patch | 32 -------------------
.../patches/no-exe-introspection.patch | 25 +++++++++++++++
srcpkgs/gnome-shell/template | 7 ++--
3 files changed, 29 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
deleted file mode 100644
index 328ecbefb3c4..000000000000
--- a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Fri, 3 Mar 2023 17:50:10 +0900
-Subject: [PATCH] inputMethod: Try to connect require-surrounding-text signal
-
-require-surrounding-text signal has been added since IBus 1.5.28.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6405
----
- js/misc/inputMethod.js | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
-index e008e6411..aa610b3bf 100644
---- a/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
-@@ -76,7 +76,11 @@ var InputMethod = GObject.registerClass({
-
- this._context.set_client_commit_preedit(true);
- this._context.connect('commit-text', this._onCommitText.bind(this));
-- this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ try {
-+ // Require ibus 1.5.28 or later.
-+ this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ } catch (e) {
-+ }
- this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
- this._context.connect('update-preedit-text-with-mode', this._onUpdatePreeditText.bind(this));
- this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
---
-GitLab
-
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..61c011f9bc08 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.3
+version=44.1
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=0bfbe4394d267625154d08d01467bdbd99e8157512fc8df45d5c02ddb7551ca6
do_check() {
mkdir /tmp/gnome-shell-xdg
From 71f842c5dd293d595cc12d1fa52e1f426140d405 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/19] gdm: update to 44.0.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..b0dc0dc005b6 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c
conf_files="
/etc/gdm/custom.conf
From 448e23bc1f3da162a332b6db7fd47bd25631872d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/19] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 1ae660c80d0e2432e3c7fb47bf33a3f3fa4a8ec8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/19] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From d7fab9274846d39d626027875236dd8c530e437a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/19] gnome-settings-daemon: update to 44.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 3d3cf393f960..db6ed160949f 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.0
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 4e02635e8510ca78361cb4dfdda730644310cc1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/19] gnome-control-center: update to 44.0.
---
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 849763d23c1e..ac1a4ad7c9e0 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.0
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From 5eaab51eae33b7f47d759377399e7e8164b41e07 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/19] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From a53a525cf48ff74f7ddc464793983784d4154c97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/19] gnome-user-docs: update to 44.0.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..15f66157419c 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=43.0
+version=44.0
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd
From bb92099f6351e3fd3242bc61fde85e23b7248443 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/19] xdg-desktop-portal-gnome: update to 44.1.
---
srcpkgs/xdg-desktop-portal-gnome/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..884baccf764b 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,11 +1,11 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.1
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext
+ wayland-devel"
makedepends="gtk4-devel libadwaita-devel libglib-devel
gnome-desktop-devel gsettings-desktop-schemas-devel
xdg-desktop-portal"
@@ -14,7 +14,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=3682c546c81922a5ba69d62d86f69c0c26b17c9096823f58149d0b55bbf0eedb
From 4375fcb73b3f2b291c2925859758a0df3553ea78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/19] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 4af7e600b02438e746da6cb77e47baf5a3128fdf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/19] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From be63cdcb1095ae1330559fbadeb01eb2a3c1a36b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/19] zenity: update to 3.44.0.
---
srcpkgs/zenity/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..fc200050750e 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,10 +1,10 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.0
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
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>"
@@ -12,7 +12,7 @@ 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}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65
build_options="webkit"
build_options_default="webkit"
From 75ec2bdf0ba24c5d7d34914980d3289b7f5a3073 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/19] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 196b5ec227ca4d0fa9c85ac7aea64281195900cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 17/19] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 476fd5c4d3f4514059a6d7cb52e8e5281b61d434 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 18/19] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 4716e4ae15b5943f7f8cf307e4eec776bd8e1539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 19/19] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (21 preceding siblings ...)
2023-04-28 21:19 ` oreo639
@ 2023-06-08 8:41 ` oreo639
2023-06-08 9:12 ` oreo639
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-06-08 8:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2250 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 37308 bytes --]
From f439460442bc1d078abe65bb15b3a4e5977cf762 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/19] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 2ae8c6ec66b4a337b67e3a12b90e59037cf4bc23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/19] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 703841d0f2b625d5f8ccae6dfe75be101f8b5635 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/19] mutter: update to 44.2.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index e34e372b84f0..36863dfea681 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2991,10 +2991,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..01d00e8a94c2 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.2
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=37566d7e55c93dc8894e9c7f23a7ba5879a8b30baf65558223009d2b467402a1
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 84d03a5df7bcc00941d1f923e2d1bfd47cde3f4a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/19] gnome-shell: update to 44.2.
---
...2e61a9882edc722ac64da80804e75f832155.patch | 32 -------------------
.../patches/no-exe-introspection.patch | 25 +++++++++++++++
srcpkgs/gnome-shell/template | 7 ++--
3 files changed, 29 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
deleted file mode 100644
index 328ecbefb3c4..000000000000
--- a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Fri, 3 Mar 2023 17:50:10 +0900
-Subject: [PATCH] inputMethod: Try to connect require-surrounding-text signal
-
-require-surrounding-text signal has been added since IBus 1.5.28.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6405
----
- js/misc/inputMethod.js | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
-index e008e6411..aa610b3bf 100644
---- a/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
-@@ -76,7 +76,11 @@ var InputMethod = GObject.registerClass({
-
- this._context.set_client_commit_preedit(true);
- this._context.connect('commit-text', this._onCommitText.bind(this));
-- this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ try {
-+ // Require ibus 1.5.28 or later.
-+ this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ } catch (e) {
-+ }
- this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
- this._context.connect('update-preedit-text-with-mode', this._onUpdatePreeditText.bind(this));
- this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
---
-GitLab
-
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..3fc7eb89d17d 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.3
+version=44.2
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=55f279ec6303b7c0c89246eced81247c87fc1c73948f45eb212a647218d1b63f
do_check() {
mkdir /tmp/gnome-shell-xdg
From e7d8be1eef7f95f32fe44747def0cde21e3d593c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/19] gdm: update to 44.1.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 7 ++++---
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..5cdcf618cb83 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.1
revision=1
build_helper="gir"
build_style=meson
@@ -23,9 +23,10 @@ short_desc="GNOME Display Manager"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=68266b3abe7d28fc469d0067aac9c5dabb0ca7952cc1f7c238a04951f3dc5b0d
conf_files="
/etc/gdm/custom.conf
From e50e3f44e36911d0f828e23716d03a678223b888 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/19] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 75c6fdda4f578e1d5904d28675d0986bfce0dc3a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/19] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From a75ef9ff29b9684de57715ea24afeae1b880b041 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/19] gnome-settings-daemon: update to 44.1.
---
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 3d3cf393f960..a5886956cda9 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.1
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=12653b72d81f151300a47d700ac9410ac1bcce38e83f1bdd19cded2932943989
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 3ba93fca5cb9d3cafb1ed5703a08ed084f7b2027 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/19] gnome-control-center: update to 44.0.
---
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 849763d23c1e..60ca749ae8a9 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From f50ee64860b7b4fcf420d5603a56add69fec0944 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/19] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 88808d6d59ff994e690faff943b3dd6ee984251b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/19] gnome-user-docs: update to 44.1.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..350bfa523daf 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=43.0
+version=44.1
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=93f3294d43fd22f9962ccf6bd17ff64eae78a6ca063fe6c1e9bc58d00f34e3a8
From 78f62fb624dfcd63470918597f04cd7e69d27ee3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/19] xdg-desktop-portal-gnome: update to 44.1.
---
srcpkgs/xdg-desktop-portal-gnome/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..884baccf764b 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,11 +1,11 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.1
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext
+ wayland-devel"
makedepends="gtk4-devel libadwaita-devel libglib-devel
gnome-desktop-devel gsettings-desktop-schemas-devel
xdg-desktop-portal"
@@ -14,7 +14,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=3682c546c81922a5ba69d62d86f69c0c26b17c9096823f58149d0b55bbf0eedb
From c8370f963ebc3d5b76648dc86dc205db4bbd19c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/19] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From aa2dbdf860f4a518a406abef8e40a43b428d6976 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/19] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 8038dbd66deec5bbf3ea69c35906098acfeba0e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/19] zenity: update to 3.44.1.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..03b5ea4ce7c7 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.1
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
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"
+changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/zenity-3-44/NEWS"
distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=d65400aec965411f4c0b3d8e0e0dac54be55d807a29279697537da2dfee93eaa
build_options="webkit"
build_options_default="webkit"
From afd5536074735b50e797d8315aca4f6b8c847d42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/19] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From e651fb1530ce15ac94ba07f4a218380310d1aed3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 17/19] gnome: update to 44.0.
---
srcpkgs/gnome/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..6e0bdeffd1b4 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,9 +23,9 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
@@ -35,14 +35,14 @@ depends="
mousetweaks>=3.32.0
orca>=${version}
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
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>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnote>=${version}
@@ -78,7 +78,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From c771aad76b0aa00044ec8490b5640d27e5c560c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 18/19] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 095a578a49428aee79d4fb3db1ff224e806eb5e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 19/19] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (22 preceding siblings ...)
2023-06-08 8:41 ` oreo639
@ 2023-06-08 9:12 ` oreo639
2023-06-18 13:27 ` paper42
2023-06-18 18:23 ` [PR PATCH] [Merged]: " paper42
25 siblings, 0 replies; 27+ messages in thread
From: oreo639 @ 2023-06-08 9:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2250 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 38531 bytes --]
From f439460442bc1d078abe65bb15b3a4e5977cf762 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/20] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 2ae8c6ec66b4a337b67e3a12b90e59037cf4bc23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/20] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 703841d0f2b625d5f8ccae6dfe75be101f8b5635 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/20] mutter: update to 44.2.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index e34e372b84f0..36863dfea681 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2991,10 +2991,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..01d00e8a94c2 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.2
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=37566d7e55c93dc8894e9c7f23a7ba5879a8b30baf65558223009d2b467402a1
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 84d03a5df7bcc00941d1f923e2d1bfd47cde3f4a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/20] gnome-shell: update to 44.2.
---
...2e61a9882edc722ac64da80804e75f832155.patch | 32 -------------------
.../patches/no-exe-introspection.patch | 25 +++++++++++++++
srcpkgs/gnome-shell/template | 7 ++--
3 files changed, 29 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
deleted file mode 100644
index 328ecbefb3c4..000000000000
--- a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Fri, 3 Mar 2023 17:50:10 +0900
-Subject: [PATCH] inputMethod: Try to connect require-surrounding-text signal
-
-require-surrounding-text signal has been added since IBus 1.5.28.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6405
----
- js/misc/inputMethod.js | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
-index e008e6411..aa610b3bf 100644
---- a/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
-@@ -76,7 +76,11 @@ var InputMethod = GObject.registerClass({
-
- this._context.set_client_commit_preedit(true);
- this._context.connect('commit-text', this._onCommitText.bind(this));
-- this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ try {
-+ // Require ibus 1.5.28 or later.
-+ this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ } catch (e) {
-+ }
- this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
- this._context.connect('update-preedit-text-with-mode', this._onUpdatePreeditText.bind(this));
- this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
---
-GitLab
-
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..3fc7eb89d17d 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.3
+version=44.2
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=55f279ec6303b7c0c89246eced81247c87fc1c73948f45eb212a647218d1b63f
do_check() {
mkdir /tmp/gnome-shell-xdg
From e7d8be1eef7f95f32fe44747def0cde21e3d593c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/20] gdm: update to 44.1.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 7 ++++---
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..5cdcf618cb83 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.1
revision=1
build_helper="gir"
build_style=meson
@@ -23,9 +23,10 @@ short_desc="GNOME Display Manager"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=68266b3abe7d28fc469d0067aac9c5dabb0ca7952cc1f7c238a04951f3dc5b0d
conf_files="
/etc/gdm/custom.conf
From e50e3f44e36911d0f828e23716d03a678223b888 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 75c6fdda4f578e1d5904d28675d0986bfce0dc3a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From a75ef9ff29b9684de57715ea24afeae1b880b041 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.1.
---
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 3d3cf393f960..a5886956cda9 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.1
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=12653b72d81f151300a47d700ac9410ac1bcce38e83f1bdd19cded2932943989
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From 3ba93fca5cb9d3cafb1ed5703a08ed084f7b2027 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/20] gnome-control-center: update to 44.0.
---
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 849763d23c1e..60ca749ae8a9 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=2
+version=44.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From f50ee64860b7b4fcf420d5603a56add69fec0944 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From 88808d6d59ff994e690faff943b3dd6ee984251b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/20] gnome-user-docs: update to 44.1.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..350bfa523daf 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=43.0
+version=44.1
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=93f3294d43fd22f9962ccf6bd17ff64eae78a6ca063fe6c1e9bc58d00f34e3a8
From 78f62fb624dfcd63470918597f04cd7e69d27ee3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.1.
---
srcpkgs/xdg-desktop-portal-gnome/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..884baccf764b 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,11 +1,11 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.1
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext
+ wayland-devel"
makedepends="gtk4-devel libadwaita-devel libglib-devel
gnome-desktop-devel gsettings-desktop-schemas-devel
xdg-desktop-portal"
@@ -14,7 +14,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=3682c546c81922a5ba69d62d86f69c0c26b17c9096823f58149d0b55bbf0eedb
From c8370f963ebc3d5b76648dc86dc205db4bbd19c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From aa2dbdf860f4a518a406abef8e40a43b428d6976 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/20] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From 8038dbd66deec5bbf3ea69c35906098acfeba0e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/20] zenity: update to 3.44.1.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..03b5ea4ce7c7 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.1
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
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"
+changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/zenity-3-44/NEWS"
distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=d65400aec965411f4c0b3d8e0e0dac54be55d807a29279697537da2dfee93eaa
build_options="webkit"
build_options_default="webkit"
From afd5536074735b50e797d8315aca4f6b8c847d42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/20] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From dade24aa324c2bc68cac18fe57a7613022c03ba4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 17/20] gnome: update to 44.0.
---
srcpkgs/gnome/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..e3c61d304a1e 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,27 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
gspell>=1.11.0
- mousetweaks>=3.32.0
+ iio-sensor-proxy>=3.0
orca>=${version}
+ power-profiles-daemon>=0.12
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,14 +59,15 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
+ gnome-tour>=${version}
gnote>=${version}
polari>=3.38.0
rygel>=0.40.2
@@ -78,7 +80,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 8655ddf2c90adb4c05f84620a5c1ea6d5ab12643 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 18/20] budgie-desktop: rebuild for mutter 44
---
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 bfde56e60dc7..422e5419b956 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.7.1
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
From 2b0ce526b8743b83f6dc96c16377d8b9c754fbda Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 19/20] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
From c174714775e6dd5c4469ccd86e4e060e83236d6d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 19:33:10 -0700
Subject: [PATCH 20/20] gnome-tour: update to 44.0.
---
srcpkgs/gnome-tour/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template
index 56b8466925b1..e8eb54f1bf7c 100644
--- a/srcpkgs/gnome-tour/template
+++ b/srcpkgs/gnome-tour/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-tour'
pkgname=gnome-tour
-version=43.0
+version=44.0
revision=1
build_style=meson
build_helper=rust
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-tour/"
changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-tour/${version%.*}/gnome-tour-${version}.tar.xz"
-checksum=1351e419627fbd7c771932a6ef1ad80c0bf2e6828c4948a062068984ddb3cc88
+checksum=06de7677dd1c590d0ea33a032c9ccf4c37c62bc56215b823c879e42ee630c2b6
post_patch() {
[ -z "$CROSS_BUILD" ] && return 0
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (23 preceding siblings ...)
2023-06-08 9:12 ` oreo639
@ 2023-06-18 13:27 ` paper42
2023-06-18 18:23 ` [PR PATCH] [Merged]: " paper42
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2023-06-18 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2250 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/oreo639/void-packages gnome44
https://github.com/void-linux/void-packages/pull/42965
[RFC] GNOME 44
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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/42965.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome44-42965.patch --]
[-- Type: text/x-diff, Size: 38553 bytes --]
From 9275b150da3d81147815efb7da5d16a025ed2b95 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:19:50 -0700
Subject: [PATCH 01/20] gnome-desktop: update to 44.0.
---
srcpkgs/gnome-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index ec82aeb9d2bf..0857bfb93913 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
-version=43
+version=44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/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
+checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42
build_options="gir"
build_options_default="gir"
From 48881f6d9498dc042bd573438492761a810d2339 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:23:30 -0700
Subject: [PATCH 02/20] gnome-session: update to 44.0.
---
srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 --------------
srcpkgs/gnome-session/template | 7 ++++---
2 files changed, 4 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch
diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch
deleted file mode 100644
index 8292d60d5a9e..000000000000
--- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
-
- # Check for systemd
- if enable_systemd
-- systemd_dep = dependency('systemd', version: '>= 242', required: true)
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', prefix])
--
-+ systemd_userunitdir = '/tmp'
- libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
- session_bin_deps += libsystemd_dep
-
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 062d5b8b5033..ba11a1d76e28 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -1,9 +1,10 @@
# Template file for 'gnome-session'
pkgname=gnome-session
-version=43.0
+version=44.0
revision=1
build_style=meson
-configure_args="-Dsystemd_journal=false -Dsystemd_session=disable"
+configure_args="-Dsystemd_journal=false -Dsystemd_session=disable
+ -Dsystemduserunitdir=/usr/lib/systemd/user"
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 xtrans"
@@ -15,4 +16,4 @@ 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/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz"
-checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2
+checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6
From 6856f708fc64b53cadef0132d2bb78147bcfc92c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:19 -0700
Subject: [PATCH 03/20] mutter: update to 44.2.
---
common/shlibs | 8 ++---
srcpkgs/mutter/patches/x11-focus.patch | 48 --------------------------
srcpkgs/mutter/template | 25 +++++++-------
3 files changed, 17 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch
diff --git a/common/shlibs b/common/shlibs
index 494e99b89550..c293ac460c08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2987,10 +2987,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-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
+libmutter-12.so.0 mutter-44.0_1
+libmutter-clutter-12.so.0 mutter-44.0_1
+libmutter-cogl-12.so.0 mutter-44.0_1
+libmutter-cogl-pango-12.so.0 mutter-44.0_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/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch
deleted file mode 100644
index d7208572c900..000000000000
--- a/srcpkgs/mutter/patches/x11-focus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 13 Feb 2023 20:12:38 +0100
-Subject: [PATCH] x11: Avoid updating focus on wayland compositor
-
-Reading upon the history of this code branch (commits 6891ce95dce
-and 7a4c808e43d4 are most relevant), it seems this code is meant to
-synchronize Mutter focus state taking the Xserver state as true.
-That is, if Mutter tried to change the focus but something truncated
-that action, Mutter focus will be changed to be in sync with the
-Xserver again.
-
-This sounds backwards in a Wayland session. Mutter focus should be
-the canonical source, and not second-guessed from the current Xserver
-focus window. These race conditions might still apply between X11
-clients, so make these paths only apply in that case.
-
-An example of this breaking can be reproduced with a Spotify and
-Firefox window, moving the focus from the first to the second by
-going to the GNOME Shell overview in between, and clicking the
-Firefox window from there. The Firefox window will be raised, but
-refuse to take focus.
-
-It's unclear what made this an issue recently, perhaps commit
-0e6395d9328 since the now possibly ignored XI_FocusIn/Out events
-affect this accounting of the Xserver focused window. Anyhow it
-sounds better to ignore these paths for Wayland/native altogether.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
----
- src/x11/events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/x11/events.c b/src/x11/events.c
-index fd0f84c4a2..89733ba33b 100644
---- a/src/x11/events.c
-+++ b/src/x11/events.c
-@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
- if (x11_display->focused_by_us &&
- event->xany.serial > x11_display->focus_serial &&
- display->focus_window &&
-+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
- {
---
-GitLab
-
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 663d04e4386d..01d00e8a94c2 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
-version=43.3
-revision=2
+version=44.2
+revision=1
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server
xorg-server-xwayland"
makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel
json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel
- libinput-devel MesaLib-devel pipewire-devel startup-notification-devel
+ libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel
wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel"
-depends="gsettings-desktop-schemas desktop-file-utils zenity"
+depends="gsettings-desktop-schemas desktop-file-utils"
short_desc="Wayland display server, X11 window manager and compositor library"
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-43/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz"
-checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d
-shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so
- libmutter-cogl-pango-11.so"
+checksum=37566d7e55c93dc8894e9c7f23a7ba5879a8b30baf65558223009d2b467402a1
+shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so
+ libmutter-cogl-pango-12.so"
make_check=no # needs a full graphical session
# Upstream keeps pulling generated headers even though it can cause race
@@ -34,18 +35,18 @@ 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-11|g' \
- -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc
+ vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \
+ -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc
}
mutter-devel_package() {
- depends="gtk+3-devel graphene-devel clutter-devel
+ depends="gtk4-devel graphene-devel clutter-devel
libX11-devel libXtst-devel mutter-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/mutter-11/*.gir"
+ vmove "usr/lib/mutter-12/*.gir"
vmove "usr/lib/*.so"
}
}
From 51dea5e77e4c354705e78f39a98755300a505ed1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:26:38 -0700
Subject: [PATCH 04/20] gnome-shell: update to 44.2.
---
...2e61a9882edc722ac64da80804e75f832155.patch | 32 -------------------
.../patches/no-exe-introspection.patch | 25 +++++++++++++++
srcpkgs/gnome-shell/template | 7 ++--
3 files changed, 29 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch
diff --git a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch b/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
deleted file mode 100644
index 328ecbefb3c4..000000000000
--- a/srcpkgs/gnome-shell/patches/d7322e61a9882edc722ac64da80804e75f832155.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d7322e61a9882edc722ac64da80804e75f832155 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Fri, 3 Mar 2023 17:50:10 +0900
-Subject: [PATCH] inputMethod: Try to connect require-surrounding-text signal
-
-require-surrounding-text signal has been added since IBus 1.5.28.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6405
----
- js/misc/inputMethod.js | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
-index e008e6411..aa610b3bf 100644
---- a/js/misc/inputMethod.js
-+++ b/js/misc/inputMethod.js
-@@ -76,7 +76,11 @@ var InputMethod = GObject.registerClass({
-
- this._context.set_client_commit_preedit(true);
- this._context.connect('commit-text', this._onCommitText.bind(this));
-- this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ try {
-+ // Require ibus 1.5.28 or later.
-+ this._context.connect('require-surrounding-text', this._onRequireSurroundingText.bind(this));
-+ } catch (e) {
-+ }
- this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
- this._context.connect('update-preedit-text-with-mode', this._onUpdatePreeditText.bind(this));
- this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
---
-GitLab
-
diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
new file mode 100644
index 000000000000..8088fd2f5a62
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch
@@ -0,0 +1,25 @@
+commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun Mar 19 19:11:00 2023 +0100
+
+ Disable 9bc89b821cf09195418f20225bbec39c0567d263
+
+ Even if we manually define _DYNAMIC, it does not work (segfaults
+ somewhere in musl, coming from g_strsplit) and is pretty useless
+ for our case anyway.
+
+diff --git a/src/main.c b/src/main.c
+index 8cccc0a..ef6408f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -19,6 +19,10 @@
+ #include <atk-bridge.h>
+ #include <link.h>
+
++#ifdef HAVE_EXE_INTROSPECTION
++#undef HAVE_EXE_INTROSPECTION
++#endif
++
+ #ifdef HAVE_EXE_INTROSPECTION
+ #include <elf.h>
+ #endif
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 5089c10c7627..3fc7eb89d17d 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.3
+version=44.2
revision=1
build_style=meson
build_helper=gir
@@ -19,9 +19,10 @@ short_desc="GNOME core user interface"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz"
-checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e
+checksum=55f279ec6303b7c0c89246eced81247c87fc1c73948f45eb212a647218d1b63f
do_check() {
mkdir /tmp/gnome-shell-xdg
From 789eb6990c68af07291038895830f67a13a196a6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:33:33 -0700
Subject: [PATCH 05/20] gdm: update to 44.1.
---
srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------
srcpkgs/gdm/template | 7 ++++---
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch
index 03e7e6a3decb..aac0d96c726a 100644
--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@@ -1,22 +1,18 @@
--- a/meson.build
+++ b/meson.build
-@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
+@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp
+ libwrap_dep = cc.find_library('wrap')
endif
# systemd
-systemd_dep = dependency('systemd')
libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
--else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
--endif
+-systemd_multiseat_x = find_program('systemd-multi-seat-x',
+- required: false,
+- dirs: [
+- systemd_dep.get_pkgconfig_variable('systemdutildir'),
+- '/lib/systemd',
+- '/usr/lib/systemd',
+- ])
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
# Plymouth
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 424128db0fad..5cdcf618cb83 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
-version=43.0
+version=44.1
revision=1
build_helper="gir"
build_style=meson
@@ -23,9 +23,10 @@ short_desc="GNOME Display Manager"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GDM"
-changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/gnome-44/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz"
-checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294
+checksum=68266b3abe7d28fc469d0067aac9c5dabb0ca7952cc1f7c238a04951f3dc5b0d
conf_files="
/etc/gdm/custom.conf
From 89fceb2715a55623a031cd608fea2390ff963a63 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:41:13 -0700
Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0.
---
srcpkgs/gnome-shell-extensions/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 8b358e73b199..1abb3e8aaa02 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,10 +1,10 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
-version=43.1
+version=44.0
revision=1
build_style=meson
configure_args="-Dextension_set=all"
-hostmakedepends="pkg-config gettext"
+hostmakedepends="pkg-config gettext glib-devel"
depends="gnome-shell>=${version} nautilus unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -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}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz"
-checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17
+checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab
From 647810f62f5c400795e12b8c5cfd90b42376a884 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 16:58:34 -0700
Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0.
---
srcpkgs/gsettings-desktop-schemas/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 636b7a5cabf6..c08045297784 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=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -13,7 +13,7 @@ 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}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz"
-checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe
+checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e
# Package build options
build_options="gir"
From ef27cf9423db583c395396a6513a3a39a489be1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:10 -0700
Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.1.
---
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 3d3cf393f960..a5886956cda9 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
-version=43.0
-revision=2
+version=44.1
+revision=1
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -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}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz"
-checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0
+checksum=12653b72d81f151300a47d700ac9410ac1bcce38e83f1bdd19cded2932943989
CFLAGS="-UG_DISABLE_ASSERT"
if [ "$CROSS_BUILD" ]; then
From e3b550d50613723cca79a261749c4c6d66db67c4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:00:32 -0700
Subject: [PATCH 09/20] gnome-control-center: update to 44.0.
---
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 3c8a1fe43e96..33f2d653add5 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
-version=43.2
-revision=3
+version=44.2
+revision=1
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
@@ -21,9 +21,9 @@ short_desc="GNOME control center"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz"
-checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563
+checksum=0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c
make_check=no # needs X11 and requires altered filesystem
pre_build() {
From a6b33841315c517561788d8d9679636cdb4b2acc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:03:22 -0700
Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0.
---
srcpkgs/gnome-backgrounds/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 5879accd8a4b..082cf521a3f7 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-backgrounds'
pkgname=gnome-backgrounds
-version=43
+version=44.0
revision=1
build_style=meson
hostmakedepends="gettext"
@@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz"
-checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244
+checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e
From af937bc9fa3954f4fc3d5ca00f5de8f5819f335e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:23:34 -0700
Subject: [PATCH 11/20] gnome-user-docs: update to 44.1.
---
srcpkgs/gnome-user-docs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index 2f03d3bdb057..350bfa523daf 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=43.0
+version=44.1
revision=1
build_style=gnu-configure
hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs"
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
+checksum=93f3294d43fd22f9962ccf6bd17ff64eae78a6ca063fe6c1e9bc58d00f34e3a8
From d3aa77844eec586b961f5b0d1a3cc53279c9133c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:36:07 -0700
Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.1.
---
srcpkgs/xdg-desktop-portal-gnome/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template
index f6af5626ef2a..884baccf764b 100644
--- a/srcpkgs/xdg-desktop-portal-gnome/template
+++ b/srcpkgs/xdg-desktop-portal-gnome/template
@@ -1,11 +1,11 @@
# Template file for 'xdg-desktop-portal-gnome'
pkgname=xdg-desktop-portal-gnome
-reverts="44.0_1"
-version=43.1
-revision=3
+version=44.1
+revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user"
-hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext"
+hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext
+ wayland-devel"
makedepends="gtk4-devel libadwaita-devel libglib-devel
gnome-desktop-devel gsettings-desktop-schemas-devel
xdg-desktop-portal"
@@ -14,7 +14,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal"
maintainer="oreo639 <oreo6391@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS"
#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz"
-checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd
+checksum=3682c546c81922a5ba69d62d86f69c0c26b17c9096823f58149d0b55bbf0eedb
From 75b3801858030a40df8cfcd751acd30521322ebf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:39:46 -0700
Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0.
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 413a971ed87e..0086854a4daa 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
-version=3.46.0
+version=3.48.0
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts"
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-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
-checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa
+checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf
build_options="gir"
build_options_default="gir"
From 3402b0502347ee35f91ac8fb48540bb8e4ac5621 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:40:11 -0700
Subject: [PATCH 14/20] gvfs: update to 1.50.4.
---
srcpkgs/gvfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index fc90e400d928..bcd762dcd596 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,6 +1,6 @@
# Template file for 'gvfs'
pkgname=gvfs
-version=1.50.2
+version=1.50.4
revision=1
build_style=meson
configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/gvfs"
changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e
+checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd
# Manually declare shlibs used by the subpkgs.
shlib_provides="libgvfscommon.so libgvfsdaemon.so"
From cb9712a2d0963d58c104d8d65b3129918943f512 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:45:04 -0700
Subject: [PATCH 15/20] zenity: update to 3.44.1.
---
srcpkgs/zenity/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index e12e09c0afb4..03b5ea4ce7c7 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -1,18 +1,18 @@
# Template file for 'zenity'
pkgname=zenity
-version=3.43.0
+version=3.44.1
revision=1
build_style=meson
configure_args="-Dwebkitgtk=$(vopt_if webkit true false)"
-hostmakedepends="gettext itstool perl pkg-config"
+hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache"
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"
+changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/zenity-3-44/NEWS"
distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz"
-checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833
+checksum=d65400aec965411f4c0b3d8e0e0dac54be55d807a29279697537da2dfee93eaa
build_options="webkit"
build_options_default="webkit"
From e601e0ed89733829bc0806dd4ae49ccd9e3f97d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 17:52:27 -0700
Subject: [PATCH 16/20] gnome-core: update to 44.0.
---
srcpkgs/gnome-core/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index a281f5705318..3e8751ebf06b 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-core'
pkgname=gnome-core
-version=43.0
+version=44.0
revision=1
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
@@ -14,15 +14,15 @@ depends="
at-spi2-atk>=2.38.0
cantarell-fonts>=0.301
dconf>=0.40.0
- evolution-data-server>=3.46.0
+ evolution-data-server>=3.48.0
folks>=0.15.5
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
geocode-glib>=3.26.4
- gjs>=1.74.0
- glib>=2.74.0
- glib-networking>=2.74.0
+ gjs>=1.76.0
+ glib>=2.76.0
+ glib-networking>=2.76.0
gmime>=3.2.7
gnome-backgrounds>=${version}
gnome-bluetooth>=42.4
@@ -31,7 +31,7 @@ depends="
gnome-desktop>=${version}
gnome-initial-setup>=${version}
gnome-keyring>=42.0
- gnome-online-accounts>=3.46.0
+ gnome-online-accounts>=3.48.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
@@ -44,7 +44,7 @@ depends="
mutter>=${version}
nautilus>=${version}
sushi>=43.0
- tracker>=3.4.0
- yelp>=42
+ tracker>=3.5.0
+ yelp>=42.0
xdg-desktop-portal-gnome>=${version}
zenity>=3.${version}"
From 73b575324698d83ff03ace0d6155a3c801346564 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 14:35:28 -0700
Subject: [PATCH 17/20] gnome: update to 44.0.
---
srcpkgs/gnome/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 6bb8cfecf3cf..e3c61d304a1e 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
-version=43.0
-revision=2
+version=44.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>=${version}
+ cheese>=43
eog>=${version}
evince>=${version}
- file-roller>=${version}
+ file-roller>=43
gnome-calculator>=${version}
gnome-calendar>=${version}
gnome-characters>=${version}
@@ -23,26 +23,27 @@ depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-remote-desktop>=${version}
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
gnome-tweaks>=42.beta
gnome-weather>=${version}
gsound>=1.0.3
gspell>=1.11.0
- mousetweaks>=3.32.0
+ iio-sensor-proxy>=3.0
orca>=${version}
+ power-profiles-daemon>=0.12
phodav>=3.0
- simple-scan>=42
- totem>=${version}"
+ simple-scan>=${version}
+ totem>=43"
_apps_depends="
- Endeavour>=${version}
+ Endeavour>=43
bijiben>=40.1
dconf-editor>=3.38.3
- devhelp>=${version}
+ devhelp>=43
epiphany>=${version}
evolution>=3.44.0
ghex>=${version}
@@ -58,14 +59,15 @@ _apps_depends="
gnome-disk-utility>=${version}
gnome-font-viewer>=${version}
gnome-maps>=${version}
- gnome-music>=42
+ gnome-music>=${version}
gnome-nettool>=42
gnome-photos>=${version}
gnome-screenshot>=41.0
gnome-sound-recorder>=42
- gnome-system-monitor>=42
+ gnome-system-monitor>=${version}
gnome-console>=${version}
gnome-text-editor>=${version}
+ gnome-tour>=${version}
gnote>=${version}
polari>=3.38.0
rygel>=0.40.2
@@ -78,7 +80,7 @@ _games_collection_depends="
five-or-more>=3.32.2
four-in-a-row>=3.38.1
gnome-2048>=3.38.2
- gnome-chess>=${version}
+ gnome-chess>=43
gnome-klotski>=3.38.2
gnome-mahjongg>=3.38.3
gnome-mines>=40.0
From 72837f73ec2c49557650497308d8902669491ce3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 26 Mar 2023 16:19:53 -0700
Subject: [PATCH 18/20] budgie-desktop: rebuild for mutter 44
---
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 48c4dd2b55c9..80da2a8a367a 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.7.2
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false -Duse-old-zenity=true"
From cea9c6efc9c7ecb85195f34201b5716fe97d99c1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 3 Apr 2023 01:45:35 -0700
Subject: [PATCH 19/20] GPaste: update to 44.0.
---
srcpkgs/GPaste/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template
index 80485cb88440..61a3db599d1e 100644
--- a/srcpkgs/GPaste/template
+++ b/srcpkgs/GPaste/template
@@ -1,6 +1,6 @@
# Template file for 'GPaste'
pkgname=GPaste
-version=43.0
+version=44.0
revision=1
build_helper="gir"
build_style=meson
@@ -11,15 +11,15 @@ 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 gcr-devel"
+ $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-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-43/NEWS"
+#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS"
changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS"
distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz"
-checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de
+checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a
build_options="gnome_shell"
desc_option_gnome_shell="Build GNOME Shell integration and extension"
From 6f2a9577321c3233d7b46ea18e3e93a9e957f7fe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Mar 2023 19:33:10 -0700
Subject: [PATCH 20/20] gnome-tour: update to 44.0.
---
srcpkgs/gnome-tour/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template
index 56b8466925b1..e8eb54f1bf7c 100644
--- a/srcpkgs/gnome-tour/template
+++ b/srcpkgs/gnome-tour/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-tour'
pkgname=gnome-tour
-version=43.0
+version=44.0
revision=1
build_style=meson
build_helper=rust
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-tour/"
changelog="https://gitlab.gnome.org/GNOME/gnome-tour/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-tour/${version%.*}/gnome-tour-${version}.tar.xz"
-checksum=1351e419627fbd7c771932a6ef1ad80c0bf2e6828c4948a062068984ddb3cc88
+checksum=06de7677dd1c590d0ea33a032c9ccf4c37c62bc56215b823c879e42ee630c2b6
post_patch() {
[ -z "$CROSS_BUILD" ] && return 0
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PR PATCH] [Merged]: [RFC] GNOME 44
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
` (24 preceding siblings ...)
2023-06-18 13:27 ` paper42
@ 2023-06-18 18:23 ` paper42
25 siblings, 0 replies; 27+ messages in thread
From: paper42 @ 2023-06-18 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2094 bytes --]
There's a merged pull request on the void-packages repository
[RFC] GNOME 44
https://github.com/void-linux/void-packages/pull/42965
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Depends on:
+ https://github.com/void-linux/void-packages/pull/41698
+ https://github.com/void-linux/void-packages/pull/42916
+ https://github.com/void-linux/void-packages/pull/42922
+ https://github.com/void-linux/void-packages/pull/42967
+ https://github.com/void-linux/void-packages/pull/43034
+ https://github.com/void-linux/void-packages/pull/43035
+ https://github.com/void-linux/void-packages/pull/43036
+ https://github.com/void-linux/void-packages/pull/43037
+ https://github.com/void-linux/void-packages/pull/43038
+ https://github.com/void-linux/void-packages/pull/42935
Related:
+ https://github.com/void-linux/void-packages/pull/42964
+ https://github.com/void-linux/void-packages/pull/42969
+ https://github.com/void-linux/void-packages/pull/42460
+ https://github.com/void-linux/void-packages/pull/43008
+ https://github.com/void-linux/void-packages/pull/42997
+ https://github.com/void-linux/void-packages/pull/42971
Depends on gnome-desktop 44:
+ xdg-desktop-portal-gnome
<!--
#### 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] 27+ messages in thread
end of thread, other threads:[~2023-06-18 18:23 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-24 0:53 [PR PATCH] [RFC] GNOME 44 oreo639
2023-03-24 0:55 ` [PR PATCH] [Updated] " oreo639
2023-03-24 10:41 ` oreo639
2023-03-26 9:45 ` [PR REVIEW] " paper42
2023-03-26 9:45 ` paper42
2023-03-26 10:39 ` [PR PATCH] [Updated] " oreo639
2023-03-26 10:40 ` [PR REVIEW] " oreo639
2023-03-26 20:25 ` [PR PATCH] [Updated] " oreo639
2023-03-26 21:35 ` oreo639
2023-03-26 21:38 ` oreo639
2023-03-26 23:24 ` oreo639
2023-03-27 23:07 ` oreo639
2023-03-27 23:11 ` oreo639
2023-03-30 23:00 ` oreo639
2023-04-03 8:45 ` oreo639
2023-04-03 8:47 ` oreo639
2023-04-03 19:18 ` oreo639
2023-04-03 19:25 ` oreo639
2023-04-07 20:38 ` oreo639
2023-04-07 20:54 ` oreo639
2023-04-07 20:56 ` oreo639
2023-04-07 22:54 ` oreo639
2023-04-28 21:19 ` oreo639
2023-06-08 8:41 ` oreo639
2023-06-08 9:12 ` oreo639
2023-06-18 13:27 ` paper42
2023-06-18 18:23 ` [PR PATCH] [Merged]: " paper42
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).