From b290aee64acc8a2271020d9f04c82c01ca46af71 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:19:50 -0700 Subject: [PATCH 01/20] gnome-desktop: update to 44.0. --- srcpkgs/gnome-desktop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index ec82aeb9d2bf..0857bfb93913 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,6 +1,6 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=43 +version=44.0 revision=1 build_style=meson build_helper="gir" @@ -15,10 +15,10 @@ short_desc="GNOME desktop management utilities" maintainer="Michal Vasilek " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" -#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-44/NEWS" changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz" -checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69 +checksum=42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42 build_options="gir" build_options_default="gir" From 8410ff7089d026dc68cd6b9d14c2dbee05b6b98b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:23:30 -0700 Subject: [PATCH 02/20] gnome-session: update to 44.0. --- srcpkgs/gnome-session/patches/no-systemd-dep.patch | 14 -------------- srcpkgs/gnome-session/template | 7 ++++--- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/gnome-session/patches/no-systemd-dep.patch diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch deleted file mode 100644 index 8292d60d5a9e..000000000000 --- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit - - # Check for systemd - if enable_systemd -- systemd_dep = dependency('systemd', version: '>= 242', required: true) -- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', -- define_variable: ['prefix', prefix]) -- -+ systemd_userunitdir = '/tmp' - libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false) - session_bin_deps += libsystemd_dep - diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 062d5b8b5033..ba11a1d76e28 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,9 +1,10 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=43.0 +version=44.0 revision=1 build_style=meson -configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" +configure_args="-Dsystemd_journal=false -Dsystemd_session=disable + -Dsystemduserunitdir=/usr/lib/systemd/user" hostmakedepends="glib-devel gettext pkg-config xmlto" makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel libglib-devel libICE-devel libSM-devel xtrans" @@ -15,4 +16,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz" -checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2 +checksum=ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6 From 20eaae45e34ccaa916d6e024bc2bce32b3ad75d5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:26:19 -0700 Subject: [PATCH 03/20] mutter: update to 44.0. --- common/shlibs | 8 ++--- srcpkgs/mutter/patches/x11-focus.patch | 48 -------------------------- srcpkgs/mutter/template | 25 +++++++------- 3 files changed, 17 insertions(+), 64 deletions(-) delete mode 100644 srcpkgs/mutter/patches/x11-focus.patch diff --git a/common/shlibs b/common/shlibs index 39fed5ffbcf5..e3a5ba611f5e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2986,10 +2986,10 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-11.so.0 mutter-43.2_1 -libmutter-clutter-11.so.0 mutter-43.2_1 -libmutter-cogl-11.so.0 mutter-43.2_1 -libmutter-cogl-pango-11.so.0 mutter-43.2_1 +libmutter-12.so.0 mutter-44.0_1 +libmutter-clutter-12.so.0 mutter-44.0_1 +libmutter-cogl-12.so.0 mutter-44.0_1 +libmutter-cogl-pango-12.so.0 mutter-44.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub-0.6.so.0 libgepub-0.6.0_4 libslopy.so.7.6 slop-7.6_1 diff --git a/srcpkgs/mutter/patches/x11-focus.patch b/srcpkgs/mutter/patches/x11-focus.patch deleted file mode 100644 index d7208572c900..000000000000 --- a/srcpkgs/mutter/patches/x11-focus.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 81c0cf0834e5b11ad8674accf5d143725c19d5ae Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Mon, 13 Feb 2023 20:12:38 +0100 -Subject: [PATCH] x11: Avoid updating focus on wayland compositor - -Reading upon the history of this code branch (commits 6891ce95dce -and 7a4c808e43d4 are most relevant), it seems this code is meant to -synchronize Mutter focus state taking the Xserver state as true. -That is, if Mutter tried to change the focus but something truncated -that action, Mutter focus will be changed to be in sync with the -Xserver again. - -This sounds backwards in a Wayland session. Mutter focus should be -the canonical source, and not second-guessed from the current Xserver -focus window. These race conditions might still apply between X11 -clients, so make these paths only apply in that case. - -An example of this breaking can be reproduced with a Spotify and -Firefox window, moving the focus from the first to the second by -going to the GNOME Shell overview in between, and clicking the -Firefox window from there. The Firefox window will be raised, but -refuse to take focus. - -It's unclear what made this an issue recently, perhaps commit -0e6395d9328 since the now possibly ignored XI_FocusIn/Out events -affect this accounting of the Xserver focused window. Anyhow it -sounds better to ignore these paths for Wayland/native altogether. - -Part-of: ---- - src/x11/events.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/x11/events.c b/src/x11/events.c -index fd0f84c4a2..89733ba33b 100644 ---- a/src/x11/events.c -+++ b/src/x11/events.c -@@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display, - if (x11_display->focused_by_us && - event->xany.serial > x11_display->focus_serial && - display->focus_window && -+ display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 && - !window_has_xwindow (display->focus_window, x11_display->server_focus_window) && - meta_display_windows_are_interactable (display)) - { --- -GitLab - diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 663d04e4386d..ee2e3a873303 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,7 +1,7 @@ # Template file for 'mutter' pkgname=mutter -version=43.3 -revision=2 +version=44.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true @@ -11,18 +11,19 @@ hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server xorg-server-xwayland" makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel - libinput-devel MesaLib-devel pipewire-devel startup-notification-devel + libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk4-devel wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel" -depends="gsettings-desktop-schemas desktop-file-utils zenity" +depends="gsettings-desktop-schemas desktop-file-utils" short_desc="Wayland display server, X11 window manager and compositor library" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" -changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-44/NEWS" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS" distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz" -checksum=67be4820d9b270c9c3c65e38947bf052d2c2ff18ae9e70421d49259efac00a7d -shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so - libmutter-cogl-pango-11.so" +checksum=7214b07e13589ef7c1df553c7ed11a02798e43ada6c228913f4e7a666eefbac4 +shlib_provides="libmutter-clutter-12.so libmutter-cogl-12.so + libmutter-cogl-pango-12.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -34,18 +35,18 @@ pre_build() { post_install() { # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are # meant to be called with 'pkg-config --variable' - vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-11|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-12|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-12.pc } mutter-devel_package() { - depends="gtk+3-devel graphene-devel clutter-devel + depends="gtk4-devel graphene-devel clutter-devel libX11-devel libXtst-devel mutter-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-11/*.gir" + vmove "usr/lib/mutter-12/*.gir" vmove "usr/lib/*.so" } } From 2458128dbb74200f4e0279e24e4a5086cd2536ee Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:26:38 -0700 Subject: [PATCH 04/20] gnome-shell: update to 44.0. --- .../patches/no-exe-introspection.patch | 25 +++++++++++++++++++ srcpkgs/gnome-shell/template | 7 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnome-shell/patches/no-exe-introspection.patch diff --git a/srcpkgs/gnome-shell/patches/no-exe-introspection.patch b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch new file mode 100644 index 000000000000..8088fd2f5a62 --- /dev/null +++ b/srcpkgs/gnome-shell/patches/no-exe-introspection.patch @@ -0,0 +1,25 @@ +commit 1d1e96c094570c3a822f835abbff0a5bca4ca10e +Author: Daniel Kolesa +Date: Sun Mar 19 19:11:00 2023 +0100 + + Disable 9bc89b821cf09195418f20225bbec39c0567d263 + + Even if we manually define _DYNAMIC, it does not work (segfaults + somewhere in musl, coming from g_strsplit) and is pretty useless + for our case anyway. + +diff --git a/src/main.c b/src/main.c +index 8cccc0a..ef6408f 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -19,6 +19,10 @@ + #include + #include + ++#ifdef HAVE_EXE_INTROSPECTION ++#undef HAVE_EXE_INTROSPECTION ++#endif ++ + #ifdef HAVE_EXE_INTROSPECTION + #include + #endif diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 5089c10c7627..36e6a1dfd11e 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=43.3 +version=44.0 revision=1 build_style=meson build_helper=gir @@ -19,9 +19,10 @@ short_desc="GNOME core user interface" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-44/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz" -checksum=49ff8d05f55fa4f1c22f05d0385852ceb429a6b6380c1ba8461e62a46d4c071e +checksum=3310adc1dd4e210998d59f3871bc31f7e04915428d9ced88c2a66b2b05d6c00a do_check() { mkdir /tmp/gnome-shell-xdg From 9803b4583a06e010003671163a1d50bbe12eb4f4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:33:33 -0700 Subject: [PATCH 05/20] gdm: update to 44.0. --- srcpkgs/gdm/patches/take-out-the-trash.patch | 22 ++++++++------------ srcpkgs/gdm/template | 4 ++-- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch index 03e7e6a3decb..aac0d96c726a 100644 --- a/srcpkgs/gdm/patches/take-out-the-trash.patch +++ b/srcpkgs/gdm/patches/take-out-the-trash.patch @@ -1,22 +1,18 @@ --- a/meson.build +++ b/meson.build -@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers') - libwrap_dep = cc.find_library('libwrap') +@@ -100,15 +100,8 @@ if xdmcp_dep.found() and get_option('tcp + libwrap_dep = cc.find_library('wrap') endif # systemd -systemd_dep = dependency('systemd') libsystemd_dep = dependency('libsystemd') --if meson.version().version_compare('>= 0.53') -- systemd_multiseat_x = find_program('systemd-multi-seat-x', -- required: false, -- dirs: [ -- systemd_dep.get_pkgconfig_variable('systemdutildir'), -- '/lib/systemd', -- '/usr/lib/systemd', -- ]) --else -- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) --endif +-systemd_multiseat_x = find_program('systemd-multi-seat-x', +- required: false, +- dirs: [ +- systemd_dep.get_pkgconfig_variable('systemdutildir'), +- '/lib/systemd', +- '/usr/lib/systemd', +- ]) +systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' # Plymouth diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 424128db0fad..b0dc0dc005b6 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=43.0 +version=44.0 revision=1 build_helper="gir" build_style=meson @@ -25,7 +25,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz" -checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294 +checksum=ce20b0a221dbf8cde0064b501fd8f38f73839152857c4535337eb09cc52f7f6c conf_files=" /etc/gdm/custom.conf From f95a478287b93316bae6a546b2180ac4adc3211e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:41:13 -0700 Subject: [PATCH 06/20] gnome-shell-extensions: update to 44.0. --- srcpkgs/gnome-shell-extensions/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 8b358e73b199..1abb3e8aaa02 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,10 +1,10 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=43.1 +version=44.0 revision=1 build_style=meson configure_args="-Dextension_set=all" -hostmakedepends="pkg-config gettext" +hostmakedepends="pkg-config gettext glib-devel" depends="gnome-shell>=${version} nautilus unzip" short_desc="Extensions for GNOME shell, including classic mode" maintainer="Michal Vasilek " @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz" -checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17 +checksum=8c345e72f31a1e37f55063e0b15997301b01194ed698772fd87aeb50cbb101ab From eec2f2bf1b54e92d6b65fddc4d27012b74de0361 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:58:34 -0700 Subject: [PATCH 07/20] gsettings-desktop-schemas: update to 44.0. --- srcpkgs/gsettings-desktop-schemas/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 636b7a5cabf6..c08045297784 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -1,6 +1,6 @@ # Template file for 'gsettings-desktop-schemas' pkgname=gsettings-desktop-schemas -version=43.0 +version=44.0 revision=1 build_helper="gir" build_style=meson @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz" -checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe +checksum=eb2de45cad905994849e642a623adeb75d41b21b0626d40d2a07b8ea281fec0e # Package build options build_options="gir" From 52a3ffe9f8fdd977c4a4f4c90b2bdd5dc2518c60 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:00:10 -0700 Subject: [PATCH 08/20] gnome-settings-daemon: update to 44.0. --- srcpkgs/gnome-settings-daemon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 3d3cf393f960..db6ed160949f 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,7 +1,7 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=43.0 -revision=2 +version=44.0 +revision=1 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt @@ -20,7 +20,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz" -checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0 +checksum=b417ada1c1342a8cf29837ecf2dec9bdcdb754235b1a161b6435c3d11f210999 CFLAGS="-UG_DISABLE_ASSERT" if [ "$CROSS_BUILD" ]; then From be3501346246c653fc96b8226a782f52d1177b7e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:00:32 -0700 Subject: [PATCH 09/20] gnome-control-center: update to 44.0. --- srcpkgs/gnome-control-center/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 849763d23c1e..ac1a4ad7c9e0 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,7 +1,7 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=43.2 -revision=2 +version=44.0 +revision=1 build_style=meson build_helper="gir" hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config @@ -21,9 +21,9 @@ short_desc="GNOME control center" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" -changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-44/NEWS" distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz" -checksum=d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563 +checksum=bdbfab4cf23d05734096db1f9f6fac7eed3fcb9da32bf4b1f26ed3a04e5abc66 make_check=no # needs X11 and requires altered filesystem pre_build() { From e3d84e1d31d1c525f8c399bd4de2d69fa9df8964 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:03:22 -0700 Subject: [PATCH 10/20] gnome-backgrounds: update to 44.0. --- srcpkgs/gnome-backgrounds/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index 5879accd8a4b..082cf521a3f7 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=43 +version=44.0 revision=1 build_style=meson hostmakedepends="gettext" @@ -9,5 +9,6 @@ short_desc="Set of background images for the GNOME Desktop" maintainer="Enno Boland " license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds" +changelog="https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-backgrounds/${version%.*}/gnome-backgrounds-${version}.tar.xz" -checksum=19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244 +checksum=4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e From de7d2af8fa4d01d86c4d878b13f904713829c81b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:23:34 -0700 Subject: [PATCH 11/20] gnome-user-docs: update to 44.0. --- srcpkgs/gnome-user-docs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 2f03d3bdb057..15f66157419c 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=43.0 +version=44.0 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config itstool" @@ -12,4 +12,4 @@ license="CC-BY-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs" changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz" -checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee +checksum=cf6cd7eb9c4149dd93966f71fa1b907afc8f651ecc3af54e1085bcf4ad21b1bd From b3feb9fe7e426c4e16f08005e5ed50478a54aa78 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:36:07 -0700 Subject: [PATCH 12/20] xdg-desktop-portal-gnome: update to 44.0. --- srcpkgs/xdg-desktop-portal-gnome/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template index f6af5626ef2a..256ee0ec3b4f 100644 --- a/srcpkgs/xdg-desktop-portal-gnome/template +++ b/srcpkgs/xdg-desktop-portal-gnome/template @@ -1,8 +1,7 @@ # Template file for 'xdg-desktop-portal-gnome' pkgname=xdg-desktop-portal-gnome -reverts="44.0_1" -version=43.1 -revision=3 +version=44.0 +revision=2 build_style=meson configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user" hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext" @@ -14,7 +13,7 @@ short_desc="GNOME portal backend for xdg-desktop-portal" maintainer="oreo639 " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" -#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS" -changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/main/NEWS" +#changelog="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/raw/gnome-44/NEWS" distfiles="${GNOME_SITE}/xdg-desktop-portal-gnome/${version%.*}/xdg-desktop-portal-gnome-${version}.tar.xz" -checksum=09adb66c6d9153e6f05df66daa2ad62a5de0e36665e9d2295173bb0ddc53b4cd +checksum=55011e57f64b7caf0837405efa034a336b9e73deb9f84e5c14cc9f7a8e0e7b34 From 904e304c1f32442a9c0bf2c357e7c6555b959606 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:39:46 -0700 Subject: [PATCH 13/20] gnome-online-accounts: update to 3.48.0. --- srcpkgs/gnome-online-accounts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index 413a971ed87e..0086854a4daa 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.46.0 +version=3.48.0 revision=1 build_style=meson build_helper="gir" @@ -14,9 +14,9 @@ short_desc="GNOME service to access online accounts" maintainer="Michal Vasilek " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" -changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-44/NEWS" distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz" -checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa +checksum=418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf build_options="gir" build_options_default="gir" From 9405dd99255df79849e9e4573fb44688161ad020 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:40:11 -0700 Subject: [PATCH 14/20] gvfs: update to 1.50.4. --- srcpkgs/gvfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index fc90e400d928..bcd762dcd596 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,6 +1,6 @@ # Template file for 'gvfs' pkgname=gvfs -version=1.50.2 +version=1.50.4 revision=1 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false @@ -20,7 +20,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/gvfs" changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e +checksum=ab9059a676a537edbea21388c2aafe1a7e2c8f1ac2dfdc6d64550233075457fd # Manually declare shlibs used by the subpkgs. shlib_provides="libgvfscommon.so libgvfsdaemon.so" From a5265eab8a85b662d235a9a12ea5e909dc53d90c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:45:04 -0700 Subject: [PATCH 15/20] zenity: update to 3.44.0. --- srcpkgs/zenity/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template index e12e09c0afb4..fc200050750e 100644 --- a/srcpkgs/zenity/template +++ b/srcpkgs/zenity/template @@ -1,10 +1,10 @@ # Template file for 'zenity' pkgname=zenity -version=3.43.0 +version=3.44.0 revision=1 build_style=meson configure_args="-Dwebkitgtk=$(vopt_if webkit true false)" -hostmakedepends="gettext itstool perl pkg-config" +hostmakedepends="gettext itstool perl pkg-config gtk-update-icon-cache" makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)" short_desc="Display GNOME dialogs from the command line" maintainer="Enno Boland " @@ -12,7 +12,7 @@ license="LGPL-2.0-or-later" homepage="https://help.gnome.org/users/zenity/" changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS" distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz" -checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833 +checksum=c15582301ed90b9d42ce521dbccf99a989f22f12041bdd5279c6636da99ebf65 build_options="webkit" build_options_default="webkit" From 587433e0b334d72103f5651e15f07fb633d63aa6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 17:52:27 -0700 Subject: [PATCH 16/20] gnome-core: update to 44.0. --- srcpkgs/gnome-core/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index a281f5705318..3e8751ebf06b 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,6 +1,6 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=43.0 +version=44.0 revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" @@ -14,15 +14,15 @@ depends=" at-spi2-atk>=2.38.0 cantarell-fonts>=0.301 dconf>=0.40.0 - evolution-data-server>=3.46.0 + evolution-data-server>=3.48.0 folks>=0.15.5 font-adobe-source-code-pro>=2.030R gcr>=3.41.0 gdm>=${version} geocode-glib>=3.26.4 - gjs>=1.74.0 - glib>=2.74.0 - glib-networking>=2.74.0 + gjs>=1.76.0 + glib>=2.76.0 + glib-networking>=2.76.0 gmime>=3.2.7 gnome-backgrounds>=${version} gnome-bluetooth>=42.4 @@ -31,7 +31,7 @@ depends=" gnome-desktop>=${version} gnome-initial-setup>=${version} gnome-keyring>=42.0 - gnome-online-accounts>=3.46.0 + gnome-online-accounts>=3.48.0 gnome-session>=${version} gnome-settings-daemon>=${version} gnome-shell>=${version} @@ -44,7 +44,7 @@ depends=" mutter>=${version} nautilus>=${version} sushi>=43.0 - tracker>=3.4.0 - yelp>=42 + tracker>=3.5.0 + yelp>=42.0 xdg-desktop-portal-gnome>=${version} zenity>=3.${version}" From 0181553a529483c228074d48c80b90bc617d4200 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 14:04:27 -0700 Subject: [PATCH 17/20] epiphany: update to 44.0. --- srcpkgs/epiphany/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index a23f04b32ebb..6a090ccb6cf3 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,21 +1,21 @@ # Template file for 'epiphany' pkgname=epiphany -version=43.0 +version=44.0 revision=1 build_style=meson configure_args="-Dunit_tests=disabled" hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache desktop-file-utils" -makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel - gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel +makedepends="NetworkManager-devel avahi-glib-libs-devel gcr4-devel + gnome-desktop-devel json-glib-devel libdazzle-devel libadwaita-devel libnotify-devel libsecret-devel libsoup3-devel libwnck-devel libxslt-devel - nettle-devel nss-devel libwebkit2gtk41-devel libportal-gtk3-devel + nettle-devel nss-devel libwebkitgtk60-devel libportal-gtk4-devel libarchive-devel" depends="desktop-file-utils hicolor-icon-theme iso-codes" short_desc="Intuitive GNOME web browser" maintainer="oreo639 " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" -changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-44/NEWS" distfiles="${GNOME_SITE}/epiphany/${version%.*}/epiphany-${version}.tar.xz" -checksum=b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227 +checksum=aabdc9de80c409073676e00e15ba97187715e4b84bc776fe86db86d0f8140bb1 From 974ca561f84ba9decaf627f0f7671efb20e44dc9 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 26 Mar 2023 14:35:28 -0700 Subject: [PATCH 18/20] gnome: update to 44.0. --- srcpkgs/gnome/template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 6bb8cfecf3cf..6e0bdeffd1b4 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome -version=43.0 -revision=2 +version=44.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Michal Vasilek " @@ -11,10 +11,10 @@ homepage="https://www.gnome.org" depends=" gnome-core>=${version} baobab>=${version} - cheese>=${version} + cheese>=43 eog>=${version} evince>=${version} - file-roller>=${version} + file-roller>=43 gnome-calculator>=${version} gnome-calendar>=${version} gnome-characters>=${version} @@ -23,9 +23,9 @@ depends=" gnome-disk-utility>=${version} gnome-font-viewer>=${version} gnome-maps>=${version} - gnome-music>=42 + gnome-music>=${version} gnome-remote-desktop>=${version} - gnome-system-monitor>=42 + gnome-system-monitor>=${version} gnome-console>=${version} gnome-text-editor>=${version} gnome-tweaks>=42.beta @@ -35,14 +35,14 @@ depends=" mousetweaks>=3.32.0 orca>=${version} phodav>=3.0 - simple-scan>=42 - totem>=${version}" + simple-scan>=${version} + totem>=43" _apps_depends=" - Endeavour>=${version} + Endeavour>=43 bijiben>=40.1 dconf-editor>=3.38.3 - devhelp>=${version} + devhelp>=43 epiphany>=${version} evolution>=3.44.0 ghex>=${version} @@ -58,12 +58,12 @@ _apps_depends=" gnome-disk-utility>=${version} gnome-font-viewer>=${version} gnome-maps>=${version} - gnome-music>=42 + gnome-music>=${version} gnome-nettool>=42 gnome-photos>=${version} gnome-screenshot>=41.0 gnome-sound-recorder>=42 - gnome-system-monitor>=42 + gnome-system-monitor>=${version} gnome-console>=${version} gnome-text-editor>=${version} gnote>=${version} @@ -78,7 +78,7 @@ _games_collection_depends=" five-or-more>=3.32.2 four-in-a-row>=3.38.1 gnome-2048>=3.38.2 - gnome-chess>=${version} + gnome-chess>=43 gnome-klotski>=3.38.2 gnome-mahjongg>=3.38.3 gnome-mines>=40.0 From daf709dbafc0db798b95c2884cacfc069ae5d251 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 26 Mar 2023 16:19:53 -0700 Subject: [PATCH 19/20] budgie-desktop: rebuild for mutter 44 --- srcpkgs/budgie-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index bfde56e60dc7..422e5419b956 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -1,7 +1,7 @@ # Template file for 'budgie-desktop' pkgname=budgie-desktop version=10.7.1 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dwith-gtk-doc=false" From 0f852536e17c9224f8f7e8707225a23196cd2534 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 3 Apr 2023 01:45:35 -0700 Subject: [PATCH 20/20] GPaste: update to 44.0. --- srcpkgs/GPaste/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template index 80485cb88440..61a3db599d1e 100644 --- a/srcpkgs/GPaste/template +++ b/srcpkgs/GPaste/template @@ -1,6 +1,6 @@ # Template file for 'GPaste' pkgname=GPaste -version=43.0 +version=44.0 revision=1 build_helper="gir" build_style=meson @@ -11,15 +11,15 @@ hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection desktop-file-utils" makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel - $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel" + $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr4-devel" short_desc="Clipboard management system" maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://www.imagination-land.org/tags/GPaste.html" -#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS" +#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-44/NEWS" changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS" distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz" -checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de +checksum=6564a8f571b0a32babc6a8c47e9f70b7cabba8689562c4efb3f998267ab2bc0a build_options="gnome_shell" desc_option_gnome_shell="Build GNOME Shell integration and extension"