From f6b9c2d5e75001ef4b45fee9db9848ef1d12a1d4 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:01:19 -0700 Subject: [PATCH 01/50] xdg-desktop-portal-gtk: update to 1.14.0 --- srcpkgs/xdg-desktop-portal-gtk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template index 7517d1b32d8d..fac85b7eb1a1 100644 --- a/srcpkgs/xdg-desktop-portal-gtk/template +++ b/srcpkgs/xdg-desktop-portal-gtk/template @@ -1,18 +1,18 @@ # Template file for 'xdg-desktop-portal-gtk' pkgname=xdg-desktop-portal-gtk -version=1.8.0 +version=1.14.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext" makedepends="flatpak-devel gtk+3-devel libxslt-devel libglib-devel - xdg-desktop-portal gnome-desktop-devel" + xdg-desktop-portal gsettings-desktop-schemas-devel" depends="xdg-desktop-portal" short_desc="Portal backend service for Flatpak using GTK+" maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal-gtk" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f +checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954 post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" From 2cdd46aea78d2d47602ae0a86865205e615f1dc8 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 19:25:46 -0700 Subject: [PATCH 02/50] New package: xdg-desktop-portal-gnome-42.1 --- srcpkgs/xdg-desktop-portal-gnome/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template new file mode 100644 index 000000000000..c90080892a16 --- /dev/null +++ b/srcpkgs/xdg-desktop-portal-gnome/template @@ -0,0 +1,18 @@ +# Template file for 'xdg-desktop-portal-gnome' +pkgname=xdg-desktop-portal-gnome +version=42.1 +revision=1 +build_style=meson +configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user" +hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext" +makedepends="gtk4-devel libadwaita-devel libglib-devel + gnome-desktop-devel gsettings-desktop-schemas-devel + xdg-desktop-portal" +depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus" +short_desc="GNOME portal backend for xdg-desktop-portal" +maintainer="oreo639 " +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-42/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=7685b6695cd98be8238171020c1c9713c4647d2680006c98ce8e4df858312cd2 From d574d37515ef96ca440b7e1909c03b27327cb6bc Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:32:28 -0700 Subject: [PATCH 03/50] adwaita-icon-theme: update to 42.0 --- srcpkgs/adwaita-icon-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template index a60f4a865de9..983ae9b69d55 100644 --- a/srcpkgs/adwaita-icon-theme/template +++ b/srcpkgs/adwaita-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'adwaita-icon-theme' pkgname=adwaita-icon-theme -version=41.0 +version=42.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Enno Boland " license="LGPL-3.0-or-later, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme" distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" -checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba +checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0 From c389e3e7533547a3a525923b314e812d7e9010af Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:34:11 -0700 Subject: [PATCH 04/50] baobab: update to 42.0 --- srcpkgs/baobab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index 259cc5bcf1a1..23e3372ea262 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,14 +1,14 @@ # Template file for 'baobab' pkgname=baobab -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel vala" -makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel" +makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel" depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14" short_desc="Graphical directory tree analyzer for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later" homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855 +checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc From fb091989fd5467a408da3ac1ada713119be65e0b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:43:30 -0700 Subject: [PATCH 05/50] libgweather: update to 4.0.0 --- common/shlibs | 2 +- .../patches/fix-cross-introspection.patch | 14 +++++ ...metar-test-dont-use-known-duplicates.patch | 51 +++++++++++++++++++ srcpkgs/libgweather/template | 20 +++++--- srcpkgs/libgweather/update | 1 + 5 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch create mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch diff --git a/common/shlibs b/common/shlibs index d6a318a81250..7dd4039d1ba3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1129,7 +1129,7 @@ libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 libsecret-1.so.0 libsecret-0.10_1 -libgweather-3.so.16 libgweather-3.34.0_1 +libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 libibus-1.0.so.5 ibus-1.4.99.20120917_1 diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch new file mode 100644 index 000000000000..fbec0c3317fa --- /dev/null +++ b/srcpkgs/libgweather/patches/fix-cross-introspection.patch @@ -0,0 +1,14 @@ +diff --git a/libgweather/meson.build b/libgweather/meson.build +index 08311af4..ef554f2e 100644 +--- a/libgweather/meson.build ++++ b/libgweather/meson.build +@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', + ) + + g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) +-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() ++build_gir = get_option('introspection') and g_ir_scanner.found() + + enable_vala = get_option('enable_vala') + vapigen = find_program('vapigen', required: enable_vala == 'true') + diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch new file mode 100644 index 000000000000..5646cd24cc21 --- /dev/null +++ b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch @@ -0,0 +1,51 @@ +From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001 +From: Pierre Labastie +Date: Sun, 10 Apr 2022 22:24:47 +0200 +Subject: [PATCH] metar test: Don't use "known" duplicates + +The metar list provided by NOAA contains duplicate ICAO codes. +Those duplicates may change over time, so it does not make sense +to use an array of known duplicates. Presently a duplicate is rejected +when it is known, and inserted if it is not, leading to a difference +in the number of insertions and the number of keys, so that the test +fails. If any duplicate is rejected, the number of insertions is +always equal to the number of keys (unless something goes wrong +in g_hash_table_insert). And this is the default behavior for known +duplicates anyway. + +Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168 +--- + libgweather/tests/metar.c | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c +index 7d6c7c04..a6fa7e79 100644 +--- a/libgweather/tests/metar.c ++++ b/libgweather/tests/metar.c +@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents) + continue; + } + ++ /* If it is a duplicate discard it */ + if (g_hash_table_lookup (stations_ht, station)) { +- const char * const known_duplicates[] = { +- "VOGO", +- "KHQG", +- "KOEL", +- "KTQK", +- "KX26", +- NULL +- }; +- if (g_strv_contains (known_duplicates, station)) { +- g_free (station); +- continue; +- } + g_test_message ("Weather station '%s' already defined\n", station); ++ g_free (station); ++ continue; + } + + g_hash_table_insert (stations_ht, station, g_strdup (line)); +-- +GitLab + diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 857006ea8786..da1cea0e42c9 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,11 +1,14 @@ # Template file for 'libgweather' pkgname=libgweather -version=40.0 +reverts="40.0_1" +version=4.0.0 revision=1 build_style=meson build_helper="gir" -configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo" -hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)" +configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) + $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo" +hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala) + $(vopt_if gtk_doc gi-docgen)" makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" depends="tzdata" short_desc="GNOME Weather information access library" @@ -13,15 +16,15 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6 +checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c -build_options="gir" -build_options_default="gir" +build_options="gir gtk_doc" +build_options_default="gir gtk_doc" post_patch() { # This test requires LC_IDENTIFICATION, which is a GLIBC's extension # And looks like we didn't ship it. - vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c + vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c } libgweather-devel_package() { @@ -35,5 +38,8 @@ libgweather-devel_package() { vmove usr/share/gir-1.0 vmove usr/share/vala fi + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/doc + fi } } diff --git a/srcpkgs/libgweather/update b/srcpkgs/libgweather/update index e69de29bb2d1..496ee53deb13 100644 --- a/srcpkgs/libgweather/update +++ b/srcpkgs/libgweather/update @@ -0,0 +1 @@ +ignore="40.*" From 0c94f3cbba9729ed4ff48c0f40a0377f4dbe41e2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:53:41 -0700 Subject: [PATCH 06/50] gcr: update to 3.41.0 --- srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++ srcpkgs/gcr/template | 10 ++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch new file mode 100644 index 000000000000..ca2660244c37 --- /dev/null +++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch @@ -0,0 +1,23 @@ +From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Sun, 24 Oct 2021 10:26:03 +0200 +Subject: [PATCH] Unbreak build without systemd. + +This fixes the check for WITH_SYSTEMD and prevents a fatal error: +'systemd/sd-daemon.h' file not found when building with systemd disabled. +--- + gcr/gcr-ssh-agent-service.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c +index 3b5a4ca..b7e8928 100644 +--- a/gcr/gcr-ssh-agent-service.c ++++ b/gcr/gcr-ssh-agent-service.c +@@ -39,7 +39,7 @@ + #include + #include + +-#ifdef WITH_SYSTEMD ++#if WITH_SYSTEMD + #include + #endif diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index e42bd6277d1b..5ab7455fb539 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,20 +1,20 @@ # Template file for 'gcr' pkgname=gcr -version=3.40.0 +version=3.41.0 revision=1 build_style=meson build_helper="gir" -hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config +hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh libxslt $(vopt_if vala vala)" -makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel +makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel $(vopt_if vala vala)" depends="desktop-file-utils hicolor-icon-theme gnupg2" short_desc="GNOME crypto package" maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" -homepage="http://www.gnome.org" +homepage="https://gitlab.gnome.org/GNOME/gcr" distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" -checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 +checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01 if [ "$CROSS_BUILD" ]; then configure_args="-Dgtk_doc=false" From c328554c57dba74501f4f2e6a54c2284819f6951 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:56:12 -0700 Subject: [PATCH 07/50] gnome-backgrounds: update to 42.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 d0cb63ab2183..46b86e2f6317 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends=gettext @@ -9,4 +9,4 @@ maintainer="Enno Boland " 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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145 +checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d From 152268a891a5641ab31d1693ab4605efbef19412 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:06:44 -0700 Subject: [PATCH 08/50] gnome-settings-daemon: update to 42.2 --- .../patches/meson-0.61.patch | 38 ------------------- srcpkgs/gnome-settings-daemon/template | 7 ++-- 2 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch deleted file mode 100644 index b7c03ca2da63..000000000000 --- a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch +++ /dev/null @@ -1,38 +0,0 @@ -From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt -Date: Wed, 26 Jan 2022 23:08:58 +0100 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. ---- - plugins/power/meson.build | 1 - - plugins/wacom/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f2..014bb6da 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -76,7 +76,6 @@ if host_is_linux - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, -diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build -index d8dd0ec7..c00323d4 100644 ---- a/plugins/wacom/meson.build -+++ b/plugins/wacom/meson.build -@@ -7,7 +7,6 @@ policy_in = configure_file( - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index c8be36b2a457..24af1a5094b7 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=41.0 -revision=2 +version=42.2 +revision=1 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt @@ -18,8 +18,9 @@ short_desc="GNOME settings daemon" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" +changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884 +checksum=9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00 CFLAGS="-UG_DISABLE_ASSERT" if [ "$CROSS_BUILD" ]; then From b2d3c0acd6a23710e10383d8b2af5cfe8b7011d2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:07:24 -0700 Subject: [PATCH 09/50] gnome-control-center: update to 42.2 --- srcpkgs/gnome-control-center/template | 35 +++++++++++---------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 92b9cb3d2f4a..3b45ac02b51c 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,43 +1,36 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=41.4 -revision=2 +version=42.2 +revision=1 build_style=meson build_helper="gir" -configure_args="-Dcheese=$(vopt_if cheese true false)" hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config polkit python3" makedepends="ModemManager-devel accountsservice-devel alsa-plugins colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-menus-devel gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel - libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel + libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel - pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel - libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel - clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel - libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)" + pulseaudio-devel samba-devel tzdata upower-devel vala-devel + libxml2-devel libX11-devel gtk4-devel libadwaita-devel cups-devel libgudev-devel + libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel + gsound-devel gcr-devel gnutls-devel" depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes - gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop" + gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd" short_desc="GNOME control center" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" -changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9 +checksum=78ba257b09fbddc058879174d13837a79cd59e95a8490117e4cca2e522c9eb00 +make_check=no # needs X11 and requires altered filesystem -build_options="cheese" -build_options_default="cheese" - -desc_option_cheese="Add support for adding user account images with your webcam" - -# needs X11 and requires altered filesystem -do_check() { - : +pre_build() { + # q66: racey, included from elsewhere but not dependencies + ninja -C build panels/network/cc-network-resources.h } -CFLAGS="-fcommon" - gnome-control-center-devel_package() { short_desc+=" - development files" pkg_install() { From e88c8b7b1e89af7a60c098e85f82f3a86a5f8d28 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:08:25 -0700 Subject: [PATCH 10/50] evolution-data-server: update to 3.44.2 --- srcpkgs/evolution-data-server/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 7d6937d97eaa..56a66aa0bfe0 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,13 +1,13 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.42.3 -revision=2 +version=3.44.2 +revision=1 build_style=cmake build_helper="gir qemu" configure_args="-DENABLE_UOA=OFF - -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc + -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')" -hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel +hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel $(vopt_if gir vala)" makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel @@ -18,9 +18,9 @@ short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d +checksum=2ed72afe4d6bb170f8728faea0907fee10212dfde7a9fab82fbcc83d0f22f028 build_options="gir" build_options_default="gir" From e3647846f17b665fea722cf071f3e5518c5d61ec Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:14:01 -0700 Subject: [PATCH 11/50] gnome-desktop: update to 42.2 --- common/shlibs | 3 + srcpkgs/gnome-desktop/patches/build.patch | 18 ---- .../patches/optional_introspection.patch | 93 +++++++++++++++++++ .../patches/optionalise-gir.patch | 47 ---------- srcpkgs/gnome-desktop/template | 8 +- 5 files changed, 100 insertions(+), 69 deletions(-) delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch create mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch diff --git a/common/shlibs b/common/shlibs index 7dd4039d1ba3..a6792b61ffa6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1128,6 +1128,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 +libgnome-desktop-4.so.1 gnome-desktop-42.0_1 +libgnome-bg-4.so.1 gnome-desktop-42.0_1 +libgnome-rr-4.so.1 gnome-desktop-42.0_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch deleted file mode 100644 index 1f3acd965fea..000000000000 --- a/srcpkgs/gnome-desktop/patches/build.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 4f55ff078411993b782e74ea18c5c6ab35adf685 -Author: Daniel Kolesa -Date: Wed Aug 12 05:26:00 2020 +0200 - - bla - -diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h -index 111bab3..7698672 100644 ---- a/libgnome-desktop/gnome-rr.h -+++ b/libgnome-desktop/gnome-rr.h -@@ -28,6 +28,7 @@ - #error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h - #endif - -+#include - #include - #include - diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch new file mode 100644 index 000000000000..b960ef27c588 --- /dev/null +++ b/srcpkgs/gnome-desktop/patches/optional_introspection.patch @@ -0,0 +1,93 @@ +From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Wed, 18 Sep 2019 22:28:21 +0300 +Subject: [PATCH] meson: Add optionality for introspection + +--- + libgnome-desktop/meson.build | 48 +++++++++++++++++++----------------- + meson_options.txt | 4 +++ + 2 files changed, 30 insertions(+), 22 deletions(-) + +diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build +index a0fb11f8..375cf57c 100644 +--- a/libgnome-desktop/meson.build ++++ b/libgnome-desktop/meson.build +@@ -125,17 +125,19 @@ if get_option('build_gtk4') + ], + ) + +- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, +- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], +- export_packages: 'gnome-desktop-4', +- namespace: 'GnomeDesktop', +- nsversion: '4.0', +- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], +- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome', +- install: true, +- ) ++ if get_option('introspection') ++ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, ++ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], ++ export_packages: 'gnome-desktop-4', ++ namespace: 'GnomeDesktop', ++ nsversion: '4.0', ++ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], ++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], ++ identifier_prefix: 'Gnome', ++ symbol_prefix: 'gnome', ++ install: true, ++ ) ++ endif + + pkg.generate( + libgnome_desktop_base, +@@ -255,17 +257,19 @@ if get_option('legacy_library') + ], + ) + +- gnome.generate_gir(libgnome_desktop, +- sources: introspection_sources + libgnome_desktop_headers, +- export_packages: 'gnome-desktop-3.0', +- namespace: 'GnomeDesktop', +- nsversion: '3.0', +- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], +- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome', +- install: true +- ) ++ if get_option('introspection') ++ gnome.generate_gir(libgnome_desktop, ++ sources: introspection_sources + libgnome_desktop_headers, ++ export_packages: 'gnome-desktop-3.0', ++ namespace: 'GnomeDesktop', ++ nsversion: '3.0', ++ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], ++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], ++ identifier_prefix: 'Gnome', ++ symbol_prefix: 'gnome', ++ install: true ++ ) ++ endif + + pkg.generate( + libraries: libgnome_desktop, +diff --git a/meson_options.txt b/meson_options.txt +index e17e7330..c4db6eaf 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -17,6 +17,10 @@ option('debug_tools', + type: 'boolean', value: true, description: 'Build debug tools' + ) + ++option('introspection', ++ type: 'boolean', value: true, description: 'Whether to build introspection files' ++) ++ + option('udev', + type: 'feature', description: 'Udev support' + ) +-- +GitLab diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch deleted file mode 100644 index ea4da3efc085..000000000000 --- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index c365b44..33af6f4 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency( - link_with: libgnome_desktop - ) - --gnome.generate_gir(libgnome_desktop, -- sources: introspection_sources + libgnome_desktop_headers, -- export_packages: 'gnome-desktop-3.0', -- namespace: 'GnomeDesktop', -- nsversion: '3.0', -- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -- extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API', -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true --) -+if get_option('introspection') -+ gnome.generate_gir(libgnome_desktop, -+ sources: introspection_sources + libgnome_desktop_headers, -+ export_packages: 'gnome-desktop-3.0', -+ namespace: 'GnomeDesktop', -+ nsversion: '3.0', -+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -+ extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API', -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true -+ ) -+endif - - desktop_pc = pkg.generate( - libraries: libgnome_desktop, -diff --git a/meson_options.txt b/meson_options.txt -index e3402a1..1dbaf5d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -28,3 +28,7 @@ option('gtk_doc', - option('installed_tests', - type: 'boolean', value: false, description: 'Enable installed tests' - ) -+ -+option('introspection', -+ type: 'boolean', value: false, description: 'Build GIR data' -+) diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index aa33c182a392..50df177b7bd0 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,13 +1,13 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=41.3 +version=42.2 revision=1 build_style=meson build_helper="gir" configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" -makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel +makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel libxkbfile-devel libXrandr-devel gdk-pixbuf-devel" depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config" @@ -15,9 +15,9 @@ short_desc="GNOME desktop management utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" +changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6 -make_check=no # needs X +checksum=f42b14eac8d1456c2bfc1fbc97ef6afe49c8dd6f57796e8fd5feb39331ed55bd build_options="gir" build_options_default="gir" From 9d262c6941b2a379860490dd585e66ee24d2e6a1 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:16:37 -0700 Subject: [PATCH 12/50] gnome-session: update to 42.0 --- srcpkgs/gnome-session/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index ff8dde48c7c0..cce39e931eb8 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,6 +1,6 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=41.3 +version=42.0 revision=1 build_style=meson configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" @@ -14,8 +14,9 @@ short_desc="GNOME session management utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" +changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39 +checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa post_install() { rm -rf ${DESTDIR}/tmp From 23e167612a338293deb1b50cf1d176a71f640f49 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:25:25 -0700 Subject: [PATCH 13/50] gnome-shell: update to 42.2 --- srcpkgs/gnome-shell/patches/ibus-spawn.patch | 105 +++++++++++++++++++ srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 --------------- srcpkgs/gnome-shell/template | 15 +-- 3 files changed, 113 insertions(+), 89 deletions(-) create mode 100644 srcpkgs/gnome-shell/patches/ibus-spawn.patch delete mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-shell/patches/ibus-spawn.patch b/srcpkgs/gnome-shell/patches/ibus-spawn.patch new file mode 100644 index 000000000000..7d24431249b5 --- /dev/null +++ b/srcpkgs/gnome-shell/patches/ibus-spawn.patch @@ -0,0 +1,105 @@ +From e1c8e2dcccf45825820f4ec8b2d7be58c05bb884 Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 26 Jun 2022 17:56:48 -0700 +Subject: [PATCH 1/2] ibusManager: Pass on envrionment variables to ibus-daemon + +Previously only DISPLAY was being passed on to ibus, which results in issues +with missing the WAYLAND_DISPLAY or the DBUS_SESSION_BUS_ADDRESS environemnt +variables for example. +--- + js/misc/ibusManager.js | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js +index 55c0d308b4..420459b769 100644 +--- a/js/misc/ibusManager.js ++++ b/js/misc/ibusManager.js +@@ -90,15 +90,25 @@ var IBusManager = class { + this._spawn(Meta.is_wayland_compositor() ? [] : ['--xim']); + } + ++ _tryAppendEnv(env, varname) { ++ const value = GLib.getenv(varname); ++ if (value) ++ env.push(`${varname}=${value}`); ++ } ++ + _spawn(extraArgs = []) { + try { + let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs]; +- // Forward the right X11 Display for ibus-x11 +- let display = GLib.getenv('GNOME_SETUP_DISPLAY'); + let env = []; + +- if (display) +- env.push('DISPLAY=%s'.format(display)); ++ this._tryAppendEnv(env, 'DBUS_SESSION_BUS_ADDRESS'); ++ this._tryAppendEnv(env, 'WAYLAND_DISPLAY'); ++ this._tryAppendEnv(env, 'HOME'); ++ this._tryAppendEnv(env, 'LANG'); ++ this._tryAppendEnv(env, 'LC_CTYPE'); ++ this._tryAppendEnv(env, 'COMPOSE_FILE'); ++ this._tryAppendEnv(env, 'DISPLAY'); ++ + GLib.spawn_async( + null, cmdLine, env, + GLib.SpawnFlags.SEARCH_PATH, +-- +GitLab + + +From 61db8d8a6ad70c2379d42eb4879b30aa5c9d3da8 Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Mon, 27 Jun 2022 13:38:55 -0700 +Subject: [PATCH 2/2] ibusManager: Avoid double fork triggering parent death in + ibus + +--- + js/misc/ibusManager.js | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js +index 420459b769..4157f08702 100644 +--- a/js/misc/ibusManager.js ++++ b/js/misc/ibusManager.js +@@ -98,6 +98,7 @@ var IBusManager = class { + + _spawn(extraArgs = []) { + try { ++ let success_, pid; + let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs]; + let env = []; + +@@ -109,9 +110,13 @@ var IBusManager = class { + this._tryAppendEnv(env, 'COMPOSE_FILE'); + this._tryAppendEnv(env, 'DISPLAY'); + +- GLib.spawn_async( ++ // We use DO_NOT_REAP_CHILD because we don't want to ++ // double-fork internally because then we lose the ++ // parent-child relationship, which ibus relies on to ++ // detect parent death. ++ [success_, pid] = GLib.spawn_async( + null, cmdLine, env, +- GLib.SpawnFlags.SEARCH_PATH, ++ GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, + () => { + try { + global.context.restore_rlimit_nofile(); +@@ -119,6 +124,13 @@ var IBusManager = class { + } + } + ); ++ GLib.child_watch_add( ++ GLib.PRIORITY_DEFAULT, ++ pid, ++ _pid => { ++ GLib.spawn_close_pid(_pid); ++ } ++ ); + } catch (e) { + log(`Failed to launch ibus-daemon: ${e.message}`); + } +-- +GitLab + diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch deleted file mode 100644 index ad3b7ef3923a..000000000000 --- a/srcpkgs/gnome-shell/patches/meson-0.61.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Unlike other targets that take a name, i18n.merge_file() does not. - -Part-of: ---- - data/meson.build | 2 +- - src/calendar-server/meson.build | 2 +- - subprojects/extensions-app/data/meson.build | 2 +- - subprojects/extensions-app/data/metainfo/meson.build | 2 +- - subprojects/extensions-tool/src/templates/meson.build | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index f924fdf806..76ae45c93a 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') - - foreach desktop_file : desktop_files -- i18n.merge_file('desktop', -+ i18n.merge_file( - input: configure_file( - input: desktop_file + '.in.in', - output: desktop_file + '.in', -diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build -index 7363282a59..8b4ef411c8 100644 ---- a/src/calendar-server/meson.build -+++ b/src/calendar-server/meson.build -@@ -27,7 +27,7 @@ configure_file( - install_dir: servicedir - ) - --i18n.merge_file('evolution-calendar.desktop', -+i18n.merge_file( - input: 'evolution-calendar.desktop.in', - output: 'evolution-calendar.desktop', - po_dir: po_dir, -diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build -index d7e7d4001c..4b601e8bd1 100644 ---- a/subprojects/extensions-app/data/meson.build -+++ b/subprojects/extensions-app/data/meson.build -@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('app_id', app_id) - desktopconf.set('prgname', prgname) - --i18n.merge_file('desktop', -+i18n.merge_file( - input: configure_file( - input: base_id + '.desktop.in.in', - output: desktop_file + '.in', -diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build -index c4962c0576..a19bfa80a4 100644 ---- a/subprojects/extensions-app/data/metainfo/meson.build -+++ b/subprojects/extensions-app/data/metainfo/meson.build -@@ -1,5 +1,5 @@ - metainfo = app_id + '.metainfo.xml' --i18n.merge_file(metainfo, -+i18n.merge_file( - input: base_id + '.metainfo.xml.in', - output: metainfo, - po_dir: po_dir, -diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build -index 670e2bf448..d693bfaddb 100644 ---- a/subprojects/extensions-tool/src/templates/meson.build -+++ b/subprojects/extensions-tool/src/templates/meson.build -@@ -4,7 +4,7 @@ template_metas = [ - ] - template_deps = [] - foreach template : template_metas -- template_deps += i18n.merge_file(template, -+ template_deps += i18n.merge_file( - input: template + '.in', - output: template, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 77450cb127a8..548e03cce9e4 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,26 +1,27 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=41.5 -revision=2 +version=42.2 +revision=1 build_style=meson build_helper=gir configure_args="-Dsystemd=false -Dtests=false" hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc - asciidoc perl glib-devel gettext gjs-devel" + asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache" makedepends="gnome-control-center-devel at-spi2-atk-devel evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel - gnome-bluetooth1-devel pipewire-devel gstreamer1-devel" -depends="elogind gnome-control-center gsettings-desktop-schemas upower" + gnome-bluetooth-devel pipewire-devel gstreamer1-devel" +depends="elogind gnome-control-center gsettings-desktop-schemas upower + gstreamer1-pipewire gst-plugins-good1" checkdepends="xvfb-run mesa-dri $depends" short_desc="GNOME core user interface" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz" -checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5 +checksum=67eb13cd175e2031a838ccea92e90374ae0e9ccba61683fbacd67ff6afdd590e do_check() { mkdir /tmp/gnome-shell-xdg From 7b5c11d82f66e8dff4216208aa7a7ec4fba87cad Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:19:45 -0700 Subject: [PATCH 14/50] gnome-shell-extensions: update to 42.2 --- 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 3f4be3c068de..df153fed82c6 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=41.2 +version=42.2 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -10,6 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19 +checksum=65718440aa1c2f17bb09222ff802699f641fd51279221f04cb19193968ec0b30 From f4d4ef2acb99db7c6493f9cad64fc8860f07ce51 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:26:25 -0700 Subject: [PATCH 15/50] mutter: update to 42.2 --- common/shlibs | 8 ++++---- srcpkgs/mutter/template | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index a6792b61ffa6..ab419c75c49e 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-9.so.0 mutter-41.0_1 -libmutter-clutter-9.so.0 mutter-41.0_1 -libmutter-cogl-9.so.0 mutter-41.0_1 -libmutter-cogl-pango-9.so.0 mutter-41.0_1 +libmutter-10.so.0 mutter-42.0_1 +libmutter-clutter-10.so.0 mutter-42.0_1 +libmutter-cogl-10.so.0 mutter-42.0_1 +libmutter-cogl-pango-10.so.0 mutter-42.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.6 slop-7.6_1 diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index e3f7f7bf1ca8..945f5d266f77 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=41.5 +version=42.2 revision=1 build_helper="gir" build_style=meson @@ -18,11 +18,11 @@ short_desc="Wayland display server, X11 window manager and compositor library" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" -changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7 -shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so - libmutter-cogl-pango-9.so" +checksum=bd30d78be7d170013a0a8bcc837cec5ee6c44d770ff00674dcdfc28b3426b34c +shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so + libmutter-cogl-pango-10.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -34,9 +34,9 @@ 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-9|g' \ - -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ + -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc } mutter-devel_package() { @@ -46,7 +46,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-9/*.gir" + vmove "usr/lib/mutter-10/*.gir" vmove "usr/lib/*.so" } } From e21e85b9bd7b875b74d141f548bacf0769ea59e0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:39:20 -0700 Subject: [PATCH 16/50] gdm: update to 42.0 --- srcpkgs/gdm/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index ee14eb631908..3686c70b7404 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=41.3 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ configure_args=" hostmakedepends="dconf gettext itstool pkg-config" makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel - plymouth-devel" + plymouth-devel libgudev-devel" depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb" checkdepends="check-devel" @@ -23,7 +23,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4 +checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855 conf_files=" /etc/gdm/custom.conf @@ -47,10 +47,11 @@ fi post_install() { vinstall $FILESDIR/Xsession 755 etc/gdm - vsed -i "s/pam_systemd\.so/pam_elogind.so/" $DESTDIR/etc/pam.d/* - vsed -i '/pam_tally.so/d' \ - $DESTDIR/etc/pam.d/gdm-smartcard \ - $DESTDIR/etc/pam.d/gdm-fingerprint + for f in $DESTDIR/etc/pam.d/*; do + if grep -q "pam_systemd.so" "$f"; then + vsed -i "s/pam_systemd\.so/pam_elogind.so/" "$f" + fi + done rm -rf ${DESTDIR}/tmp # runit service From fea36bb368c533bf2dc1fb025fe66256f0c9c40e Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:30:44 -0700 Subject: [PATCH 17/50] gnome-initial-setup: update to 42.2 --- srcpkgs/gnome-initial-setup/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 6e7931930878..9e8a2c3824f9 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,6 +1,6 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=41.4 +version=42.2 revision=1 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" @@ -10,12 +10,12 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-online-accounts-devel gdm-devel libpwquality-devel mit-krb5-devel vala-devel libnma-devel polkit-devel rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel - pango-devel" + pango-devel libhandy1-devel" depends="iso-codes" short_desc="GNOME initial setup" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" -changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/gnome-41/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642 +changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" +checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b From 8ce2be5584d248910ea288ebb8bbd5c0120bde44 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:31:30 -0700 Subject: [PATCH 18/50] gnome-clocks: update to 42.0 --- srcpkgs/gnome-clocks/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index e511f2f27e49..c2f76af5604a 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,18 +1,19 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson -hostmakedepends="pkg-config intltool itstool glib-devel vala" +hostmakedepends="pkg-config gettext itstool glib-devel vala + gtk-update-icon-cache desktop-file-utils" makedepends="glib-devel vala-devel gnome-desktop-devel - libgweather-devel libhandy1-devel libnotify-devel gsound-devel - geocode-glib-devel desktop-file-utils hicolor-icon-theme - geoclue2-devel" + gtk4-devel libadwaita-devel libnotify-devel gsound-devel + libgweather-devel geocode-glib-devel geoclue2-devel + hicolor-icon-theme" depends="desktop-file-utils hicolor-icon-theme" short_desc="Clock application for the GNOME Desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Clocks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac +checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0 From 82bd721063fdd09c08d9f30169f2b8ba9645188f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:32:04 -0700 Subject: [PATCH 19/50] gnome-calendar: update to 42.2 --- srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ---------- srcpkgs/gnome-calendar/template | 13 +++++++------ 2 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch deleted file mode 100644 index e2df31e0760e..000000000000 --- a/srcpkgs/gnome-calendar/patches/meson-0.61.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Calendar.appdata.xml.in.in'), - output: 'org.gnome.Calendar.appdata.xml.in', diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index ab83007ec7c5..bfcee23b7910 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,19 +1,20 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=41.2 +version=42.2 revision=1 build_style=meson -hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" +hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache + $(vopt_if gir 'gobject-introspection')" makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel - gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel - libgweather-devel libical-devel libpeas-devel libsoup-devel" + gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel + libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel" short_desc="Calendar application designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" -changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a +checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd build_options="gir" build_options_default="gir" From df47a1648d5f7f6dee6b45f9b294dbf08f87ff16 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:34:06 -0700 Subject: [PATCH 20/50] gnome-weather: update to 42.0 --- srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ---------- srcpkgs/gnome-weather/template | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch deleted file mode 100644 index a305b8c54dc4..000000000000 --- a/srcpkgs/gnome-weather/patches/meson-0.61.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -59,7 +59,6 @@ endif - appdata_conf = configuration_data() - appdata_conf.set('app_id', weather_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: '@0@.appdata.xml.in.in'.format(default_id), - output: '@0@.appdata.xml.in'.format(default_id), diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index 052cae430e6d..568f10e39391 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,16 +1,16 @@ # Template file for 'gnome-weather' pkgname=gnome-weather -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel gjs" -makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel" -depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1" +makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel" +depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop" short_desc="Access current weather conditions and forecasts for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Weather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee +checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465 lib32disabled=yes From 707705c7ce7bde05f0f3ddb362bb373450ecea1e Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:40:21 -0700 Subject: [PATCH 21/50] gnome-user-docs: update to 42.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 579bb4f407f0..773c9913d74f 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=41.2 +version=42.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/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a +checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905 From 10412cfe23a5cebddf2f0d557dae63d422e04d8c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:41:54 -0700 Subject: [PATCH 22/50] gnome-core: update to 42.0 --- srcpkgs/gnome-core/template | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index d7a7082b7a60..3e3ba6137b6c 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,7 +1,7 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=41.0 -revision=2 +version=42.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" maintainer="q66 " @@ -9,44 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only" homepage="https://www.gnome.org" depends=" - adwaita-icon-theme>=41.0 - at-spi2-core>=2.42.0 + adwaita-icon-theme>=${version} + at-spi2-core>=2.44.0 at-spi2-atk>=2.38.0 cantarell-fonts>=0.301 dconf>=0.40.0 - evolution-data-server>=3.42.0 - folks>=0.14.0 + evolution-data-server>=3.${version} + folks>=0.15.4 font-adobe-source-code-pro>=2.030R - gcr>=3.40.0 - gdm>=41.0 + gcr>=3.41.0 + gdm>=${version} geocode-glib>=3.26.2 gfbgraph>=0.2.4 - gjs>=1.70.0 - glib>=2.70.0 - glib-networking>=2.70.0 - gmime3>=3.2.7 - gnome-backgrounds>=41.0 - gnome-bluetooth1>=3.34.5 + gjs>=1.72.0 + glib>=2.72.0 + glib-networking>=2.72.0 + gmime>=3.2.7 + gnome-backgrounds>=${version} + gnome-bluetooth>=${version} gnome-color-manager>=3.36.0 - gnome-control-center>=41.0 - gnome-desktop>=41.0 - gnome-initial-setup>=41.0 + gnome-control-center>=${version} + gnome-desktop>=${version} + gnome-initial-setup>=${version} gnome-keyring>=40.0 - gnome-online-accounts>=3.40.0 + gnome-online-accounts>=3.44.0 gnome-online-miners>=3.34.0 - gnome-session>=40.1.1 - gnome-settings-daemon>=41.0 - gnome-shell>=41.0 - gnome-shell-extensions>=41.0 - gnome-themes-standard>=3.28 - gnome-user-docs>=41.0 + gnome-session>=${version} + gnome-settings-daemon>=${version} + gnome-shell>=${version} + gnome-shell-extensions>=${version} + gnome-themes-extra>=3.28 + gnome-user-docs>=${version} gnome-video-effects>=0.5.0 - gsettings-desktop-schemas>=41.0 - gvfs>=1.48.1 - mutter>=41.0 - nautilus>=41.0 + gsettings-desktop-schemas>=${version} + gvfs>=1.50.0 + mutter>=${version} + nautilus>=${version} sushi>=41.0 - tracker3>=3.2.1 - yelp>=41.1 - xdg-desktop-portal-gtk>=1.8.0 - zenity>=3.41.0" + tracker>=3.3.0 + yelp>=${version} + xdg-desktop-portal-gnome>=${version} + zenity>=3.${version}" From 6d5ca6d951ee66be0f6e8799eda79c3353d3a4c9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:18:01 -0700 Subject: [PATCH 23/50] gnome-terminal: update to 3.44.0 --- .../gnome-terminal/patches/meson-0.61.patch | 47 ------------------- srcpkgs/gnome-terminal/template | 6 +-- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch deleted file mode 100644 index 8b6edbb923a2..000000000000 --- a/srcpkgs/gnome-terminal/patches/meson-0.61.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Fri, 14 Jan 2022 11:33:32 +0100 -Subject: [PATCH] build: Fix for newer meson - ---- - data/meson.build | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 79d97e5b..e0bcbb91 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -18,7 +18,6 @@ - metainfodir = gt_datadir / 'metainfo' - - i18n.merge_file( -- gt_dns_name + '.metainfo.xml', - input: gt_dns_name + '.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -27,7 +26,6 @@ i18n.merge_file( - ) - - i18n.merge_file( -- gt_dns_name + '.Nautilus.metainfo.xml', - input: gt_dns_name + '.Nautilus.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -40,7 +38,6 @@ i18n.merge_file( - desktopdatadir = gt_datadir / 'applications' - - i18n.merge_file( -- gt_dns_name + '.desktop', - input: gt_dns_name + '.desktop.in', - output: '@BASENAME@', - type: 'desktop', -@@ -57,4 +54,4 @@ meson.add_install_script( - - # Subdirs - --subdir('icons') -\ No newline at end of file -+subdir('icons') --- -GitLab - diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 4853fb46511a..f12986cc45af 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.42.2 +version=3.44.1 revision=1 build_style=meson configure_args="-Dnautilus_extension=true -Db_ndebug=false" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.3-only" homepage="https://wiki.gnome.org/Apps/Terminal" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0 +checksum=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b lib32disabled=yes if [ "$CROSS_BUILD" ]; then @@ -23,7 +23,7 @@ fi nautilus-gnome-terminal-extension_package() { depends="${sourcepkg}>=${version}_${revision}" - short_desc="gnome-terminal integration for nautilus" + short_desc+=" - nautilus integration" pkg_install() { vmove usr/lib/nautilus/extensions-3.0 } From 1ea628a63439e2993558c36e39beb98f41bd8046 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:47:38 -0700 Subject: [PATCH 24/50] evolution: update to 3.44.2 --- srcpkgs/evolution/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 226c884f3c53..5279e5c94607 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,25 +1,26 @@ # Template file for 'evolution' pkgname=evolution -version=3.42.3 +version=3.44.2 revision=1 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF - -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON" + -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF + -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2" hostmakedepends="intltool itstool pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel libcanberra-devel libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel - gnome-desktop-devel libsoup-devel" + gnome-desktop-devel libsoup-devel cmark-devel" depends="gnome-keyring" short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6 +checksum=fac706ce7a573f8d967737f15ad0ebeba43a87fe3ca757f8541203d991be0633 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" From 813f71d2039d46de7e8ad2d999cab9a535a88de0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:52:15 -0700 Subject: [PATCH 25/50] evolution-ews: update to 3.44.2 --- srcpkgs/evolution-ews/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 01b358864598..f11424d80f4c 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.42.1 +version=3.44.2 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services" maintainer="Peter Kuchar " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d +checksum=c573f397103c1726f24be4f3f9fd20cebbc9b445ba0b2b0eb7c948fd8415061a From 201b1a8565007bf2a0e69e864da10c596d85ac1c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:43:16 -0700 Subject: [PATCH 26/50] gnome-maps: update to 42.2 --- srcpkgs/gnome-maps/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 414735d1ed3f..2ab352f352d7 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,17 +1,18 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=41.4 +version=42.2 revision=1 build_style=meson build_helper="gir" hostmakedepends="glib-devel gettext pkg-config AppStream gjs" makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel - gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel" -depends="geoclue2 gfbgraph gjs libhandy1" + gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel + libgweather-devel" +depends="geoclue2 gfbgraph gjs libhandy1 libgweather" short_desc="GNOME maps application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" -changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e340b13f46fe0b7d5b0f8f01413291ddcd870c74a5c38fa24cac1f585e70393e +checksum=5e6d1b0ca7cc939ea91aadfda5633a865ea85fa5650036861b2bfef0bfd069b1 From 944208ed13a12fcc5137d9b7aaf5bcb4a1e20aec Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:04:46 -0700 Subject: [PATCH 27/50] gnome-font-viewer: update to 42.0 --- .../patches/meson-0.61.patch | 40 ------------------- srcpkgs/gnome-font-viewer/template | 8 ++-- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch deleted file mode 100644 index 072ce27fd0d2..000000000000 --- a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Thu, 30 Dec 2021 17:14:47 +0800 -Subject: [PATCH] Fix meson build with meson 0.60.0+ - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 ---- - data/meson.build | 2 +- - src/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bfc9caa..8e42134 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,6 +1,6 @@ - appdatadir = join_paths(datadir, 'metainfo') - appdata_file = 'org.gnome.font-viewer.appdata.xml' --merged_appdata = i18n.merge_file(appdata_file, -+merged_appdata = i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -diff --git a/src/meson.build b/src/meson.build -index f863d45..826c59b 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' - desktop_conf = configuration_data() - desktop_conf.set('VERSION', meson.project_version()) - desktop_conf.set('APPLICATION_ID', application_id) --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: configure_file(input: desktop_file + '.in.in', - output: desktop_file + '.in', - configuration: desktop_conf), --- -GitLab - diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index f4d7f69436ee..bdc99f9a8d8c 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,15 +1,15 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="pkg-config glib-devel gettext" -makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel - gnome-desktop-devel harfbuzz-devel libhandy1-devel" +makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel + gnome-desktop-devel harfbuzz-devel libadwaita-devel" depends="desktop-file-utils" short_desc="Font viewer for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876 +checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc From 09b7fd46ef24d5f2ba79a1ddba8e7d23a88d2701 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:27:46 -0700 Subject: [PATCH 28/50] orca: update to 42.1 --- srcpkgs/orca/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 298009255942..bbd478714581 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,9 +1,9 @@ # Template file for 'orca' pkgname=orca -version=41.1 +version=42.1 revision=1 build_style=gnu-configure -hostmakedepends="intltool itstool pkg-config" +hostmakedepends="gettext itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel" depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme liblouis python3-atspi python3-brlapi python3-dbus python3-xdg speech-dispatcher @@ -12,8 +12,9 @@ short_desc="Screen reader for individuals who are blind or visually impaired" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" +changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1fd02b99094f09f6e72df779e1a72dce41427ec82e245a4ea83233a97eeda271 +checksum=ea9e9d2de8708387b052a7be16a5e69cea9f6768dfaeb45e7bd99e46637162de if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 0c194dbd849ab20316d01141699692586e3cd4fb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:03:11 -0700 Subject: [PATCH 29/50] gnome-remote-desktop: update to 42.2 --- srcpkgs/gnome-remote-desktop/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template index 30e9b3b2c21f..18071658e222 100644 --- a/srcpkgs/gnome-remote-desktop/template +++ b/srcpkgs/gnome-remote-desktop/template @@ -1,17 +1,18 @@ # Template file for 'gnome-remote-desktop' pkgname=gnome-remote-desktop -version=41.2 +version=42.2 revision=1 build_style=meson -configure_args="-Drdp=true -Dvnc=true -Dnvenc=false +configure_args="-Drdp=true -Dvnc=true -Dsystemd_user_unit_dir=/var/lib/systemd/user" -hostmakedepends="pkg-config glib-devel" +hostmakedepends="pkg-config gettext glib-devel" makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel - freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel" + freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel + libgudev-devel nv-codec-headers" short_desc="GNOME remote desktop server" maintainer="Michal Vasilek " 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=10151e69b648c2247c5e33d9a2ef419f4e037ee5b2bae49e6ed6aca77eb1ba58 +checksum=c1ccbcd8ca7037ef6db73f6bf2b5dd38a336b7d80a2a9c98df6ff883878ff9d5 make_check=no # xvfb failed to start From 2042c7d2172bd6dabc39b9f5209538b477799d3d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:03:43 -0700 Subject: [PATCH 30/50] gnome: update to 42.0 --- srcpkgs/gnome/template | 57 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 0b2910094713..7860bb3cd09f 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome -version=41.0 -revision=2 +version=42.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -11,69 +11,68 @@ homepage="https://www.gnome.org" depends=" gnome-core>=${version} baobab>=${version} - cheese>=${version} + cheese>=41.1 eog>=${version} evince>=${version} - file-roller>=3.40.0 - gedit>=40.1 + file-roller>=3.${version} gnome-calculator>=${version} gnome-calendar>=${version} gnome-characters>=${version} - gnome-clocks>=40.0 + gnome-clocks>=${version} gnome-contacts>=${version} gnome-disk-utility>=${version} gnome-font-viewer>=${version} gnome-maps>=${version} gnome-music>=${version} gnome-remote-desktop>=${version} - gnome-screenshot>=40.0 gnome-system-monitor>=${version} gnome-terminal>=3.${version} - gnome-tweaks>=40.0 + gnome-text-editor>=${version} + gnome-tweaks>=42.beta gnome-weather>=${version} gsound>=1.0.3 - gspell>=1.9.1 + gspell>=1.10.0 mousetweaks>=3.32.0 - network-manager-applet>=1.24.0 orca>=${version} phodav>=2.5 - simple-scan>=40.5 - totem>=3.38.2" + simple-scan>=${version} + totem>=${version}" _apps_depends=" bijiben>=40.1 dconf-editor>=3.38.3 - devhelp>=${version} + devhelp>=41.2 epiphany>=${version} - evolution>=3.42.0 - ghex>=3.18.4 - gitg>=3.32.1 - gedit-plugins>=40.1 + evolution>=3.44.0 + ghex>=${version} + gitg>=41 gnome-books>=40.0 gnome-boxes>=${version} gnome-builder>=${version} gnome-calculator>=${version} gnome-calendar>=${version} + gnome-connections>=${version} gnome-characters>=${version} - gnome-clocks>=40.0 + gnome-clocks>=${version} gnome-dictionary>=40.0 gnome-disk-utility>=${version} gnome-font-viewer>=${version} gnome-maps>=${version} gnome-music>=${version} - gnome-nettool>=3.8.1 - gnome-photos>=40.0 - gnome-recipes>=2.0.2 - gnome-screenshot>=40.0 - gnome-sound-recorder>=40.0 + gnome-nettool>=${version} + gnome-photos>=${version} + gnome-recipes>=2.0.4 + gnome-screenshot>=41.0 + gnome-sound-recorder>=${version} gnome-system-monitor>=${version} - gnome-terminal>=3.41.0 - gnome-todo>=3.28.1 - gnote>=40.2 - nemiver>=0.9.6 + gnome-terminal>=3.${version} + gnome-text-editor>=${version} + gnome-todo>=41.0 + gnote>=${version} + network-manager-applet>=1.24.0 polari>=3.38.0 rygel>=0.40.2 - simple-scan>=40.5 + simple-scan>=${version} totem>=3.38.2 vino>=3.22.0" @@ -82,7 +81,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>=${version} gnome-klotski>=3.38.2 gnome-mahjongg>=3.38.3 gnome-mines>=40.0 From e9990609eb8a594aaca4b947d609ce275843db3e Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 14 Apr 2022 21:41:15 -0700 Subject: [PATCH 31/50] budgie-desktop: rebuild against mutter 42.0 --- 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 f7b5a2b03cd3..de5b3305ee9f 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.1 -revision=2 +revision=3 build_style=meson build_helper=gir configure_args="-Dwith-gtk-doc=false" From f48cd03ae05f7cef48bf0a074389703c27620bbe Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 14 Apr 2022 21:41:46 -0700 Subject: [PATCH 32/50] gnome-tweaks: update to 42.beta --- srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 ------------------- srcpkgs/gnome-tweaks/template | 9 +++--- 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch deleted file mode 100644 index 80efde38735e..000000000000 --- a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 -From: Mae Dartmann -Date: Wed, 16 Feb 2022 06:08:41 +0000 -Subject: [PATCH] meson: fix invalid positional argument - ---- - data/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index fd6d5da..74f7e82 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,5 +1,5 @@ - appdata_file = 'org.gnome.tweaks.appdata.xml' --i18n.merge_file(appdata_file, -+i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, - ) - - desktop_file = 'org.gnome.tweaks.desktop' --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: desktop_file + '.in', - output: desktop_file, - po_dir: '../po', --- -GitLab - diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template index e2ef4e83d274..34f1a56b9084 100644 --- a/srcpkgs/gnome-tweaks/template +++ b/srcpkgs/gnome-tweaks/template @@ -1,16 +1,17 @@ # Template file for 'gnome-tweaks' pkgname=gnome-tweaks -version=40.0 -revision=3 +version=42.beta +revision=1 build_style=meson -hostmakedepends="gettext" +hostmakedepends="pkg-config gettext" +makedepends="libhandy1-devel" depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy1" short_desc="GNOME tool to customize advanced options" maintainer="Enno Boland " license="GPL-3.0-or-later, CC0-1.0" homepage="https://wiki.gnome.org/Apps/Tweaks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a +checksum=83f44cc1dc8adc770cdad717b403cb9a6cc3c0de50e38e6f1e678b43401ad868 replaces="gnome-tweak-tool>=0" gnome-tweak-tool_package() { From 7aeb18827c21bddd8171f8d7f1a0a3b50461d4b5 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:45:30 -0700 Subject: [PATCH 33/50] gnome-panel: update to 3.44.0 --- srcpkgs/gnome-panel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 14bb5a03db84..2484b7e4525d 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,6 +1,6 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.42.0 +version=3.44.0 revision=1 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomePanel" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=aea8c0efc2edba20e97ad4695179cd0a2538e64c2904702cc8c594e8e0898703 +checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa gnome-panel-devel_package() { depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}" From 0864829002377849903a00df8b4f7dc0bbc5d93d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:45:44 -0700 Subject: [PATCH 34/50] gnome-flashback: update to 3.44.0 --- srcpkgs/gnome-flashback/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template index 8a8561df00b2..9fc5c992a7db 100644 --- a/srcpkgs/gnome-flashback/template +++ b/srcpkgs/gnome-flashback/template @@ -1,7 +1,7 @@ # Template file for 'gnome-flashback' pkgname=gnome-flashback -version=3.42.1 -revision=2 +version=3.44.0 +revision=1 build_helper=gir build_style=gnu-configure configure_args="--with-compiz-session --enable-compile-warnings=minimum" @@ -18,7 +18,7 @@ maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeFlashback" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e +checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a post_extract() { vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \ From 71bf5f9529ef853f13bd18443ad739f04d7a19f8 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 12 Apr 2022 11:33:29 -0700 Subject: [PATCH 35/50] GPaste: update to 42.1 --- common/shlibs | 4 +++- srcpkgs/GPaste/template | 18 +++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index ab419c75c49e..f081d78cde39 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1418,7 +1418,9 @@ libCHART-1.6.so.0 fox-1.6.49_1 libchromaprint.so.1 chromaprint-1.5.0_1 libedit.so.0 libedit-20130712.3.1_1 libnet.so.9 libnet-1.2_1 -libgpaste.so.13 libgpaste-3.38.2_1 +libgpaste-2.so.0 libgpaste-42.1_1 +libgpaste-gtk-3.so.0 libgpaste-42.1_1 +libgpaste-gtk4.so.0 libgpaste-42.1_1 libthreadutil.so.6 libupnp-1.6.18_1 libupnp.so.17 libupnp-1.14.0_1 libixml.so.11 libupnp-1.14.0_1 diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template index d85f71df5abe..17f2e3122ba5 100644 --- a/srcpkgs/GPaste/template +++ b/srcpkgs/GPaste/template @@ -1,32 +1,28 @@ # Template file for 'GPaste' pkgname=GPaste -version=3.42.6 +version=42.1 revision=1 -wrksrc="gpaste-${version}" build_helper="gir" build_style=meson configure_args="$(vopt_bool gnome_shell gnome-shell) -Dcontrol-center-keybindings-dir=/usr/share/gnome-control-center/keybindings -Dsystemd-user-unit-dir=/usr/lib/systemd" hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection" -makedepends="appstream-glib-devel dbus-devel gdk-pixbuf-devel gtk+3-devel - libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel +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" short_desc="Clipboard management system" maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://www.imagination-land.org/tags/GPaste.html" -distfiles="https://www.imagination-land.org/files/gpaste/gpaste-${version}.tar.xz" -checksum=1158a66c0dd32289d81eb5a3170c9c7aacd0b90ed7ac2961003d803243c476a1 +changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS" +distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz" +checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9 build_options="gnome_shell" desc_option_gnome_shell="Build GNOME Shell integration and extension" build_options_default="gnome_shell" -pre_build() { - export GIR_EXTRA_LIBS_PATH="${wrksrc}/lib/.libs" -} - post_install() { vlicense COPYING } @@ -46,6 +42,6 @@ GPaste-devel_package() { libgpaste_package() { short_desc+=" - gpaste library" pkg_install() { - vmove "usr/lib/libgpaste.so.*" + vmove "usr/lib/libgpaste-*.so.*" } } From cdabbcae3b800f9b196dd179f848073a0b3f63da Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:26:04 -0700 Subject: [PATCH 36/50] New package: gnome-tour-42.0 --- srcpkgs/gnome-tour/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/gnome-tour/template diff --git a/srcpkgs/gnome-tour/template b/srcpkgs/gnome-tour/template new file mode 100644 index 000000000000..adb289c3e0d4 --- /dev/null +++ b/srcpkgs/gnome-tour/template @@ -0,0 +1,15 @@ +# Template file for 'gnome-tour' +pkgname=gnome-tour +version=42.0 +revision=1 +build_style=meson +build_helper=rust +hostmakedepends="pkg-config cargo rust glib-devel gettext desktop-file-utils" +makedepends="gtk4-devel libadwaita-devel libglib-devel" +short_desc="GNOME Tour & Greeter" +maintainer="oreo639 " +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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=fcf1ac689057da86596970ec3da8355521c0a72e95063eb059d5fee4dea82f4f From 5175d17deb2b1f61c68b962697d1a37a6fe834b5 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 18 Apr 2022 10:50:01 -0700 Subject: [PATCH 37/50] gnome-online-accounts: update to 3.44.0 --- srcpkgs/gnome-online-accounts/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index bc01fc1a3081..47085810e534 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.40.1 +version=3.44.0 revision=1 build_style=gnu-configure build_helper="gir" @@ -8,9 +8,9 @@ configure_args="$(vopt_enable gir introspection) --enable-documentation --enable-backend --enable-google --enable-kerberos --enable-flickr --enable-facebook --disable-static --enable-exchange --enable-imap-smtp - --enable-owncloud --enable-windows-live --enable-pocket + --enable-owncloud --enable-windows-live --enable-lastfm --enable-media-server" -hostmakedepends="docbook-xsl gettext-devel glib-devel +hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config $(vopt_if gir vala)" makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel" @@ -19,9 +19,9 @@ short_desc="GNOME service to access online accounts" maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" -changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-38/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=955a03128d0e87855d34d7c534e088f6286ed7ac01baa4ef824ef42a2cb39aad +checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342 build_options="gir" build_options_default="gir" From fd7899f8c7a16bbc2c3d9b562b34740f96c15c91 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 21 Apr 2022 23:32:55 -0700 Subject: [PATCH 38/50] gnome-nettool: update to 42.0 --- ...son-drop-unused-positional-arguments.patch | 36 +++++++++++++++++++ srcpkgs/gnome-nettool/template | 14 +++----- 2 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch diff --git a/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch new file mode 100644 index 000000000000..332379faea8f --- /dev/null +++ b/srcpkgs/gnome-nettool/patches/meson-drop-unused-positional-arguments.patch @@ -0,0 +1,36 @@ +From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Wed, 6 Apr 2022 13:05:25 -0400 +Subject: [PATCH] meson: drop unused positional arguments + +This fixes a build error with newer meson +--- + data/meson.build | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 585e6d3..ed1e8bb 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in', + output: 'gnome-nettool.desktop.in', + configuration: desktop_conf) + +-i18n.merge_file('desktop', +- type: 'desktop', ++i18n.merge_file(type: 'desktop', + input: desktop_in, + output: 'gnome-nettool.desktop', + po_dir: po_dir, + install: true, + install_dir: join_paths(prefix, datadir, 'applications')) + +-i18n.merge_file('appdata', +- type: 'xml', ++i18n.merge_file(type: 'xml', + input: 'gnome-nettool.appdata.xml.in', + output: 'gnome-nettool.appdata.xml', + po_dir: po_dir, +-- +GitLab + diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template index 89f5705d629c..f578e59d00ee 100644 --- a/srcpkgs/gnome-nettool/template +++ b/srcpkgs/gnome-nettool/template @@ -1,9 +1,9 @@ # Template file for 'gnome-nettool' pkgname=gnome-nettool -version=3.8.1 -revision=6 -build_style=gnu-configure -hostmakedepends="glib-devel intltool itstool pkg-config" +version=42.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config gettext itstool glib-devel" makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute" depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools @@ -13,8 +13,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1 - -post_patch() { - vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure -} +checksum=a54f29eef2038aee69551c8b19ca4f758e5eb9e2090a4bc6b5633dff0188751f From e67df73cb541a7b7e910c9f9a7dd2a03d0ee35db Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:02:40 +0200 Subject: [PATCH 39/50] orca: update to 42.2. --- srcpkgs/orca/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index bbd478714581..08c21b531629 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,6 +1,6 @@ # Template file for 'orca' pkgname=orca -version=42.1 +version=42.2 revision=1 build_style=gnu-configure hostmakedepends="gettext itstool pkg-config" @@ -14,7 +14,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ea9e9d2de8708387b052a7be16a5e69cea9f6768dfaeb45e7bd99e46637162de +checksum=9971e9fda1aa2bd64a76b33173135c64159a490b2c4bcffbe7b9548fedfc782c if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 182c3676ec953e7332d4924d2ebd6af29f43258c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:02:44 +0200 Subject: [PATCH 40/50] evolution: update to 3.44.3. --- srcpkgs/evolution/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 5279e5c94607..66e9705a2d2e 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.44.2 +version=3.44.3 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-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fac706ce7a573f8d967737f15ad0ebeba43a87fe3ca757f8541203d991be0633 +checksum=536b11f4133df6f216f27af9a2481a19ed7ae08be2d4a13b128061c262a36499 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" From c937ba98d8d8cc5345d9253f841282f9bdfa4718 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:02:48 +0200 Subject: [PATCH 41/50] evolution-ews: update to 3.44.3. --- 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 f11424d80f4c..98f8323511a9 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.44.2 +version=3.44.3 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-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c573f397103c1726f24be4f3f9fd20cebbc9b445ba0b2b0eb7c948fd8415061a +checksum=85ccaca2887af85bf048e473c7b6c42c5f5641ab05a5bc4cfcea34e2b6f5be17 From 20e4a730772f933eabe56dba4f6e568d3a46251a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:02:53 +0200 Subject: [PATCH 42/50] evolution-data-server: update to 3.44.3. --- srcpkgs/evolution-data-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 56a66aa0bfe0..65e5fddbf24d 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.44.2 +version=3.44.3 revision=1 build_style=cmake build_helper="gir qemu" @@ -20,7 +20,7 @@ license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2ed72afe4d6bb170f8728faea0907fee10212dfde7a9fab82fbcc83d0f22f028 +checksum=9043ab53f341da10315c550384a6b320430193fc8d7861dd25c4e9b2e0be425b build_options="gir" build_options_default="gir" From c771f9bb6b3608f0bc7a10883e004eba05fb261d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:03:23 +0200 Subject: [PATCH 43/50] mutter: update to 42.3. --- srcpkgs/mutter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 945f5d266f77..4064972076d9 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=42.2 +version=42.3 revision=1 build_helper="gir" build_style=meson @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bd30d78be7d170013a0a8bcc837cec5ee6c44d770ff00674dcdfc28b3426b34c +checksum=9da3a63f90282bb59467e7d3dfdc684e70fa055357f6a2dded1db98cdcce10ba shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so libmutter-cogl-pango-10.so" make_check=no # needs a full graphical session From b56c07a75d1112e65b5ffdb91c438602e9356203 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:03:26 +0200 Subject: [PATCH 44/50] gnome-shell: update to 42.3. --- srcpkgs/gnome-shell/patches/ibus-spawn.patch | 105 ------------------ ...-Fix-updating-suggestions-visibility.patch | 37 ++++++ srcpkgs/gnome-shell/template | 4 +- 3 files changed, 39 insertions(+), 107 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/ibus-spawn.patch create mode 100644 srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch diff --git a/srcpkgs/gnome-shell/patches/ibus-spawn.patch b/srcpkgs/gnome-shell/patches/ibus-spawn.patch deleted file mode 100644 index 7d24431249b5..000000000000 --- a/srcpkgs/gnome-shell/patches/ibus-spawn.patch +++ /dev/null @@ -1,105 +0,0 @@ -From e1c8e2dcccf45825820f4ec8b2d7be58c05bb884 Mon Sep 17 00:00:00 2001 -From: oreo639 -Date: Sun, 26 Jun 2022 17:56:48 -0700 -Subject: [PATCH 1/2] ibusManager: Pass on envrionment variables to ibus-daemon - -Previously only DISPLAY was being passed on to ibus, which results in issues -with missing the WAYLAND_DISPLAY or the DBUS_SESSION_BUS_ADDRESS environemnt -variables for example. ---- - js/misc/ibusManager.js | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js -index 55c0d308b4..420459b769 100644 ---- a/js/misc/ibusManager.js -+++ b/js/misc/ibusManager.js -@@ -90,15 +90,25 @@ var IBusManager = class { - this._spawn(Meta.is_wayland_compositor() ? [] : ['--xim']); - } - -+ _tryAppendEnv(env, varname) { -+ const value = GLib.getenv(varname); -+ if (value) -+ env.push(`${varname}=${value}`); -+ } -+ - _spawn(extraArgs = []) { - try { - let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs]; -- // Forward the right X11 Display for ibus-x11 -- let display = GLib.getenv('GNOME_SETUP_DISPLAY'); - let env = []; - -- if (display) -- env.push('DISPLAY=%s'.format(display)); -+ this._tryAppendEnv(env, 'DBUS_SESSION_BUS_ADDRESS'); -+ this._tryAppendEnv(env, 'WAYLAND_DISPLAY'); -+ this._tryAppendEnv(env, 'HOME'); -+ this._tryAppendEnv(env, 'LANG'); -+ this._tryAppendEnv(env, 'LC_CTYPE'); -+ this._tryAppendEnv(env, 'COMPOSE_FILE'); -+ this._tryAppendEnv(env, 'DISPLAY'); -+ - GLib.spawn_async( - null, cmdLine, env, - GLib.SpawnFlags.SEARCH_PATH, --- -GitLab - - -From 61db8d8a6ad70c2379d42eb4879b30aa5c9d3da8 Mon Sep 17 00:00:00 2001 -From: oreo639 -Date: Mon, 27 Jun 2022 13:38:55 -0700 -Subject: [PATCH 2/2] ibusManager: Avoid double fork triggering parent death in - ibus - ---- - js/misc/ibusManager.js | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js -index 420459b769..4157f08702 100644 ---- a/js/misc/ibusManager.js -+++ b/js/misc/ibusManager.js -@@ -98,6 +98,7 @@ var IBusManager = class { - - _spawn(extraArgs = []) { - try { -+ let success_, pid; - let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs]; - let env = []; - -@@ -109,9 +110,13 @@ var IBusManager = class { - this._tryAppendEnv(env, 'COMPOSE_FILE'); - this._tryAppendEnv(env, 'DISPLAY'); - -- GLib.spawn_async( -+ // We use DO_NOT_REAP_CHILD because we don't want to -+ // double-fork internally because then we lose the -+ // parent-child relationship, which ibus relies on to -+ // detect parent death. -+ [success_, pid] = GLib.spawn_async( - null, cmdLine, env, -- GLib.SpawnFlags.SEARCH_PATH, -+ GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, - () => { - try { - global.context.restore_rlimit_nofile(); -@@ -119,6 +124,13 @@ var IBusManager = class { - } - } - ); -+ GLib.child_watch_add( -+ GLib.PRIORITY_DEFAULT, -+ pid, -+ _pid => { -+ GLib.spawn_close_pid(_pid); -+ } -+ ); - } catch (e) { - log(`Failed to launch ibus-daemon: ${e.message}`); - } --- -GitLab - diff --git a/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch b/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch new file mode 100644 index 000000000000..b2e4df1052ae --- /dev/null +++ b/srcpkgs/gnome-shell/patches/keyboard-Fix-updating-suggestions-visibility.patch @@ -0,0 +1,37 @@ +From aca79c027483f86e85043f403321a8d8016ca007 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Sun, 3 Jul 2022 16:44:39 +0200 +Subject: [PATCH] keyboard: Fix updating suggestions visibility + +Commit 237ba24dbeae added corresponding API to the keyboard actor, +but ended up calling it on the KeyboardManager. + +Add the expected method to KeyboardManager that forwards the request +to the keyboard. + +https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5630 + +Part-of: +(cherry picked from commit eff23a87c36a6a96c9abab09ab27a4bb35ab1b1f) +--- + js/ui/keyboard.js | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js +index 9e5dbffbb1..e13652bdfe 100644 +--- a/js/ui/keyboard.js ++++ b/js/ui/keyboard.js +@@ -1273,6 +1273,10 @@ var KeyboardManager = class KeyBoardManager { + this._keyboard.resetSuggestions(); + } + ++ setSuggestionsVisible(visible) { ++ this._keyboard?.setSuggestionsVisible(visible); ++ } ++ + maybeHandleEvent(event) { + if (!this._keyboard) + return false; +-- +GitLab + diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 548e03cce9e4..3d2e3c5cd8ec 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=42.2 +version=42.3 revision=1 build_style=meson build_helper=gir @@ -21,7 +21,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz" -checksum=67eb13cd175e2031a838ccea92e90374ae0e9ccba61683fbacd67ff6afdd590e +checksum=964f520c28d7f412254298676f9cceed6adf81ff489ff1ded69c42987d4c1888 do_check() { mkdir /tmp/gnome-shell-xdg From 821f9e9badbdc75c4d70f51a36291a0c80e94fa7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:03:31 +0200 Subject: [PATCH 45/50] gnome-shell-extensions: update to 42.3. --- srcpkgs/gnome-shell-extensions/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index df153fed82c6..414961a95f40 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=42.2 +version=42.3 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=65718440aa1c2f17bb09222ff802699f641fd51279221f04cb19193968ec0b30 +checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc From 3decb308bb30ed294effa99937b1d3378afad146 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:03:36 +0200 Subject: [PATCH 46/50] gnome-remote-desktop: update to 42.3. --- srcpkgs/gnome-remote-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template index 18071658e222..b826155a3ab7 100644 --- a/srcpkgs/gnome-remote-desktop/template +++ b/srcpkgs/gnome-remote-desktop/template @@ -1,6 +1,6 @@ # Template file for 'gnome-remote-desktop' pkgname=gnome-remote-desktop -version=42.2 +version=42.3 revision=1 build_style=meson configure_args="-Drdp=true -Dvnc=true @@ -14,5 +14,5 @@ maintainer="Michal Vasilek " 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=c1ccbcd8ca7037ef6db73f6bf2b5dd38a336b7d80a2a9c98df6ff883878ff9d5 +checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642 make_check=no # xvfb failed to start From b7c8aafdbad0aa4e3a0e83734635d64abc9e5b53 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:03:41 +0200 Subject: [PATCH 47/50] gnome-control-center: update to 42.3. --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 3b45ac02b51c..4563cb97e697 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=42.2 +version=42.3 revision=1 build_style=meson build_helper="gir" @@ -23,7 +23,7 @@ license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=78ba257b09fbddc058879174d13837a79cd59e95a8490117e4cca2e522c9eb00 +checksum=ce0ae3650de2af7ebcb0a7e1fc9912eddb6eff8d257f3fe50ff8b29c19341c7e make_check=no # needs X11 and requires altered filesystem pre_build() { From c5d8b40c933510ad11bd5659277784d70ff3b198 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 14:03:49 +0200 Subject: [PATCH 48/50] xdg-desktop-portal-gnome: update to 42.3. --- srcpkgs/xdg-desktop-portal-gnome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template index c90080892a16..8002ddcc399c 100644 --- a/srcpkgs/xdg-desktop-portal-gnome/template +++ b/srcpkgs/xdg-desktop-portal-gnome/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-gnome' pkgname=xdg-desktop-portal-gnome -version=42.1 +version=42.3 revision=1 build_style=meson configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user" @@ -15,4 +15,4 @@ 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-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7685b6695cd98be8238171020c1c9713c4647d2680006c98ce8e4df858312cd2 +checksum=4ed105a667e46325467103dc7346d2023faec1d5ec153bd17316da938f53ace0 From 6d219603af055215c3943c502f25e332717079e0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 16:58:31 +0200 Subject: [PATCH 49/50] gnome-maps: update to 42.3. --- srcpkgs/gnome-maps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 2ab352f352d7..2aa746f680de 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=42.2 +version=42.3 revision=1 build_style=meson build_helper="gir" @@ -15,4 +15,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5e6d1b0ca7cc939ea91aadfda5633a865ea85fa5650036861b2bfef0bfd069b1 +checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1 From 8e1b8318f6ec58f4910056acdfa31a997dfaf0f0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 5 Jul 2022 17:02:34 +0200 Subject: [PATCH 50/50] gnome-calendar: remove unnecessary gtk3 dependency --- srcpkgs/gnome-calendar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index bfcee23b7910..cd1d201d2dfb 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -6,8 +6,8 @@ build_style=meson hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache $(vopt_if gir 'gobject-introspection')" makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel - gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel - libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel" + gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel + libgweather-devel libical-devel libpeas-devel libsoup-devel" short_desc="Calendar application designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later"