From 83e9a8cbb55c115c1eb1078aadc8752dfdd335ac Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 14:57:35 -0700 Subject: [PATCH 01/10] gnome-desktop: update to 40.0 --- srcpkgs/gnome-desktop/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 0196656cc4b8..d10cf878d851 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,7 +1,7 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.38.4 -revision=2 +version=40.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c +checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04 build_options="gir" build_options_default="gir" From 82ddd35bf845befc432beb936205459c46ca3c42 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 14:58:23 -0700 Subject: [PATCH 02/10] gsettings-desktop-schemas: update to 40.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 76c4b0e08108..9aa049052172 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=3.38.0 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67 +checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685 # Package build options build_options="gir" From fd0d1887d5fe3d00967cfaaccfffda8c16b2e1b4 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 14:59:00 -0700 Subject: [PATCH 03/10] gtk4: update to 4.2.0 --- srcpkgs/gtk4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index b555160a6993..5bb98e52247b 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,6 +1,6 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.0.0 +version=4.2.0 revision=1 wrksrc="gtk-${version}" build_style=meson @@ -29,7 +29,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=d46cf5b127ea27dd9e5d2ff6ed500cb4067eeb2cb1cd2c313ccde8013b0b9bf9 +checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072 # Package build options build_options="broadway colord cups gir cloudproviders wayland x11" From f35be2455ecec670f339dc8ca1b021fbd3f6a76a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 14:59:54 -0700 Subject: [PATCH 04/10] gnome-shell: update to 40.0 --- srcpkgs/gnome-shell/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index c004018f719c..f5e8fe3cdc1b 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=3.38.4 +version=40.0 revision=1 build_style=meson build_helper=gir @@ -9,7 +9,7 @@ hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc asciidoc perl glib-devel gettext gjs-devel" makedepends="at-spi2-atk evolution-data-server-devel folks-devel gcr-devel gjs-devel gnome-bluetooth-devel gnome-control-center-devel gnome-desktop-devel - gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel + gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-devel gtk+3-devel gtk4-devel ibus-devel json-glib-devel libcanberra-devel libcroco-devel libglib-devel libsecret-devel libsoup-devel libX11-devel libxml2-devel mutter-devel libnma-devel polkit-devel pulseaudio-devel pipewire-devel @@ -19,9 +19,9 @@ short_desc="GNOME core user interface" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" -changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS" +changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/40.0/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=91824abd0b4beabc8d061f7771f3d38cab73f56c6e3dbf435fd4a0b4b7e85dbe +checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478 # needs X do_check() { From e39d3c7bcc186ad1c5240f18fa19bc3fe3a38715 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:01:11 -0700 Subject: [PATCH 05/10] gnome-settings-daemon: update to 40.0 --- srcpkgs/gnome-settings-daemon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index ecc62cf27782..824529fa11db 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.38.1 +version=40.0 revision=1 build_style=meson configure_args="-Dsystemd=false" @@ -19,7 +19,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164 +checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db if [ "$CROSS_BUILD" ]; then hostmakedepends+=" polkit" From 0a8bee84cdbc621e8bd1dc05ebd383f591a68314 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:02:03 -0700 Subject: [PATCH 06/10] gnome-session: update to 40.beta --- srcpkgs/gnome-session/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index c9bc4930c39f..cbe15db8170b 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,6 +1,6 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=3.38.0 +version=40.beta revision=1 build_style=meson configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67 +checksum=2930f1f396b48e06726b04bbba109f7bea73a3ded2c943324f301820bd332846 post_install() { rm -rf ${DESTDIR}/tmp From d897147df3858110a94719020ff92d2b55c1f8b6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:03:15 -0700 Subject: [PATCH 07/10] gdm: update to 40.0 --- srcpkgs/gdm/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index e5b84645b4c9..c76e13c2de12 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm -version=3.38.2.1 -revision=3 +version=40.0 +revision=1 build_helper="gir" build_style=meson configure_args=" @@ -22,8 +22,8 @@ short_desc="GNOME Display Manager" 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=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e conf_files=" /etc/gdm/custom.conf From ace0e50efd663a09c59d8f3f62a8055b05a47990 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:03:42 -0700 Subject: [PATCH 08/10] libgweather: update to 40.0 --- srcpkgs/libgweather/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index fcdb58795010..eb686d848214 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,20 +1,20 @@ # Template file for 'libgweather' pkgname=libgweather -version=3.36.1 +version=40.0 revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) -Dzoneinfo_dir=/usr/share/zoneinfo" hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)" -makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" +makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel python3-gobject-devel" checkdepends="tzdata" short_desc="GNOME Weather information access library" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450 +checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6 build_options="gir" build_options_default="gir" From 89760cbc5e8b6bbb50a6da22e3901fd3bcd5775d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:04:04 -0700 Subject: [PATCH 09/10] gnome-control-center: update to 40.0 --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 001e057fabdc..a20f50cf9361 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=3.38.5 +version=40.0 revision=1 build_style=meson build_helper="gir" @@ -24,7 +24,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0ada859620110e829174121c7e1a3f82da80d749d6f61d426a7c8cf4464d72f9 +checksum=ccc9a5736517385109ae5a59906c258244dd879b7503ad5984cf41655cb302f1 build_options="cheese" build_options_default="cheese" From 33090083b9ce6d1abde0c5defec1cb93a509f392 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:06:05 -0700 Subject: [PATCH 10/10] mutter: update to 40.0 --- common/shlibs | 16 +++++++--------- srcpkgs/mutter/template | 15 +++++++-------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/common/shlibs b/common/shlibs index c33da050a02c..d11b8ecf4168 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2924,15 +2924,13 @@ 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-7.so.0 mutter-3.37.90_1 -libmutter-clutter-7.so mutter-3.37.90_1 -libmutter-clutter-7.so.0 mutter-3.37.90_1 -libmutter-cogl-path-7.so mutter-3.37.90_1 -libmutter-cogl-path-7.so.0 mutter-3.37.90_1 -libmutter-cogl-7.so mutter-3.37.90_1 -libmutter-cogl-7.so.0 mutter-3.37.90_1 -libmutter-cogl-pango-7.so mutter-3.37.90_1 -libmutter-cogl-pango-7.so.0 mutter-3.37.90_1 +libmutter-8.so.0 mutter-40.0_1 +libmutter-clutter-8.so mutter-40.0_1 +libmutter-clutter-8.so.0 mutter-40.0_1 +libmutter-cogl-8.so mutter-40.0_1 +libmutter-cogl-8.so.0 mutter-40.0_1 +libmutter-cogl-pango-8.so mutter-40.0_1 +libmutter-cogl-pango-8.so.0 mutter-40.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.5 slop-7.5_1 diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 70df3b8cf4be..fc91fe74d4e0 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=3.38.3 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -19,9 +19,8 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f -shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so - libmutter-cogl-pango-7.so libmutter-cogl-path-7.so" +checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e +shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so libmutter-cogl-pango-8.so" # Upstream keeps pulling generated headers even though it can cause race # conditions in meson/ninja @@ -37,9 +36,9 @@ do_check() { 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-7|g' \ - -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \ + -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc } mutter-devel_package() { @@ -49,7 +48,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-7/*.gir" + vmove "usr/lib/mutter-8/*.gir" vmove "usr/lib/*.so" } }