From 0ecd61ed03659f4c198673c62b6e7670086eceed 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 001/108] 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 1dfd164cc3b7e9cad661ebe10a5f1b80de1bb9e1 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 002/108] 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 449ebe0f384dc111111a619755a947218e61d3fc 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 003/108] gtk4: update to 4.2.0 --- srcpkgs/gtk4/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index b555160a6993..6c06833196bc 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,10 +29,10 @@ 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" +build_options="colord cups broadway wayland x11 cloudproviders vulkan gir" desc_option_broadway="Enable support for the HTML5 Broadway backend" desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud" From 74445dd7b2decce74ccfe8e4bab535ec8c1a43af 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 004/108] 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 90e073aa2a9eb9bae329f04e08c348c8f0a9c1ec 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 005/108] 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 dd991487f3f124368dddcf23ed51cec6338420ad 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 006/108] 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 5670d7590051cdf55c7093aff3b88b257ad6ce73 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 007/108] 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 035d54cc01eef0fc326ca0b0b0f2c32ee636d870 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 008/108] 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 81f3f0a4a1b0c341bf77055b4d99eab0ee064f55 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 009/108] 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 c80fa7a5c12c03de93186e9b3ce8eef9ea768ffc 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 010/108] mutter: update to 40.0 --- common/shlibs | 13 ++++--------- srcpkgs/mutter/template | 18 +++++++++--------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9aa0a601250b..58c50865251c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2924,15 +2924,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-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.0 mutter-40.0_1 +libmutter-cogl-8.so.0 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..a1c65c261b0c 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 @@ -18,10 +18,10 @@ short_desc="Lightweight GTK+3 window manager" 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" +distfiles="${GNOME_SITE}/${pkgname}/${version%*.}/${pkgname}-${version}.tar.xz" +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 +37,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 +49,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" } } From 08c97a8ed0d3e3087752a663b80312739d5fcd0e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:12:58 +0200 Subject: [PATCH 011/108] adwaita-icon-theme: update to 40.rc. --- 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 8ddcde9b7873..2ce6e203025c 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=3.38.0 +version=40.rc 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=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97 +checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404 From c694c50082d66a8b253caa8216eed948247c5b2d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:35:18 +0200 Subject: [PATCH 012/108] at-spi2-core: update to 2.40.0. --- srcpkgs/at-spi2-core/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index 74e607012012..e1c601f5d816 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.38.0 +version=2.40.0 revision=1 build_style=meson build_helper="gir" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/at-spi2-core" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5 +checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429 # Package build options build_options="gir" From 8f17376c768dee9c9c3b8326378a29fa05ac5039 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:36:51 +0200 Subject: [PATCH 013/108] dconf: update to 0.40.0. --- srcpkgs/dconf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template index 206767ce20eb..b79822642fc3 100644 --- a/srcpkgs/dconf/template +++ b/srcpkgs/dconf/template @@ -1,6 +1,6 @@ # Template file for 'dconf' pkgname=dconf -version=0.38.0 +version=0.40.0 revision=1 build_style=meson hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/dconf" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58 +checksum=cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533 dconf-devel_package() { depends="libglib-devel vala-devel>=0.24 dconf>=${version}_${revision}" From fd9146a8ccd8f33c6e4acd106cf7a8802ea6a770 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:38:42 +0200 Subject: [PATCH 014/108] gcr: update to 3.40.0. --- srcpkgs/gcr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index e91011681956..e42bd6277d1b 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,6 +1,6 @@ # Template file for 'gcr' pkgname=gcr -version=3.38.0 +version=3.40.0 revision=1 build_style=meson build_helper="gir" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" -checksum=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1 +checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 if [ "$CROSS_BUILD" ]; then configure_args="-Dgtk_doc=false" From 53915552616350de1b8c9ac2cb448bea84d0fbe8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:44:05 +0200 Subject: [PATCH 015/108] gobject-introspection: update to 1.68.0. --- srcpkgs/gobject-introspection/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index c7cc727b6c08..b853759a9583 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,6 +1,6 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection -version=1.64.1 +version=1.68.0 revision=1 build_style=meson pycompile_dirs="usr/lib/${pkgname}/giscanner" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GObjectIntrospection" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7 +checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27 python_version=3 patch_args="-Np1" From 9ca6a25d623fc8d34ab4399417340a71e32a20c1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:45:32 +0200 Subject: [PATCH 016/108] gjs: update to 1.68.0. --- srcpkgs/gjs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 8a133dd8048b..542e59df3add 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,6 +1,6 @@ # Template file for 'gjs' pkgname=gjs -version=1.66.0 +version=1.68.0 revision=1 build_style=meson build_helper="gir qemu" @@ -14,7 +14,7 @@ license="MIT, LGPL-2.0-or-later" homepage="https://wiki.gnome.org/action/show/Projects/Gjs" changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8 +checksum=f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef post_install() { vlicense COPYING From 8ee69a1e2f3bfc0d24db172f65bfa3ee1550338c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:54:05 +0200 Subject: [PATCH 017/108] glib: update to 2.68.0. --- common/shlibs | 10 +++++----- srcpkgs/glib/patches/disable-broken-tests.patch | 12 +++++++++--- srcpkgs/glib/template | 6 +++--- srcpkgs/glib/update | 1 + 4 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 srcpkgs/glib/update diff --git a/common/shlibs b/common/shlibs index 58c50865251c..4126667b57c6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1 libbluetooth.so.3 libbluetooth-4.58_1 libwmf-0.2.so.7 libwmf-0.2.8.4_1 libwmflite-0.2.so.7 libwmf-0.2.8.4_1 -libgthread-2.0.so.0 glib-2.18.0_1 -libglib-2.0.so.0 glib-2.18.0_1 -libgmodule-2.0.so.0 glib-2.18.0_1 -libgio-2.0.so.0 glib-2.18.0_1 -libgobject-2.0.so.0 glib-2.18.0_1 +libgthread-2.0.so.0 glib-2.68.0_1 +libglib-2.0.so.0 glib-2.68.0_1 +libgmodule-2.0.so.0 glib-2.68.0_1 +libgio-2.0.so.0 glib-2.68.0_1 +libgobject-2.0.so.0 glib-2.68.0_1 libatk-1.0.so.0 atk-1.26.0_1 libpangocairo-1.0.so.0 pango-1.24.0_1 libpangoft2-1.0.so.0 pango-1.24.0_1 diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch index 15e87215d276..1bf1582384ac 100644 --- a/srcpkgs/glib/patches/disable-broken-tests.patch +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -20,16 +20,19 @@ index d8ebd56..be72f5c 100644 plugin_resources_c = custom_target('plugin-resources.c', input : 'test4.gresource.xml', diff --git glib/tests/meson.build glib/tests/meson.build -index 6eb23e8..d7aacfa 100644 +index c77ccdd14..7bf01bb46 100644 --- glib/tests/meson.build +++ glib/tests/meson.build -@@ -11,18 +11,11 @@ glib_tests = { +@@ -11,21 +11,14 @@ glib_tests = { 'cache' : {}, 'charset' : {}, 'checksum' : {}, - 'collate' : {}, 'cond' : {}, - 'convert' : {}, + 'cxx' : { + 'source' : ['cxx.cpp'], + }, 'dataset' : {}, - 'date' : {}, 'dir' : {}, @@ -42,7 +45,7 @@ index 6eb23e8..d7aacfa 100644 'guuid' : {}, 'gvariant' : { 'suite' : ['slow'], -@@ -54,7 +47,6 @@ glib_tests = { +@@ -57,7 +50,6 @@ glib_tests = { 'mutex' : {}, 'node' : {}, 'once' : {}, @@ -50,3 +53,6 @@ index 6eb23e8..d7aacfa 100644 'option-argv0' : {}, 'overflow' : {}, 'overflow-fallback' : { +-- +2.31.0 + diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 6cba65bad221..a412a0fb08a7 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,6 +1,6 @@ # Template file for 'glib' pkgname=glib -version=2.66.8 +version=2.68.0 revision=1 build_style=meson # static version is necessary for qemu-user-static; @@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false" hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)" makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel" -checkdepends="desktop-file-utils shared-mime-info tzdata dbus" +checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest" short_desc="GNU library of C routines" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b +checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs" diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update new file mode 100644 index 000000000000..89470583c5dc --- /dev/null +++ b/srcpkgs/glib/update @@ -0,0 +1 @@ +site="https://gitlab.gnome.org/GNOME/glib/-/tags" From 14709167d92a89bcf14fdc2dcad2e274f100659f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:55:03 +0200 Subject: [PATCH 018/108] glib-networking: update to 2.68.0. --- srcpkgs/glib-networking/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template index 96f312cff4d8..fdb7fbfe8d1a 100644 --- a/srcpkgs/glib-networking/template +++ b/srcpkgs/glib-networking/template @@ -1,6 +1,6 @@ # Template file for 'glib-networking' pkgname=glib-networking -version=2.66.0 +version=2.68.0 revision=1 build_style=meson configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/glib-networking/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099 +checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e lib32disabled=yes post_install() { From cb64131e7c741e9c5587b3b7a7d75bfebf8fc84f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 12:56:16 +0200 Subject: [PATCH 019/108] gnome-backgrounds: update to 40.rc. --- 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 0fac0bb3beee..e8906d11e54e 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=3.38.0 +version=40.rc 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=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3 +checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679 From 73eba3f1ab042eb75dfbd0816fdfc85fc0f8ad8d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:06:39 +0200 Subject: [PATCH 020/108] gnome-initial-setup: update to 40.0. --- srcpkgs/gnome-initial-setup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 35e323179b97..b5f24d939993 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=3.38.4 +version=40.0 revision=1 build_style=meson configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled @@ -18,4 +18,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200 +checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f From 4660c61dbd7a1d6372e4ca5d64254848f1beff0a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:44:49 +0200 Subject: [PATCH 021/108] evolution-data-server: update to 3.40.0. --- common/shlibs | 4 ++-- srcpkgs/evolution-data-server/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 4126667b57c6..97b2c3b05351 100644 --- a/common/shlibs +++ b/common/shlibs @@ -605,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1 libicalvcal.so.3 libical-3.0.4_1 libical-glib.so.3 libical-3.0.4_1 libcamel-1.2.so.62 evolution-data-server-3.30.0_1 -libedataserver-1.2.so.25 evolution-data-server-3.37.90_1 +libedataserver-1.2.so.26 evolution-data-server-3.40.0_1 libebackend-1.2.so.10 evolution-data-server-3.17.90_1 -libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1 +libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1 libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1 libedata-book-1.2.so.26 evolution-data-server-3.34.0_1 libebook-1.2.so.20 evolution-data-server-3.34.0_1 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 8c3709f20d98..7b12f118f94f 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.38.4 +version=3.40.0 revision=1 build_style=cmake build_helper="gir qemu" @@ -19,7 +19,7 @@ license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705 +checksum=ed572f0cb6a2365809943449a8ccbee652681e2d9a1a7f4a54b60cbb53d87445 build_options="gir" build_options_default="gir" From 97bfb1b534ae6297a05751f9624195bd3948ce69 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:56:31 +0200 Subject: [PATCH 022/108] evolution: update to 3.40.0. --- common/shlibs | 1 + srcpkgs/evolution/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 97b2c3b05351..07cef8a8bc3e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1 libevolution-util.so evolution-3.28.0_1 libemail-engine.so evolution-3.28.0_1 libevolution-mail.so evolution-3.28.0_1 +libevolution-mail-formatter.so evolution-3.40.0_1 libevolution-shell.so evolution-3.28.0_1 libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1 libgdata.so.22 libgdata-0.17.9_1 diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index e608802a768a..f3b3656921bb 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.38.4 +version=3.40.0 revision=1 build_style=cmake build_helper="qemu" @@ -19,7 +19,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://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=341f92d24e2b44c2789b0037f1a894ff165487daa4b00b80fae3138a2e05afd4 +checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so" From 20b5d1fac070590208207cbe989f9d696b8bedfc Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:56:37 +0200 Subject: [PATCH 023/108] evolution-ews: update to 3.40.0. --- srcpkgs/evolution-ews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index bfb928598ea4..5433eabac6b2 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.38.0 +version=3.40.0 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -13,4 +13,4 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=59bf59cabb9d193d91076972dd8a6e71ebf34c7bfad01cd6954297347a3077b3 +checksum=e078782c6fc90b5105bbc643418b95b4818fc4334d37d6c2cda63ad5974a5f53 From 31c4a2c1cacf9005d3e81bfe2d81eb0adecc0ae9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:56:45 +0200 Subject: [PATCH 024/108] bijiben: update to 40.0. --- srcpkgs/bijiben/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 8f3f231f77e0..cc4903f53df4 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -1,13 +1,13 @@ # Template file for 'bijiben' pkgname=bijiben -version=3.38.0 -revision=2 +version=40.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Dzeitgeist=true" hostmakedepends="itstool pkg-config gettext glib-devel" makedepends="clutter-gtk-devel evolution-devel tracker3-devel webkit2gtk-devel - zeitgeist-devel libhandy-devel" + zeitgeist-devel libhandy1-devel" depends="desktop-file-utils tracker3 zeitgeist" short_desc="Intuitive note editor with strong GNOME desktop integration" maintainer="Enno Boland " @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Notes" changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1ff6cc0ac6c62907bf2a09a17215edd2f17b74dacab3a5c89a29c3049172be2b +checksum=aefa0ac451628c96e54e79ab544203cbad31551c8d9ad2d896ad71da0e110f25 pre_build() { ninja -C build src/libbiji/biji-marshalers.h From a1b48c8a64113be1df2edc00be851aa87cce78b6 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:57:07 +0200 Subject: [PATCH 025/108] python3-gobject: update to 3.40.1. fix tests --- srcpkgs/python3-gobject/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template index 219749a5acb7..355c2781bebb 100644 --- a/srcpkgs/python3-gobject/template +++ b/srcpkgs/python3-gobject/template @@ -1,6 +1,6 @@ # Template file for 'python3-gobject' pkgname=python3-gobject -version=3.38.0 +version=3.40.1 revision=1 wrksrc="pygobject-${version}" build_style=meson @@ -8,13 +8,18 @@ build_helper="gir" configure_args="-Dpython=python${py3_ver}" hostmakedepends="pkg-config python3 python3-MarkupSafe" makedepends="libglib-devel python3-cairo-devel python3-devel" +checkdepends="python3-pytest gtk+3 xvfb-run" depends="gir-freedesktop python3-cairo" short_desc="Python3 bindings for GObject" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://pygobject.readthedocs.io/" distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz" -checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5 +checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035 + +pre_check() { + make_cmd="xvfb-run ninja" +} python3-gobject-devel_package() { depends="libgirepository-devel python3-cairo-devel From b709d47c5849c46797960f68d2cec24225960bb3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:57:29 +0200 Subject: [PATCH 026/108] libgweather: update to 40.0. --- srcpkgs/libgweather/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index eb686d848214..140f24a2c662 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -6,8 +6,8 @@ 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 python3-gobject-devel" +hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala) python3-gobject-devel" +makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" checkdepends="tzdata" short_desc="GNOME Weather information access library" maintainer="Enno Boland " From fcd00252c30874ec026c03b9cc33c03f827eb6e4 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 13:57:48 +0200 Subject: [PATCH 027/108] folks: update to 0.14.0. --- srcpkgs/folks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 0a120ec6d11b..bc9be3932e36 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,7 +1,7 @@ # Template file for 'folks' pkgname=folks version=0.14.0 -revision=2 +revision=3 build_style=meson build_helper="gir qemu" configure_args="-Db_lto=false" From 6523b912eec1f42e7271c046fec6a9605a788828 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:03:20 +0200 Subject: [PATCH 028/108] gnome-calendar: update to 40.0. --- srcpkgs/gnome-calendar/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 9e8666d3109e..5956653165a6 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,11 +1,11 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=3.38.2 +version=40.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel - gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy-devel + gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel libgweather-devel libical-devel libpeas-devel libsoup-devel" short_desc="Calendar application designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d121bb34b08b6ea601f5dbba43a4b1613a6e5493fc0b1e2ecc90c666711a912d +checksum=6838c3c2c0c729ab3869aa8619ee9afc896923cbae13f9246bbc36999e85e434 build_options="gir" build_options_default="gir" From 2e0c6e8aff5dcc79eb0256e9afea7c7fd6d58f6b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:08:45 +0200 Subject: [PATCH 029/108] gnome-contacts: update to 40.0. --- srcpkgs/gnome-contacts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 1bda8a3708eb..bba06e594d27 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,6 +1,6 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.38.1 +version=40.0 revision=1 build_style=meson hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala" @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Contacts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c96dce19de25d99a219bd52dfff9746226663d0d99d4506d570c2ad979035843 +checksum=c9de6f3f28d84653eda81c63a40f0f5c931ad52c324ff5f9fe4d15c3612f4f70 From 5579c6840690284f486cbc673963645c558168f4 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:47:46 +0200 Subject: [PATCH 030/108] gnome-shell: update to 40.0. --- srcpkgs/gnome-shell/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index f5e8fe3cdc1b..49fe391c9f9c 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -5,11 +5,11 @@ revision=1 build_style=meson build_helper=gir configure_args="-Dsystemd=false" -hostmakedepends="gobject-introspection gtk-doc libxslt pkg-config python3 sassc +hostmakedepends="gobject-introspection 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 gtk4-devel + gnome-menus-devel gsettings-desktop-schemas-devel gstreamer1-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,7 +19,7 @@ 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/40.0/NEWS" +changelog="https://raw.githubusercontent.com/GNOME/gnome-shell/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=bce71f402dfaa9c5e269bf65bf48a22343d896e6cf9a2c34669392d7fbf68478 From 335f652630b25246a058f1189f43209c9f2dede1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:50:25 +0200 Subject: [PATCH 031/108] gnome-todo: update to 3.28.1. --- srcpkgs/gnome-todo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template index c6c4bd2af863..56bd6a405af2 100644 --- a/srcpkgs/gnome-todo/template +++ b/srcpkgs/gnome-todo/template @@ -1,7 +1,7 @@ # Template file for 'gnome-todo' pkgname=gnome-todo version=3.28.1 -revision=6 +revision=7 build_style=meson build_helper="gir qemu" configure_args="-Dintrospection=$(vopt_if gir true false)" From 1e339beecd33f91b4f0ffeca71dc4b5a54a59053 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:53:43 +0200 Subject: [PATCH 032/108] io.elementary.calculator: rebuild with evolution-data-server-3.40.0 --- srcpkgs/io.elementary.calculator/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template index c39cde8fed5a..56abf698403b 100644 --- a/srcpkgs/io.elementary.calculator/template +++ b/srcpkgs/io.elementary.calculator/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.calculator' pkgname=io.elementary.calculator version=1.6.0 -revision=1 +revision=2 wrksrc="calculator-${version}" build_style=meson hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream" From e4e2027673bb7682afa7c99c79b772d85091438a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:54:18 +0200 Subject: [PATCH 033/108] libio.elementary.calculator: rebuild with evolution-data-server-3.40.0 --- srcpkgs/io.elementary.calendar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index e8320792a1e5..7ff446f97d15 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.calendar' pkgname=io.elementary.calendar version=5.0 -revision=4 +revision=5 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32 wrksrc="calendar-${_git_commit}" build_style=meson From 1bc487b8cf4f9391ec21959198833bfc046e1ed1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:56:46 +0200 Subject: [PATCH 034/108] planner: rebuild with evolution-data-server-3.40.0 --- srcpkgs/planner/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template index bfc3ed4c4dde..f292438ad31f 100644 --- a/srcpkgs/planner/template +++ b/srcpkgs/planner/template @@ -1,7 +1,7 @@ # Template file for 'planner' pkgname=planner version=2.5.7 -revision=1 +revision=2 build_style=meson build_helper="gir" hostmakedepends="gettext pkg-config vala glib-devel" From f68e507f658351348f2c8428ea1e2fd9585469ff Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 14:59:40 +0200 Subject: [PATCH 035/108] gnome-panel: update to 3.40.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 9a7593f3a34b..315d4fc1f468 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.38.0 +version=3.40.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=1a8b15aef0a02a6caa9b9209c8d3fb43e7b987a380076691c23f0314ec302f15 +checksum=9f135075edc666cf2b9ca91de35c6703e2b1771c10a7707414fb656c28a59b3b patch_args="-Np1" gnome-panel-devel_package() { From 3f700bcf02d37c8a192cc0643497f3e7fdf81233 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 15:02:48 +0200 Subject: [PATCH 036/108] gnome-keyring: update to 40.0. --- .../gnome-keyring/patches/libcap-ng-fix.patch | 115 ------------------ srcpkgs/gnome-keyring/template | 6 +- 2 files changed, 3 insertions(+), 118 deletions(-) delete mode 100644 srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch diff --git a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch b/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch deleted file mode 100644 index 2b0c3ba92d6c..000000000000 --- a/srcpkgs/gnome-keyring/patches/libcap-ng-fix.patch +++ /dev/null @@ -1,115 +0,0 @@ -From ebc7bc9efacc17049e54da8d96a4a29943621113 Mon Sep 17 00:00:00 2001 -From: Steve Grubb -Date: Fri, 20 Nov 2020 11:52:14 -0500 -Subject: [PATCH] Update libcap-ng capability handling - -There is a change in libcap-ng-0.8.1 that causes gnome-keyring to not -work correctly. The capng_apply function now returns an error if it -cannot change the bounding set. Previously this was ignored. Which means -now gnome-keyring exits when it shouldn't. - -The new patch adds troubleshooting info to the error messages. And it checks -to see if we have CAP_SETPCAP. If we do not, then we cannot change the -bounding set and just set capabilities. On the setuid side, it now drops -the bounding set and clears any supplemental groups that may be left over -as an accident. ---- - daemon/gkd-capability.c | 54 ++++++++++++++++++++++++++--------------- - 1 file changed, 34 insertions(+), 20 deletions(-) - -diff --git daemon/gkd-capability.c daemon/gkd-capability.c -index 9afe3039..6eb7ed75 100644 ---- daemon/gkd-capability.c -+++ daemon/gkd-capability.c -@@ -1,7 +1,7 @@ - /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - /* gkd-capability.c - the security-critical initial phase of the daemon - * -- * Copyright (C) 2011 Steve Grubb -+ * Copyright (C) 2011,2020 Steve Grubb - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as -@@ -35,9 +35,10 @@ - - /* No logging, no gettext */ - static void --early_error (const char *err_string) -+early_error (const char *err_string, int rc) - { -- fprintf (stderr, "gnome-keyring-daemon: %s, aborting\n", err_string); -+ fprintf (stderr, "gnome-keyring-daemon: %s - %d, aborting\n", -+ err_string, rc); - exit (1); - } - -@@ -64,6 +65,8 @@ void - gkd_capability_obtain_capability_and_drop_privileges (void) - { - #ifdef HAVE_LIBCAPNG -+ int rc; -+ - capng_get_caps_process (); - switch (capng_have_capabilities (CAPNG_SELECT_CAPS)) - { -@@ -73,32 +76,43 @@ gkd_capability_obtain_capability_and_drop_privileges (void) - capng_update (CAPNG_ADD, - CAPNG_EFFECTIVE|CAPNG_PERMITTED, - CAP_IPC_LOCK); -- if (capng_change_id (getuid (), getgid (), 0)) -- early_error ("failed dropping capabilities"); -+ if ((rc = capng_change_id (getuid (), getgid (), -+ CAPNG_DROP_SUPP_GRP| -+ CAPNG_CLEAR_BOUNDING))) { -+ early_error ("failed dropping capabilities", -+ rc); -+ } - break; - case CAPNG_FAIL: -- early_error ("error getting process capabilities"); -+ early_error ("error getting process capabilities", 0); - break; - case CAPNG_NONE: -- early_warning ("insufficient process capabilities, insecure memory might get used"); -+ early_warning ("no process capabilities, insecure memory might get used"); - break; -- case CAPNG_PARTIAL: /* File system based capabilities */ -- if (!capng_have_capability (CAPNG_EFFECTIVE, CAP_IPC_LOCK)) { -+ case CAPNG_PARTIAL: { /* File system based capabilities */ -+ capng_select_t set = CAPNG_SELECT_CAPS; -+ if (!capng_have_capability (CAPNG_EFFECTIVE, -+ CAP_IPC_LOCK)) { - early_warning ("insufficient process capabilities, insecure memory might get used"); -- /* Drop all capabilities */ -- capng_clear (CAPNG_SELECT_BOTH); -- capng_apply (CAPNG_SELECT_BOTH); -- break; - } - -- /* Drop all capabilities except ipc_lock */ -+ /* If we don't have CAP_SETPCAP, we can't update the -+ * bounding set */ -+ if (capng_have_capability (CAPNG_EFFECTIVE, -+ CAP_SETPCAP)) { -+ set = CAPNG_SELECT_BOTH; -+ } -+ -+ /* Drop all capabilities except ipc_lock */ - capng_clear (CAPNG_SELECT_BOTH); -- if (capng_update (CAPNG_ADD, -- CAPNG_EFFECTIVE|CAPNG_PERMITTED, -- CAP_IPC_LOCK) != 0) -- early_error ("error dropping process capabilities"); -- if (capng_apply (CAPNG_SELECT_BOTH) != 0) -- early_error ("error dropping process capabilities"); -+ if ((rc = capng_update (CAPNG_ADD, -+ CAPNG_EFFECTIVE|CAPNG_PERMITTED, -+ CAP_IPC_LOCK)) != 0) { -+ early_error ("error updating process capabilities", rc); -+ } -+ if ((rc = capng_apply (set)) != 0) { -+ early_error ("error dropping process capabilities", rc); -+ }} /* Extra brace for local variable declaration */ - break; - } - #endif /* HAVE_LIBCAPNG */ diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index e7bf221fb33f..b8defd1997dd 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -1,7 +1,7 @@ # Template file for 'gnome-keyring' pkgname=gnome-keyring -version=3.36.0 -revision=2 +version=40.0 +revision=1 build_style=gnu-configure configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile" hostmakedepends="autoconf docbook-xsl glib-devel intltool libtasn1-tools libxslt @@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" #changelog="https://raw.githubusercontent.com/GNOME/gnome-keyring/gnome-3-28/NEWS" homepage="https://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87 +checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931 lib32disabled=yes do_check() { From 21848597c064492eb36690ed81616e797d746af2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 15:12:25 +0200 Subject: [PATCH 037/108] gnome-user-docs: update to 40.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 a4ab3218bd75..8edb370dc144 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=3.38.2 +version=40.0 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config itstool" @@ -12,4 +12,4 @@ license="CC-BY-3.0" homepage="https://github.com/GNOME/gnome-user-docs" #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1 +checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91 From 6c93580957881a34342e193824acd3bd108fdb71 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 15:33:25 +0200 Subject: [PATCH 038/108] libgdata: update to 0.18.1. --- srcpkgs/libgdata/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template index 870a1633c70c..835f82f7fa98 100644 --- a/srcpkgs/libgdata/template +++ b/srcpkgs/libgdata/template @@ -1,6 +1,6 @@ # Template file for 'libgdata' pkgname=libgdata -version=0.17.12 +version=0.18.1 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/libgdata" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318 +checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7 build_options="gir vala" build_options_default="gir vala" From 085f421edf32baa13a342f22cf00045f3cace77e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 15:35:03 +0200 Subject: [PATCH 039/108] gvfs: update to 1.48.0. --- srcpkgs/gvfs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index dc487d8e136d..c84f9c756ae3 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs -version=1.46.1 -revision=2 +version=1.48.0 +revision=1 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false -Dman=true" @@ -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/gnome-3-34/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=621ea6c1b9a60b7ed2893938620d3190725a3d9dc65ce5af0fb6c186ee342503 +checksum=3834797751c4e9f8729e774dee142a474f3361cbc0c12b647606433793eae939 # Manually declare shlibs used by the subpkgs. shlib_provides="libgvfscommon.so libgvfsdaemon.so" From 1cb18c4847a73b0de0107f31d37ff71bd99bbeb8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 15:49:25 +0200 Subject: [PATCH 040/108] nautilus: update to 40.0. --- srcpkgs/nautilus/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index e6d843249a60..e47bd77c5f9f 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=3.38.2 +version=40.0 revision=1 build_style=meson build_helper="gir" @@ -8,7 +8,8 @@ configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext glib-devel libxslt pkg-config tracker3" makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel - libX11-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel" + libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel + libhandy1-devel libportal-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tracker3-miners tracker3" checkdepends="tracker3 tracker3-miners python3-gobject dbus" @@ -16,8 +17,8 @@ short_desc="GNOME file manager" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" -distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz" -checksum=d09ceb54c274e50084c8757a73cd247fee5bde02a0b0d13733b0006d1a4196a6 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=7d5002617895ad372e52f7a8e302a32343326739f088fa8df6104af709cc4d40 # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s make_check=extended From fa71fba06b9d14bdd3e487346946264ba3e80c34 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 15:57:50 +0200 Subject: [PATCH 041/108] yelp-xsl: update to 40.0. --- srcpkgs/yelp-xsl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template index 88899d2ed720..3feefeb7a097 100644 --- a/srcpkgs/yelp-xsl/template +++ b/srcpkgs/yelp-xsl/template @@ -1,7 +1,7 @@ # Template file for 'yelp-xsl' # keep up to date with yelp pkgname=yelp-xsl -version=3.38.3 +version=40.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool libxslt" @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Yelp/Xsl" changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03 +checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0 From f63246196b6e0079301c45a7751b919cb29ea691 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:01:16 +0200 Subject: [PATCH 042/108] yelp-tools: update to 40.0. --- srcpkgs/yelp-tools/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template index 350610e33976..96b854281302 100644 --- a/srcpkgs/yelp-tools/template +++ b/srcpkgs/yelp-tools/template @@ -1,9 +1,9 @@ # Template file for 'yelp-tools' pkgname=yelp-tools -version=3.38.0 +version=40.0 revision=1 -build_style=gnu-configure -hostmakedepends="pkg-config itstool libxslt" +build_style=meson +hostmakedepends="pkg-config itstool libxslt python3-lxml" makedepends="yelp-xsl" depends="itstool libxslt yelp-xsl" short_desc="Tools for creating Yelp documentation" @@ -11,4 +11,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=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0 +checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae From 0782f8f1ab95ffa1f19ded24a294d4f82777274b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:04:57 +0200 Subject: [PATCH 043/108] yelp: update to 40.0. --- srcpkgs/yelp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index 0fa0bae4f07e..3074cbc03ca2 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -1,6 +1,6 @@ # Template file for 'yelp' pkgname=yelp -version=3.38.3 +version=40.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" @@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Yelp" # change this when it moves to a new major release changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d +checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0 yelp-devel_package() { depends="yelp-${version}_${revision}" From 50c2f41a8b61a1ad1b87f3a1096784f487209b26 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:05:07 +0200 Subject: [PATCH 044/108] gnome-shell-extensions: update to 40.0. --- 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 4ea740326654..ba043950982e 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=3.38.2 +version=40.0 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643 +checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96 From 5c223f8ed39f222efe7dda60b7e400241aa1329c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:07:13 +0200 Subject: [PATCH 045/108] common/xbps-src: update-check checks new gnome upstream sites --- common/xbps-src/shutils/update_check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 911aa4da5178..3cbbfe95c2ac 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -130,9 +130,9 @@ update_check() { pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)" url="https://bitbucket.org/$pkgurlname/downloads" rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';; - *ftp.gnome.org*) + *ftp.gnome.org*|*download.gnome.org*) : ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"} - url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";; + url="https://download.gnome.org/sources/$pkgname/cache.json";; *kernel.org/pub/linux/kernel/*) rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';; *cran.r-project.org/src/contrib*) From 39c9e5c9965bae39de7d3cee818a3de006244150 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:08:24 +0200 Subject: [PATCH 046/108] common/environment: update GNOME_SITE to new url --- common/environment/setup/misc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh index bf84fce10da5..d22a7388d689 100644 --- a/common/environment/setup/misc.sh +++ b/common/environment/setup/misc.sh @@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases" UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool" XORG_SITE="https://www.x.org/releases/individual" DEBIAN_SITE="http://ftp.debian.org/debian/pool" -GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources" +GNOME_SITE="https://download.gnome.org/sources" KERNEL_SITE="https://www.kernel.org/pub/linux" CPAN_SITE="https://www.cpan.org/modules/by-module" PYPI_SITE="https://files.pythonhosted.org/packages/source" From 7224c684832ec9d02933fe2d9d690dd230d5735d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:15:27 +0200 Subject: [PATCH 047/108] eog: update to 40.0. --- srcpkgs/eog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 2abc43032b5e..ee03076dacc1 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=3.38.2 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e +checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9 shlib_provides="libeog.so" lib32disabled=yes From ca407036b79f53538cd7ce6c689f72c3c2607ad6 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:19:04 +0200 Subject: [PATCH 048/108] evince: update to 40.1. --- srcpkgs/evince/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index fa19b7bf1c40..08abe9e5ab8a 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,6 +1,6 @@ # Template file for 'evince' pkgname=evince -version=3.38.2 +version=40.1 revision=1 build_helper="gir" build_style=meson @@ -12,14 +12,14 @@ hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel # XXX missing packages for DVI backend. makedepends="adwaita-icon-theme djvulibre-devel gnome-desktop-devel libSM-devel libgxps-devel libsecret-devel libspectre-devel nautilus-devel - poppler-glib-devel gspell-devel gst-plugins-base1-devel" + poppler-glib-devel gspell-devel gst-plugins-base1-devel libhandy1-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME Document viewer for multiple document formats" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evince" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=27d419d5fed6305e074628edcfde0cb734fffda205d63cac323391c04903bd94 +checksum=7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d build_options="gir gtk_doc" build_options_default="gir" From 03b02cb05b7ac29b0aedad66c93ad30487363e3b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:28:22 +0200 Subject: [PATCH 049/108] tepl: update to 6.00.0. --- common/shlibs | 2 +- srcpkgs/tepl/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 07cef8a8bc3e..fd622214ff69 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3453,7 +3453,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1 -libtepl-5.so.0 tepl-4.2.0_1 +libtepl-6.so.0 tepl-6.00.0_1 libnomacsCore.so.3 nomacs-3.10.2_4 libaudit.so.1 libaudit-2.8.4_1 libauparse.so.0 libauparse-2.8.4_1 diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template index 798d5cd00775..2213a79cc0f1 100644 --- a/srcpkgs/tepl/template +++ b/srcpkgs/tepl/template @@ -1,6 +1,6 @@ # Template file for 'tepl' pkgname=tepl -version=5.0.0 +version=6.00.0 revision=1 build_style=meson build_helper=gir @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/Tepl" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c6bd2904f53048b7d0149236610b38f502f2634d395d8b9b3c659553f4045a74 +checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63 build_options="gir" build_options_default="gir" From a76bee16d3f5c222c99646575f92fe3fcf7652df Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:28:33 +0200 Subject: [PATCH 050/108] gedit: update to 40.0. --- common/shlibs | 2 +- srcpkgs/gedit/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index fd622214ff69..b7bfe0e237ec 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3572,7 +3572,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1 libqmdnsengine.so.0 qmdnsengine-0.1.0_1 libyang.so.1 libyang-1.0r5_1 libhtp.so.2 libhtp-0.5.30_1 -libgedit-3.38.so gedit-3.37.3_1 +libgedit-40.0.so gedit-40.0_1 libchewing.so.3 libchewing-0.5.1_1 libdwarves.so.1 pahole-1.12_1 libdwarves_emit.so.1 pahole-1.12_1 diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index f73d3735b645..8ec2ec020a9b 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,6 +1,6 @@ # Template file for 'gedit' pkgname=gedit -version=3.38.1 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -17,8 +17,8 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gedit" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0053853d2cd59cad8a1662f5b4fdcfab47b4c0940063bacd6790a9948642844d -shlib_provides="libgedit-3.38.so" +checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9 +shlib_provides="libgedit-40.0.so" python_version=3 build_options="gir" From 13f67b4ad655296a22298018be3d88080af4892a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:38:04 +0200 Subject: [PATCH 051/108] gnome-disk-utility: update to 40.0. --- srcpkgs/gnome-disk-utility/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index d90f7d7d9fc4..4c94a74f037a 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,17 +1,18 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.38.2 +version=40.0 revision=1 build_style=meson configure_args="-Dlogind=none" hostmakedepends="glib-devel gtk-doc intltool pkg-config libxslt" makedepends="gnome-settings-daemon-devel libcanberra-devel libdvdread-devel - libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel" + libnotify-devel libpwquality-devel libsecret-devel udisks2-devel libxslt-devel + libhandy1-devel" depends="desktop-file-utils gptfdisk hicolor-icon-theme parted" short_desc="GNOME libraries and applications for dealing with storage devices" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Disks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=10bedde5494beb34e3a220d6f30d9320c88252feeb8426bd98cefad1836d78e9 +checksum=9f9c72f4453c9f6cb0ff9d9deeec67703e11b0736d826f7d025cf6a686ef4897 lib32disabled=yes From c542f3d31901e33d64225882d47dbf91b9c729af Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:38:19 +0200 Subject: [PATCH 052/108] baobab: update to 40.0. --- srcpkgs/baobab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index 882155356a45..f6264797e694 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,14 +1,14 @@ # Template file for 'baobab' pkgname=baobab -version=3.38.0 +version=40.0 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel vala" -makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel" +makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-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=048468147860816b97f15d50b3c84e9acf0539c1441cfeb63703d112e8728329 +checksum=a6aeaa2c327a997fe0d5f443ce95b785e2ba6e338fb0a026cb7dc7d7d688d1a7 From f2d1149196cfe9c4c13a25da57c1f84b97ef50df Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:38:27 +0200 Subject: [PATCH 053/108] gnome-calculator: update to 40.0. --- srcpkgs/gnome-calculator/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index 220324d3e3c8..e1b23fc9ea25 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,12 +1,12 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=3.38.2 +version=40.0 revision=1 build_style=meson build_helper="gir" hostmakedepends="cmake gettext glib-devel itstool pkg-config vala" makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel - libmpc-devel libsoup-devel" + libmpc-devel libsoup-devel libhandy1-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme" short_desc="GNOME calculator" maintainer="Enno Boland " @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calculator" changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b +checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3 From 4bd09d6648467009f36fdaa053f3d1f1c9b125b9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:38:38 +0200 Subject: [PATCH 054/108] gnome-characters: update to 40.0. --- srcpkgs/gnome-characters/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template index ac264e51a6af..472b961b1eeb 100644 --- a/srcpkgs/gnome-characters/template +++ b/srcpkgs/gnome-characters/template @@ -1,16 +1,16 @@ # Template file for 'gnome-characters' pkgname=gnome-characters -version=3.34.0 -revision=3 +version=40.0 +revision=1 build_style=meson build_helper="gir" hostmakedepends="gettext gjs glib-devel itstool pkg-config" -makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel" +makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel" depends="gnome-desktop gjs" short_desc="Utility to find and insert unusual characters for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/Apps/CharacterMap" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=14438572ee2a99305a5d514d83237c01e873a7bb7dfff5478bbb327894ee0a57 +checksum=0a62f5fd56592d0f3eb7be4b132db796c998d7be08ed67e4bf7f059138515d7c lib32disabled=yes From 1d85eceb6e21e868191d26845e588d9cedb16872 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:38:46 +0200 Subject: [PATCH 055/108] gnome-clocks: update to 40.0. --- srcpkgs/gnome-clocks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index 72f71f9268cb..488fc6f35538 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,6 +1,6 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=3.38.0 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -15,4 +15,4 @@ 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=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438 +checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309 From 7c3d7ffda78fe9fe98071a8e62efc595083af3e8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:49:07 +0200 Subject: [PATCH 056/108] gnome-font-viewer: update to 40.0. --- srcpkgs/gnome-font-viewer/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index f74fcbcb000e..92748bbb386e 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=3.34.0 -revision=2 +version=40.0 +revision=1 build_style=meson hostmakedepends="pkg-config glib-devel" makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel - gnome-desktop-devel harfbuzz-devel" + gnome-desktop-devel harfbuzz-devel libhandy1-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=aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b +checksum=d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42 From 5cf1ae4021867cf0c751783f83f5a3e7c5db6f66 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:49:14 +0200 Subject: [PATCH 057/108] gnome-maps: update to 40.0. --- 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 fa518223ce79..04fa87106e7a 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.38.4 +version=40.0 revision=1 build_style=meson build_helper="gir" @@ -13,4 +13,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d5641e91ffe478fb2aa9ca4896225ccf18ec2ea4d98e35765179818a7dbe44a3 +checksum=ec11dc6c9eea2698592500daf3ad673c1e4f64ebeb0d3d2823fb8655bb5d4a49 From ecac2ecb8ab2a5faa52119f3902dba58b3958a27 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:49:19 +0200 Subject: [PATCH 058/108] gnome-music: update to 40.0. --- srcpkgs/gnome-music/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index cba2e901581a..40244199bba1 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,6 +1,6 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=3.38.2 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -16,5 +16,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Music" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5585b638564cfa1c7d9ebdc72d8c4d8544c6b09f65af425dcc72b86779284030 +checksum=68e09b2cdb0115c30d130e14b2afc561dbf5248f50760e4519733326498358b6 lib32disabled=yes From 04bebca485407b6de7b4da56bf1bab1b8bb7c961 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:49:24 +0200 Subject: [PATCH 059/108] gnome-screenshot: update to 40.0. --- srcpkgs/gnome-screenshot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template index 0a5511db2173..579db2f88827 100644 --- a/srcpkgs/gnome-screenshot/template +++ b/srcpkgs/gnome-screenshot/template @@ -1,6 +1,6 @@ # Template file for 'gnome-screenshot' pkgname=gnome-screenshot -version=3.38.0 +version=40.0 revision=1 build_style=meson hostmakedepends="appstream-glib gettext glib-devel itstool pkg-config" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-screenshot" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e556d3dd134d91344d2857c066434bfb64f7c85bdec7bc33739366b9bcd29fc0 +checksum=368ca95a39e39dc2406c849e8c4205e3f574acdd874c30741873455e3d21a5e2 From 15ddc0e00bc57f9e035eecc4fc7cd6dad49294b5 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:49:30 +0200 Subject: [PATCH 060/108] gnome-system-monitor: update to 40.0. --- srcpkgs/gnome-system-monitor/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 069637e231c0..ecde52ba4395 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,14 +1,14 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor -version=3.38.0 +version=40.0 revision=1 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="pkg-config intltool itstool glib-devel polkit" -makedepends="gtkmm-devel librsvg-devel libgtop-devel" +makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel" short_desc="Process viewer and system resource monitor for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SystemMonitor" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4 +checksum=64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756 From 9159f860d81cd62a4979b113b875f76ca4c6f8d0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:54:22 +0200 Subject: [PATCH 061/108] vte3: update to 0.63.91. --- srcpkgs/vte3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 90278ecf1523..300f20e19e8e 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template file for 'vte3' pkgname=vte3 -version=0.62.1 +version=0.63.91 revision=1 wrksrc="vte-${version}" build_style=meson @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Terminal/VTE" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d +checksum=2a6f58470148d2a16bac387da12525d061e5984b68fc1ff8d068d10d4f1716ab # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" From ca6feca242ef871a6913bbb7cf82402a68298055 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:54:26 +0200 Subject: [PATCH 062/108] gnome-terminal: update to 3.40.0. --- srcpkgs/gnome-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 303ad85bdb18..4430ac709829 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.38.3 +version=3.40.0 revision=1 build_style=gnu-configure configure_args="--disable-static --with-nautilus-extension" @@ -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=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764 +checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e lib32disabled=yes if [ "$CROSS_BUILD" ]; then From 827edf9af4a294db7b1f0686d622c9d71fec30f9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:55:55 +0200 Subject: [PATCH 063/108] gnome-tweaks: update to 40.0. --- srcpkgs/gnome-tweaks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template index d07507984433..10e7a38cf566 100644 --- a/srcpkgs/gnome-tweaks/template +++ b/srcpkgs/gnome-tweaks/template @@ -1,6 +1,6 @@ # Template file for 'gnome-tweaks' pkgname=gnome-tweaks -version=3.34.1 +version=40.0 revision=1 build_style=meson hostmakedepends="gettext" @@ -10,7 +10,7 @@ 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=d89789b3f33de15ab12abb10dd916fd640d642a19d52793fd926164b6413c6a7 +checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a replaces="gnome-tweak-tool>=0" gnome-tweak-tool_package() { From a31c682f8963ab4857a3e712305960fdc18111d1 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:57:42 +0200 Subject: [PATCH 064/108] gnome-weather: update to 40.0. --- srcpkgs/gnome-weather/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index c028e46ba65d..f70aa2c3410e 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,16 +1,16 @@ # Template file for 'gnome-weather' pkgname=gnome-weather -version=3.36.1 -revision=2 +version=40.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" +makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-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=68e6e646159f31c4525c3a5dd308fc0b88dcfc79b61351e9e930dd6efc2ce787 +checksum=2a35a73ab2408762181d8650b037205c17ef7bcb8dff3cf0b34af1a2de66aeef lib32disabled=yes From 6a48f940845e4e78f256284a2d3b00042dac4df6 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 16:59:26 +0200 Subject: [PATCH 065/108] gspell: update to 1.8.4. --- srcpkgs/gspell/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template index a01a5d04ed35..ea7f4862b113 100644 --- a/srcpkgs/gspell/template +++ b/srcpkgs/gspell/template @@ -1,6 +1,6 @@ # Template file for 'gspell' pkgname=gspell -version=1.8.3 +version=1.8.4 revision=1 build_style=gnu-configure build_helper="gir" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz" -checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8 +checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4 # Package build options build_options="gir vala" From 238c2658625252d9f89e3de017e8e51bbe8a6232 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 17:03:01 +0200 Subject: [PATCH 066/108] orca: update to 40.0. --- srcpkgs/orca/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 21f6450b37d0..58c745b3d803 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,6 +1,6 @@ # Template file for 'orca' pkgname=orca -version=3.38.2 +version=40.0 revision=1 build_style=gnu-configure hostmakedepends="intltool itstool pkg-config" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5005ff2e11dd1f713f5acc1903a270119bc58c30fdb8c9f82bcac71497c6c23c +checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 5c6c7d049d699b1d6a541318b8f269b963c6cf91 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 17:07:12 +0200 Subject: [PATCH 067/108] simple-scan: update to 40.0. --- srcpkgs/simple-scan/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template index b9df63878f87..4702a74b46b8 100644 --- a/srcpkgs/simple-scan/template +++ b/srcpkgs/simple-scan/template @@ -1,14 +1,14 @@ # Template file for 'simple-scan' pkgname=simple-scan -version=3.38.5 +version=40.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" -makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel " +makedepends="gtk+3-devel libgusb-devel libwebp-devel sane-devel libhandy1-devel" depends="hicolor-icon-theme sane" short_desc="GTK Simple scanning utility" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/simple-scan" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2a9293aad60cdd2b51f3d43783afa1748e74b5e7df79dd4a8ef2fc940beeb66d +checksum=13811bb2a8619e63a43fc2ef6b71359f2d5c4084c6d5c8b3aad61724b20751af From 66f67213b6a8a980ae94cf280ca60f50d7348e4a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:11:49 +0200 Subject: [PATCH 068/108] gedit-plugins: update to 40.0. --- srcpkgs/gedit-plugins/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template index e288f0d3812b..5bbd7832900b 100644 --- a/srcpkgs/gedit-plugins/template +++ b/srcpkgs/gedit-plugins/template @@ -1,6 +1,6 @@ # Template file for 'gedit-plugins' pkgname=gedit-plugins -version=3.38.1 +version=40.0 revision=1 build_style=meson pycompile_dirs="usr/lib/gedit/plugins" @@ -14,5 +14,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/action/show/Apps/Gedit/PluginsLists" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6c0fa314257f37f1b0151ed77ccfdc49ed61fa52f32ec1e802e4a6d0e6aee2bf +checksum=86de5eb43fa4a3d20ff3abb496d2280ba6046050d7de967c809685e625e37641 python_version=3 From bec04cf6c38dfc3d5b6fabd5ea13b60e38b203c9 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:36:14 +0200 Subject: [PATCH 069/108] gnome-builder: update to 3.40.0. --- srcpkgs/gnome-builder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 648d91a44b7c..58b2eb4c3711 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=3.38.0 -revision=3 +version=3.40.0 +revision=1 build_style=meson build_helper=qemu configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true" @@ -19,7 +19,7 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55 +checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279 patch_args="-Np1" case "$XBPS_TARGET_MACHINE" in From ff26422ae6e3370237a94097ef2c37eba8e217c0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:58:39 +0200 Subject: [PATCH 070/108] libvirt-glib: update to 4.0.0. --- srcpkgs/libvirt-glib/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template index 5dbae0eed23c..b91c6119892e 100644 --- a/srcpkgs/libvirt-glib/template +++ b/srcpkgs/libvirt-glib/template @@ -1,11 +1,11 @@ # Template file for 'libvirt-glib' pkgname=libvirt-glib -version=3.0.0 +version=4.0.0 revision=1 build_helper="gir" -build_style=gnu-configure -configure_args="--disable-static $(vopt_enable gir introspection) - $(vopt_enable vala)" +build_style=meson +configure_args="-Dintrospection=$(vopt_if gir enabled disabled) + -Dvapi=$(vopt_if vala enabled disabled)" hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc python-devel $(vopt_if vala vala)" makedepends="libglib-devel libvirt-devel libxml2-devel python-devel" @@ -13,8 +13,8 @@ short_desc="Glib integration with libvirt" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://libvirt.org" -distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.gz" -checksum=7fff8ca9a2b723dbfd04223b1c7624251c8bf79eb57ec27362a7301b2dd9ebfe +distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz" +checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd replaces="libvirt-glib-python>=0" build_options="gir vala" From 71353246dfb0334ecd6dcc86f3c15e5e7341b059 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:58:55 +0200 Subject: [PATCH 071/108] gnome-sound-recorder: update to 40.0. --- srcpkgs/gnome-sound-recorder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-sound-recorder/template b/srcpkgs/gnome-sound-recorder/template index 2378517ae3f4..24431907839c 100644 --- a/srcpkgs/gnome-sound-recorder/template +++ b/srcpkgs/gnome-sound-recorder/template @@ -1,6 +1,6 @@ # Template file for 'gnome-sound-recorder' pkgname=gnome-sound-recorder -version=3.38.1 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -14,5 +14,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SoundRecorder" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d99ea4f963ec1089e9cd597a7d44398a11ecef131e4142271a1c90c15baa4521 +checksum=d4aa4c104d7465dd15807bf1703e65ff682eff52841c59cf3a07f5eff42e6501 lib32disabled=yes From b46d1ca3c7ca0bd0f6e81685db9dbbe84cd2aa3c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:59:09 +0200 Subject: [PATCH 072/108] gnome-dictionary: update to 40.0. --- srcpkgs/gnome-dictionary/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index 111d3bb484aa..15de25089c21 100644 --- a/srcpkgs/gnome-dictionary/template +++ b/srcpkgs/gnome-dictionary/template @@ -1,7 +1,7 @@ # Template file for 'gnome-dictionary' pkgname=gnome-dictionary -version=3.26.1 -revision=2 +version=40.0 +revision=1 build_style=meson hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel gsettings-desktop-schemas-devel" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Dictionary" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300 +checksum=2e650c2a4cea8cc4d02d4a583c456cbbc9d1871e918c7dc4de081ded1d830db5 replaces="gnome-utils>=3.0" post_install() { From 216bf1c091f76996485e0ae41efaa2dfea585a15 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:59:16 +0200 Subject: [PATCH 073/108] gnome-boxes: update to 40.0. --- srcpkgs/gnome-boxes/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index e51d2d19a5d7..06c2804b6870 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=3.38.0 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -9,7 +9,7 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol tracker-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel - libhandy-devel" + libhandy1-devel tracker3-devel" depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker" short_desc="GNOME 3 application to access remote or virtual systems" maintainer="Enno Boland " @@ -17,4 +17,4 @@ license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Boxes" changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=696b599fc21af941975679205f2b129cffa03632c444810dd94b1409d041a38b +checksum=fa7f1a5f4d741c962a6aa69cdc6d81d57a2dd29496cb9510629ce166af61acf5 From 483756e1506ab808db8c8dd6174353685ec4340a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:59:24 +0200 Subject: [PATCH 074/108] epiphany: update to 40.0. --- srcpkgs/epiphany/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 7b8c824af59e..db7e343e5c9b 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.38.3 +version=40.0 revision=1 build_helper="gir" build_style=meson @@ -9,7 +9,8 @@ hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel - nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel" + nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel + libarchive-devel" depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk" short_desc="Intuitive GNOME web browser" maintainer="Enno Boland " @@ -17,4 +18,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-3-38/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ce62c1fa3e442a9d6131fc884a6bc9a65cf06224c30d649c49624c2ebcb0d275 +checksum=d5f81c0f66ad1bb0137686b337541116e71a1336579b8bc0aaeafdd9aaaba844 From 05d7427f6e8e76a5af01209fb98283e224944b0a Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:59:40 +0200 Subject: [PATCH 075/108] gnome-core: update to 40.0. --- srcpkgs/gnome-core/template | 57 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index 075bd15cdd37..2d7804c5c319 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,7 +1,7 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=3.38.0 -revision=3 +version=40.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" maintainer="q66 " @@ -9,45 +9,44 @@ license="GPL-2.0-only, LGPL-2.0-only" homepage="https://www.gnome.org" depends=" - adwaita-icon-theme>=3.38.0 - at-spi2-core>=2.38.0 + adwaita-icon-theme>=40.rc + at-spi2-core>=2.40.0 at-spi2-atk>=2.38.0 - cantarell-fonts>=0.201 - dconf>=0.36.0 - evolution-data-server>=3.38.0 + cantarell-fonts>=0.301 + dconf>=0.40.0 + evolution-data-server>=3.40.0 folks>=0.14.0 font-adobe-source-code-pro>=2.030R - gcr>=3.38.0 - gdm>=3.38.0 - geocode-glib>=3.26.0 + gcr>=3.40.0 + gdm>=3.40.0 + geocode-glib>=3.26.2 gfbgraph>=0.2.4 - gjs>=1.66.0 - glib>=2.66.0 - glib-networking>=2.66.0 + gjs>=1.68.0 + glib>=2.68.0 + glib-networking>=2.68.0 gmime3>=3.2.7 - gnome-backgrounds>=3.38.0 - gnome-bluetooth>=3.34.1 + gnome-backgrounds>=40.rc + gnome-bluetooth>=3.34.3 gnome-color-manager>=3.36.0 - gnome-control-center>=3.38.0 - gnome-desktop>=3.38.0 - gnome-getting-started-docs>=3.36.2 - gnome-initial-setup>=3.38.0 - gnome-keyring>=3.36.0 + gnome-control-center>=40.0 + gnome-desktop>=40.0 + gnome-initial-setup>=40.0 + gnome-keyring>=40.0 gnome-online-accounts>=3.38.0 gnome-online-miners>=3.34.0 gnome-session>=3.38.0 gnome-settings-daemon>=3.38.0 - gnome-shell>=3.38.0 - gnome-shell-extensions>=3.38.0 + gnome-shell>=40.0 + gnome-shell-extensions>=40.0 gnome-themes-standard>=3.28 - gnome-user-docs>=3.38.0 + gnome-user-docs>=40.0 gnome-video-effects>=0.5.0 - gsettings-desktop-schemas>=3.38.0 - gvfs>=1.46.0 - mutter>=3.38.0 - nautilus>=3.38.0 + gsettings-desktop-schemas>=40.0 + gvfs>=1.48.0 + mutter>=40.0 + nautilus>=40.0 sushi>=3.38.0 - tracker3>=3.0.0 - yelp>=3.38.0 + tracker3>=3.0.2 + yelp>=40.0 xdg-desktop-portal-gtk>=1.8.0 zenity>=3.32.0" From 7e74acc0aeb69ad241887f4ec42a95a32d77ef8d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 19:59:45 +0200 Subject: [PATCH 076/108] gnome: update to 40.0. --- srcpkgs/gnome/template | 90 +++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 32b678e9e49d..06b3ad30d0e0 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome -version=3.38.0 -revision=2 +version=40.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Enno Boland " @@ -10,69 +10,69 @@ homepage="https://www.gnome.org" depends=" gnome-core>=${version} - baobab>=3.38.0 + baobab>=40.0 cheese>=3.38.0 - eog>=3.38.0 - evince>=3.38.0 + eog>=40.0 + evince>=40.1 file-roller>=3.38.0 - gedit>=3.38.0 - gnome-calculator>=3.38.0 - gnome-calendar>=3.38.0 - gnome-characters>=3.34.0 - gnome-clocks>=3.38.0 - gnome-contacts>=3.38.0 - gnome-disk-utility>=3.38.0 - gnome-font-viewer>=3.34.0 - gnome-maps>=3.38.0 - gnome-music>=3.38.0 - gnome-screenshot>=3.38.0 - gnome-system-monitor>=3.38.0 - gnome-terminal>=3.38.0 - gnome-tweaks>=3.34.0 - gnome-weather>=3.36.1 + gedit>=40.0 + gnome-calculator>=40.0 + gnome-calendar>=40.0 + gnome-characters>=40.0 + gnome-clocks>=40.0 + gnome-contacts>=40.0 + gnome-disk-utility>=40.0 + gnome-font-viewer>=40.0 + gnome-maps>=40.0 + gnome-music>=40.0 + gnome-screenshot>=40.0 + gnome-system-monitor>=40.0 + gnome-terminal>=3.40.0 + gnome-tweaks>=40.0 + gnome-weather>=40.0 gsound>=1.0.2 - gspell>=1.8.3 + gspell>=1.8.4 mousetweaks>=3.32.0 - network-manager-applet>=1.8.2 - orca>=3.38.0 + network-manager-applet>=1.20.0 + orca>=40.0 phodav>=2.5 - simple-scan>=3.38.0 + simple-scan>=40.0 totem>=3.38.0 - yelp-tools>=3.38.0" + yelp-tools>=40.0" _apps_depends=" - bijiben>=3.38.0 + bijiben>=40.0 dconf-editor>=3.38.0 devhelp>=3.38.0 - epiphany>=3.38.0 - evolution>=3.38.0 + epiphany>=40.0 + evolution>=3.40.0 ghex>=3.18.4 gitg>=3.32.1 - gedit-plugins>=3.38.0 - gnome-boxes>=3.38.0 - gnome-builder>=3.38.0 - gnome-calculator>=3.38.0 - gnome-calendar>=3.38.0 - gnome-characters>=3.34.0 - gnome-clocks>=3.38.0 - gnome-dictionary>=3.26.1 - gnome-disk-utility>=3.38.0 + gedit-plugins>=40.0 + gnome-boxes>=40.0 + gnome-builder>=3.40.0 + gnome-calculator>=40.0 + gnome-calendar>=40.0 + gnome-characters>=40.0 + gnome-clocks>=40.0 + gnome-dictionary>=40.0 + gnome-disk-utility>=40.0 gnome-documents>=3.34.0 - gnome-font-viewer>=3.34.0 - gnome-maps>=3.38.0 - gnome-music>=3.38.0 + gnome-font-viewer>=40.0 + gnome-maps>=40.0 + gnome-music>=40.0 gnome-nettool>=3.8.1 gnome-photos>=3.38.0 gnome-recipes>=2.0.2 - gnome-screenshot>=3.38.0 - gnome-sound-recorder>=3.38.0 - gnome-system-monitor>=3.38.0 - gnome-terminal>=3.38.0 + gnome-screenshot>=40.0 + gnome-sound-recorder>=40.0 + gnome-system-monitor>=40.0 + gnome-terminal>=3.40.0 gnome-todo>=3.28.1 nemiver>=0.9.6 polari>=3.38.0 rygel>=0.40.0 - simple-scan>=3.38.0 + simple-scan>=40.0 totem>=3.38.0 vino>=3.22.0" From 5a99a98311572b8b50cb09ace55300fade8be0ea Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 22:35:53 +0200 Subject: [PATCH 077/108] gnome-books: update to 40.0. --- srcpkgs/gnome-books/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template index 1d4974fe1832..bcb27e87c8ed 100644 --- a/srcpkgs/gnome-books/template +++ b/srcpkgs/gnome-books/template @@ -1,16 +1,16 @@ # Template file for 'gnome-books' pkgname=gnome-books -version=3.34.0 -revision=2 +version=40.0 +revision=1 build_helper="gir" build_style=meson hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt gettext appstream-glib desktop-file-utils" makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel tracker-devel - gnome-desktop-devel evince-devel libgepub-devel" + gnome-desktop-devel evince-devel libgepub-devel tracker3-devel" short_desc="E-book manager application for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Books" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94 +checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130 From 2a39e605c105ffc072ed44a51e8f6e34fbadeb3b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 22:36:12 +0200 Subject: [PATCH 078/108] gnome: add gnome-books to apps --- srcpkgs/gnome/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 06b3ad30d0e0..decc3bfd2bfa 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -49,6 +49,7 @@ _apps_depends=" ghex>=3.18.4 gitg>=3.32.1 gedit-plugins>=40.0 + gnome-books>=40.0 gnome-boxes>=40.0 gnome-builder>=3.40.0 gnome-calculator>=40.0 From ec3c9507ab386a9e981c27c691c509005f8be99c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 22:52:04 +0200 Subject: [PATCH 079/108] gnome-core: update gnome-bluetooth --- srcpkgs/gnome-core/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index 2d7804c5c319..fedf6b594530 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -26,7 +26,7 @@ depends=" glib-networking>=2.68.0 gmime3>=3.2.7 gnome-backgrounds>=40.rc - gnome-bluetooth>=3.34.3 + gnome-bluetooth>=3.34.5 gnome-color-manager>=3.36.0 gnome-control-center>=40.0 gnome-desktop>=40.0 From 9e1fb40b8a7e32e72de17d84955ced501b8cef00 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 22:52:23 +0200 Subject: [PATCH 080/108] gnome-bluetooth: update to 3.34.5. --- srcpkgs/gnome-bluetooth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 9a9480ad0ab1..80689df392fd 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -1,6 +1,6 @@ # Template file for 'gnome-bluetooth' pkgname=gnome-bluetooth -version=3.34.3 +version=3.34.5 revision=1 build_helper="gir" build_style=meson @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomeBluetooth" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0a068e3bddbbdab46991521e6624098579abe80da242398bdd579c4ca6926422 +checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9 build_options="gir" build_options_default="gir" From 53439d98a9c9d43bb804684e743ac63c16580fd3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 22:55:50 +0200 Subject: [PATCH 081/108] Revert "gnome-initial-setup: update to 40.0." This reverts commit ffeacc1d082a34a61470c2509b2de5410630b8b8. --- srcpkgs/gnome-initial-setup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index b5f24d939993..35e323179b97 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=40.0 +version=3.38.4 revision=1 build_style=meson configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled @@ -18,4 +18,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f +checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200 From 3975ca8620f3fefe216c20892df9e4ce53589be2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:00:17 +0200 Subject: [PATCH 082/108] gnome-initial-setup: update to 40.0. --- srcpkgs/gnome-initial-setup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 35e323179b97..b5f24d939993 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=3.38.4 +version=40.0 revision=1 build_style=meson configure_args="-Dsoftware-sources=disabled -Dparental_controls=disabled @@ -18,4 +18,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8fd6c1cb5b2db0ff77c5b9170473f51c977c13301919cb54c68114b6f56f3200 +checksum=14e0c74614380ee112a7414fec6606bd0f6f3f421b980070ca7d519d1b99896f From 294d60e71be09604a1a9a72227ebe881d5091c73 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:08:55 +0200 Subject: [PATCH 083/108] gnome-usage: update to 3.38.1. --- srcpkgs/gnome-usage/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template index 5ece1950473b..d57dd57a1c82 100644 --- a/srcpkgs/gnome-usage/template +++ b/srcpkgs/gnome-usage/template @@ -1,6 +1,6 @@ # Template file for 'gnome-usage' pkgname=gnome-usage -version=3.38.0 +version=3.38.1 revision=1 build_style=meson hostmakedepends="glib-devel pkg-config vala gettext" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Usage" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=94d58202fd92094ee2a2647ea3f96d0b16b5f5d7f9bf5ae99f1c33117d1a1a57 +checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393 From 3f92539c2c1a721e48e811f9598f7fb1ef1d3aef Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:09:26 +0200 Subject: [PATCH 084/108] gnome: add gnote --- srcpkgs/gnome/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index decc3bfd2bfa..40d177182045 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -70,6 +70,7 @@ _apps_depends=" gnome-system-monitor>=40.0 gnome-terminal>=3.40.0 gnome-todo>=3.28.1 + gnote>=40.0 nemiver>=0.9.6 polari>=3.38.0 rygel>=0.40.0 From 9fccb613a69a0ddf7905e91947ff1ea812af350d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:09:42 +0200 Subject: [PATCH 085/108] gnote: update to 40.0. --- srcpkgs/gnote/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template index 0ed64fd9239b..e2e25c08375f 100644 --- a/srcpkgs/gnote/template +++ b/srcpkgs/gnote/template @@ -1,6 +1,6 @@ # Template file for 'gnote' pkgname=gnote -version=3.38.1 +version=40.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" @@ -13,5 +13,5 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Gnote" distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz" -checksum=c427d5e177339106e53976ab4f65f8719a48f7f712ce94d2184d545da174b2a9 +checksum=e224caf8bb433dec9a2258ea2f8739afabde577210e7fb17596614569f7d0b3b lib32disabled=yes From 79e11fcc237a010c5ff046c18ff9f348b4820854 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:12:17 +0200 Subject: [PATCH 086/108] gtk+3: update to 3.24.28. --- srcpkgs/gtk+3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 03f4a90c4992..60c6459b24b5 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,7 +1,7 @@ # Template file for 'gtk+3' # Revbump gtk-layer-shell when updating, otherwise it presents a warning message pkgname=gtk+3 -version=3.24.26 +version=3.24.28 revision=1 wrksrc="gtk+-${version}" build_style=gnu-configure @@ -28,7 +28,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=2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9 +checksum=b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6 # Package build options build_options="broadway colord cups gir cloudproviders wayland x11" From b5a7a24d307c9a123ac489c60086db5aadf9c0ec Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:17:06 +0200 Subject: [PATCH 087/108] gtkmm: update to 3.24.4. --- srcpkgs/gtkmm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index 8efe5d72596d..d3beee8a20aa 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -1,6 +1,6 @@ # Template file for 'gtkmm' pkgname=gtkmm -version=3.24.3 +version=3.24.4 revision=1 build_style=meson hostmakedepends="pkg-config mm-common gdk-pixbuf" @@ -12,7 +12,7 @@ license="LGPL-2.1-or-later" homepage="https://gtkmm.org" changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435 +checksum=9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743 do_check() { xvfb-run ninja -C build test From a6a476d4925f2b76287ad4ca5f7b6c38f999ed9d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:20:50 +0200 Subject: [PATCH 088/108] gtranslator: update to 40.0. --- srcpkgs/gtranslator/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template index f9f9d0e3bc13..9f5b702461df 100644 --- a/srcpkgs/gtranslator/template +++ b/srcpkgs/gtranslator/template @@ -1,15 +1,16 @@ # Template file for 'gtranslator' pkgname=gtranslator -version=3.38.0 -revision=2 +version=40.0 +revision=1 build_style=meson hostmakedepends="gettext pkg-config glib-devel itstool" makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel gsettings-desktop-schemas-devel gtk+3-devel gspell-devel - libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel" + libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel + libhandy1-devel" short_desc="GNOME translation making program" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Gtranslator" distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz" -checksum=dbcda9b81a22d9233be18e99fd5c448f6ab05759d1e94c10580bb831ca2d7635 +checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834 From 9a68b043ad8716dfc0be1bdf8f36afd1fbe4ba9c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:22:05 +0200 Subject: [PATCH 089/108] jsonrpc-glib: update to 3.38.0. --- srcpkgs/jsonrpc-glib/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template index 25ce4b94f799..17b59b243b63 100644 --- a/srcpkgs/jsonrpc-glib/template +++ b/srcpkgs/jsonrpc-glib/template @@ -1,7 +1,7 @@ # Template file for 'jsonrpc-glib' pkgname=jsonrpc-glib -version=3.32.0 -revision=2 +version=3.38.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false) @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib" changelog="https://raw.githubusercontent.com/GNOME/jsonrpc-glib/jsonrpc-glib-3-32/NEWS" distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz" -checksum=bc60aa36c8bdc9c701ad490508445633a9f3973ae0bd5bdd0633d5f6ffeea6eb +checksum=dc5f1914a91152b70fa8fc9a11ede13148ab4af644db27a36632388c927a8a82 build_options="gir vala" build_options_default="gir vala" From f2224168df4f0d97a67ba28fe339e18a2c392535 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:25:42 +0200 Subject: [PATCH 090/108] libdazzle: update to 3.40.0. --- srcpkgs/libdazzle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 9b807be94745..334e0f6a5433 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,6 +1,6 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.38.0 +version=3.40.0 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libdazzle" changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f +checksum=dba99a7e65fa6662c012b306e5d0f99ff3b466a46059ea7aa0104aaf65ce4ba5 build_options="gir" build_options_default="gir" From c179269ae053c817812fe68bbc1fe797748d96ce Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:34:33 +0200 Subject: [PATCH 091/108] libmanette: update to 0.2.6. --- srcpkgs/libmanette/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template index c05dff01bf1c..cdf3888ac140 100644 --- a/srcpkgs/libmanette/template +++ b/srcpkgs/libmanette/template @@ -1,6 +1,6 @@ # Template file for 'libmanette' pkgname=libmanette -version=0.2.5 +version=0.2.6 revision=1 build_helper="gir" build_style=meson @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/aplazas/libmanette" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b +checksum=63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac libmanette-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}" From a06c30a71000701b65ebd9eef52970bcb6c32ba3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:36:14 +0200 Subject: [PATCH 092/108] libgudev: update to 236. --- srcpkgs/libgudev/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template index 7f95c3ee2db9..47d1b8fc365d 100644 --- a/srcpkgs/libgudev/template +++ b/srcpkgs/libgudev/template @@ -1,20 +1,21 @@ # Template file for 'libgudev' pkgname=libgudev -version=233 +version=236 revision=1 -build_style=gnu-configure +build_style=meson build_helper="gir" -configure_args="$(vopt_enable gir introspection) --disable-umockdev" -hostmakedepends="pkg-config glib-devel" +configure_args="-Dintrospection=$(vopt_if gir enabled disabled) + -Dvala=$(vopt_if vala enabled disabled)" +hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)" makedepends="libglib-devel eudev-libudev-devel" short_desc="Library providing GObject bindings for libudev" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://wiki.gnome.org/Projects/libgudev" distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03 +checksum=e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524 -build_options="gir" +build_options="gir vala" build_options_default="gir" replaces="eudev-libgudev>=0" @@ -27,6 +28,9 @@ libgudev-devel_package() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/pkgconfig + if [ "$build_option_vala" ]; then + vmove usr/share/vala + fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi From 72b6f57b2f24908aa4586f2e5c1c49f132f3d37c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:39:41 +0200 Subject: [PATCH 093/108] metacity: update to 3.40.0. --- srcpkgs/metacity/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template index 643ee4396b95..51904e577fbb 100644 --- a/srcpkgs/metacity/template +++ b/srcpkgs/metacity/template @@ -1,6 +1,6 @@ # Template file for 'metacity' pkgname=metacity -version=3.38.0 +version=3.40.0 revision=1 build_style=gnu-configure hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity" @@ -15,4 +15,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/metacity" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=81193121b0d85dc93fef5701c00d0caf5313d10d9b19008403a4286cb04e11ac +checksum=224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5 From 0341c58f563f61a6504db05defeda194a1d10674 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:40:57 +0200 Subject: [PATCH 094/108] retro-gtk: update to 1.0.2. --- srcpkgs/retro-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template index 04ad9cf051b0..6fbb483b6e51 100644 --- a/srcpkgs/retro-gtk/template +++ b/srcpkgs/retro-gtk/template @@ -1,6 +1,6 @@ # Template file for 'retro-gtk' pkgname=retro-gtk -version=1.0.0 +version=1.0.2 revision=1 build_style=meson build_helper="gir" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/retro-gtk" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5c7437a768125a6f627d063ed890e9328d4108db52a6d5aa10e52d2f25bb88db +checksum=7118b0b5f9c1f2f0bc742faf8689eb48b44833efada0f6dbce990ec9783bcbd2 build_options="gir" build_options_default="gir" From b1ece9fd5f63bee764a6e4bd89510975552c58c5 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:44:44 +0200 Subject: [PATCH 095/108] libpeas: update to 1.30.0. --- srcpkgs/libpeas/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template index be9de4fd4c65..a63e33fc5111 100644 --- a/srcpkgs/libpeas/template +++ b/srcpkgs/libpeas/template @@ -1,7 +1,7 @@ # Template file for 'libpeas' pkgname=libpeas -version=1.26.0 -revision=2 +version=1.30.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Ddemos=false -Dvapi=true" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Libpeas" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376 +checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3 libpeas-devel_package() { depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel From 6fe567526f2f55030eb61fb379c076afe8a8dc93 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 23:44:57 +0200 Subject: [PATCH 096/108] libgexiv2: update to 0.12.2. --- srcpkgs/libgexiv2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template index d1e5e2f53046..41b9138d7f4e 100644 --- a/srcpkgs/libgexiv2/template +++ b/srcpkgs/libgexiv2/template @@ -1,6 +1,6 @@ # Template file for 'libgexiv2' pkgname=libgexiv2 -version=0.12.1 +version=0.12.2 revision=1 wrksrc="${pkgname/lib/}-${version}" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/gexiv2" distfiles="${GNOME_SITE}/gexiv2/${version%.*}/${pkgname/lib/}-${version}.tar.xz" -checksum=8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77 +checksum=2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c build_options="gir vala" build_options_default="gir vala" From 7cd9706a91a91e24bc05b21d73074f808316f3a3 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 3 Apr 2021 21:25:41 +0200 Subject: [PATCH 097/108] gnome-getting-started-docs: remove, no longer part of gnome --- srcpkgs/gnome-getting-started-docs/template | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 srcpkgs/gnome-getting-started-docs/template diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template deleted file mode 100644 index 63ba35af86de..000000000000 --- a/srcpkgs/gnome-getting-started-docs/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'gnome-getting-started-docs' -pkgname=gnome-getting-started-docs -version=3.38.1 -revision=1 -build_style=gnu-configure -hostmakedepends="intltool itstool pkg-config" -short_desc="Getting Started documentation for GNOME" -maintainer="Enno Boland " -license="CC-BY-SA-3.0" -homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs" -#changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859 From 8abe1c0820701ae81053abf972726ec128707fb4 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Apr 2021 00:11:48 +0200 Subject: [PATCH 098/108] libgxps: update to 0.3.2. --- srcpkgs/libgxps/patches/fix-gir-cross.patch | 14 -------------- srcpkgs/libgxps/template | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/libgxps/patches/fix-gir-cross.patch diff --git a/srcpkgs/libgxps/patches/fix-gir-cross.patch b/srcpkgs/libgxps/patches/fix-gir-cross.patch deleted file mode 100644 index 4685b98184d9..000000000000 --- a/srcpkgs/libgxps/patches/fix-gir-cross.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/meson.build b/meson.build -index a34a616..2d6eb1e 100644 ---- meson.build -+++ meson.build -@@ -131,7 +131,7 @@ libm_dep = cc.find_library('m', required: false) - - gnome = import('gnome') - gir = find_program('g-ir-scanner', required: false) --build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable-introspection') -+build_gir = gir.found() and not get_option('disable-introspection') - - configure_file(output: 'config.h', configuration: cdata) - - diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template index 6a353e1ca812..075c6e54e446 100644 --- a/srcpkgs/libgxps/template +++ b/srcpkgs/libgxps/template @@ -1,7 +1,7 @@ # Template file for 'libgxps' pkgname=libgxps -version=0.3.1 -revision=3 +version=0.3.2 +revision=1 build_style=meson build_helper="gir" configure_args="-Denable-test=false @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/libgxps" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1a939fc8fcea9471b7eca46b1ac90cff89a30d26f65c7c9a375a4bf91223fa94 +checksum=6d27867256a35ccf9b69253eb2a88a32baca3b97d5f4ef7f82e3667fa435251c # Package build options build_options="gir" From 141bb9a0ca426ce48d37dbd7db8ef7416be01b01 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Apr 2021 00:14:51 +0200 Subject: [PATCH 099/108] removed-packaes: add gnome-getting-started-docs --- srcpkgs/removed-packages/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 79e7c4d1c77e..3dee863e0d27 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=40 +revision=41 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -67,6 +67,7 @@ replaces=" geoip-data<=20171002_2 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 + gnome-getting-started-docs<=3.38.1_1 gnome-twitch<=0.4.2_1 go1.4-bootstrap<=20171003_2 goat<=0.0.0.28022016_10 From 36cb990ffb7bc0bf9da3f9d4b221b310d836451e Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Apr 2021 11:50:20 +0200 Subject: [PATCH 100/108] gspell: fix tests --- srcpkgs/gspell/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template index ea7f4862b113..7c4228fd5757 100644 --- a/srcpkgs/gspell/template +++ b/srcpkgs/gspell/template @@ -9,6 +9,7 @@ configure_args="--disable-static $(vopt_enable gir introspection) hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')" makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes $(vopt_if vala vala)" +checkdepends="xvfb-run hunspell-en_US" short_desc="Flexible API to add spell checking to a GTK+ application" maintainer="Enno Boland " license="LGPL-2.1-or-later" @@ -20,6 +21,10 @@ checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4 build_options="gir vala" build_options_default="gir vala" +pre_check() { + make_cmd="xvfb-run make" +} + gspell-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 2ee7451ce8ff9834ecc617fa294983195eb39b24 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Apr 2021 12:00:05 +0200 Subject: [PATCH 101/108] dconf: fix tests --- srcpkgs/dconf/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template index b79822642fc3..a23a2d0e03cf 100644 --- a/srcpkgs/dconf/template +++ b/srcpkgs/dconf/template @@ -6,6 +6,7 @@ build_style=meson hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala" makedepends="dbus-devel libglib-devel gtk+3-devel libxml2-devel vala-devel bash-completion" +checkdepends="dbus" short_desc="Low-level configuration system" maintainer="Enno Boland " license="LGPL-2.1-or-later" From ac73d50958ffa61834424372f02ba24874e36747 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Apr 2021 12:11:00 +0200 Subject: [PATCH 102/108] libpeas: fix tests --- srcpkgs/libpeas/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template index a63e33fc5111..83fe867c8605 100644 --- a/srcpkgs/libpeas/template +++ b/srcpkgs/libpeas/template @@ -8,6 +8,7 @@ configure_args="-Ddemos=false -Dvapi=true" hostmakedepends="pkg-config intltool glib-devel python3 lua51" makedepends="vala-devel gtk+3-devel python3-gobject-devel glade3-devel lua51-devel" +checkdepends="xvfb-run" depends="python3-gobject hicolor-icon-theme" short_desc="Gobject-based plugins engine" maintainer="Enno Boland " @@ -16,6 +17,10 @@ homepage="https://wiki.gnome.org/Projects/Libpeas" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3 +pre_check() { + make_cmd="xvfb-run ninja" +} + libpeas-devel_package() { depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel ${sourcepkg}-${version}_${revision}" From 89ef1fd70184fdd7f53d859fa38a0f553ddbf6ac Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Apr 2021 13:31:35 +0200 Subject: [PATCH 103/108] gnome-bluetooth: fix tests --- srcpkgs/gnome-bluetooth/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index 80689df392fd..83d89c0a8acb 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel gvfs-devel bluez eudev-libudev-devel libcanberra-devel" depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils" +checkdepends="python3-dbus" short_desc="GNOME Bluetooth Subsystem" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" From 5c8fe686cdd4f0b070c71249baa2b264913add79 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 4 Apr 2021 17:19:20 +0200 Subject: [PATCH 104/108] glib: disable broken tests on musl --- .../glib/patches/disable-broken-tests.patch | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch index 1bf1582384ac..2108faeeda45 100644 --- a/srcpkgs/glib/patches/disable-broken-tests.patch +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -1,8 +1,8 @@ diff --git gio/tests/meson.build gio/tests/meson.build -index d8ebd56..be72f5c 100644 +index a926ae01a..c2093cf4e 100644 --- gio/tests/meson.build +++ gio/tests/meson.build -@@ -35,7 +35,6 @@ gio_tests = { +@@ -50,7 +50,6 @@ gio_tests = { 'cancellable' : {}, 'contexts' : {}, 'contenttype' : {}, @@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644 'credentials' : {}, 'data-input-stream' : {}, 'data-output-stream' : {}, -@@ -550,7 +549,7 @@ if installed_tests_enabled +@@ -74,7 +73,6 @@ gio_tests = { + 'network-monitor' : {}, + 'network-monitor-race' : {}, + 'permission' : {}, +- 'pollable' : {'dependencies' : [libdl_dep]}, + 'proxy-test' : {}, + 'readwrite' : {}, + 'simple-async-result' : {}, +@@ -567,7 +565,7 @@ if installed_tests_enabled endforeach endif @@ -20,10 +28,10 @@ index d8ebd56..be72f5c 100644 plugin_resources_c = custom_target('plugin-resources.c', input : 'test4.gresource.xml', diff --git glib/tests/meson.build glib/tests/meson.build -index c77ccdd14..7bf01bb46 100644 +index c77ccdd14..b0dab692a 100644 --- glib/tests/meson.build +++ glib/tests/meson.build -@@ -11,21 +11,14 @@ glib_tests = { +@@ -11,21 +11,13 @@ glib_tests = { 'cache' : {}, 'charset' : {}, 'checksum' : {}, @@ -37,7 +45,7 @@ index c77ccdd14..7bf01bb46 100644 - 'date' : {}, 'dir' : {}, 'environment' : {}, - 'error' : {}, +- 'error' : {}, - 'fileutils' : {}, - 'gdatetime' : { - 'suite' : ['slow'], @@ -45,7 +53,7 @@ index c77ccdd14..7bf01bb46 100644 'guuid' : {}, 'gvariant' : { 'suite' : ['slow'], -@@ -57,7 +50,6 @@ glib_tests = { +@@ -57,7 +49,6 @@ glib_tests = { 'mutex' : {}, 'node' : {}, 'once' : {}, From 848a5955c9c58e956d5d419581e2c8390c759533 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 5 Apr 2021 17:09:53 +0200 Subject: [PATCH 105/108] gobject-introspection: fix cross build. ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac --- srcpkgs/gobject-introspection/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index b853759a9583..c6e616dd862f 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -19,7 +19,7 @@ patch_args="-Np1" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross" - configure_args+=" -Dgi_cross_use_host_gi=true + configure_args+=" -Dgi_cross_use_prebuilt_gi=true -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}" From da838bdbdc4c4c4bdc86b1b5860005626a72c6db Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 5 Apr 2021 19:21:32 +0200 Subject: [PATCH 106/108] libvirt-glib: make gtk doc a build_option to fix cross. Default is off --- srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 ++++++++++++++++++++ srcpkgs/libvirt-glib/template | 12 +++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff new file mode 100644 index 000000000000..9ce7da845c3e --- /dev/null +++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff @@ -0,0 +1,20 @@ +--- meson.build.orig 2021-04-05 19:05:59.233949995 +0200 ++++ meson.build 2021-04-05 19:06:10.010949599 +0200 +@@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('introspection')) +-enable_introspection = gir.found() and not meson.is_cross_build() ++enable_introspection = gir.found() + + # vala + vapi_opt = get_option('vapi') +@@ -76,7 +76,7 @@ endif + # gtk-doc + if not get_option('docs').disabled() + gtk_doc = find_program('gtkdoc-scan', required: get_option('docs')) +- enable_doc = gtk_doc.found() and not meson.is_cross_build() ++ enable_doc = gtk_doc.found() + else + enable_doc = false + endif diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template index b91c6119892e..264ad0c20802 100644 --- a/srcpkgs/libvirt-glib/template +++ b/srcpkgs/libvirt-glib/template @@ -5,9 +5,9 @@ revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir enabled disabled) - -Dvapi=$(vopt_if vala enabled disabled)" -hostmakedepends="automake pkg-config intltool glib-devel gettext-devel gtk-doc - python-devel $(vopt_if vala vala)" + -Dvapi=$(vopt_if vala enabled disabled) -Ddocs=$(vopt_if doc enabled disabled)" +hostmakedepends="automake pkg-config intltool glib-devel gettext-devel + python-devel $(vopt_if vala vala) $(vopt_if doc gtk-doc)" makedepends="libglib-devel libvirt-devel libxml2-devel python-devel" short_desc="Glib integration with libvirt" maintainer="Enno Boland " @@ -17,7 +17,7 @@ distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz" checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd replaces="libvirt-glib-python>=0" -build_options="gir vala" +build_options="gir vala doc" build_options_default="gir vala" libvirt-glib-devel_package() { @@ -27,7 +27,9 @@ libvirt-glib-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/gtk-doc + if [ "$build_option_doc" ]; then + vmove usr/share/gtk-doc + fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 vmove usr/share/vala From 0e740f25fe2d8e652be83b8eca198f0463136197 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 09:48:04 +0200 Subject: [PATCH 107/108] glib: add backport fix. --- ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff new file mode 100644 index 000000000000..d3da19b4e10d --- /dev/null +++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff @@ -0,0 +1,130 @@ +From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Tue, 23 Mar 2021 16:27:49 +0000 +Subject: [PATCH 1/2] gkeyfile: Drop a redundant check + +It should not be possible for `->locales` to be set without +`->checked_locales` being set, so drop the redundant check. This helps +with branch code coverage. + +Signed-off-by: Philip Withnall +--- + glib/gkeyfile.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git glib/gkeyfile.c glib/gkeyfile.c +index 50859164b..06c4b7c47 100644 +--- glib/gkeyfile.c ++++ glib/gkeyfile.c +@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile *key_file, + if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS) + return TRUE; + +- if (!key_file->checked_locales && !key_file->locales) ++ if (!key_file->checked_locales) + { + key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); + key_file->checked_locales = TRUE; +-- +GitLab + + +From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Tue, 23 Mar 2021 16:28:31 +0000 +Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second + load +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If the same `GKeyFile` is reused to load multiple different key files, +any loads after the first which encounter translated keys will crash, +because clearing the data from the first load cleared the cached +language names, but didn’t clear `checked_locales`, so they were never +reloaded. + +Signed-off-by: Philip Withnall + +Fixes: #2361 +--- + glib/gkeyfile.c | 1 + + glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+) + +diff --git glib/gkeyfile.c glib/gkeyfile.c +index 06c4b7c47..0b58edb3f 100644 +--- glib/gkeyfile.c ++++ glib/gkeyfile.c +@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file) + g_strfreev (key_file->locales); + key_file->locales = NULL; + } ++ key_file->checked_locales = FALSE; + + if (key_file->parse_buffer) + { +diff --git glib/tests/keyfile.c glib/tests/keyfile.c +index 7530bc8c3..975ef8167 100644 +--- glib/tests/keyfile.c ++++ glib/tests/keyfile.c +@@ -758,6 +758,48 @@ test_locale_string (void) + g_free (old_locale); + } + ++static void ++test_locale_string_multiple_loads (void) ++{ ++ GKeyFile *keyfile = NULL; ++ GError *local_error = NULL; ++ gchar *old_locale = NULL; ++ guint i; ++ const gchar *data = ++ "[valid]\n" ++ "key1=v1\n" ++ "key1[de]=v1-de\n" ++ "key1[de_DE]=v1-de_DE\n" ++ "key1[de_DE.UTF8]=v1-de_DE.UTF8\n" ++ "key1[fr]=v1-fr\n" ++ "key1[en] =v1-en\n" ++ "key1[sr@Latn]=v1-sr\n"; ++ ++ g_test_summary ("Check that loading with translations multiple times works"); ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361"); ++ ++ old_locale = g_strdup (setlocale (LC_ALL, NULL)); ++ g_setenv ("LANGUAGE", "de", TRUE); ++ setlocale (LC_ALL, ""); ++ ++ keyfile = g_key_file_new (); ++ ++ for (i = 0; i < 3; i++) ++ { ++ g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error); ++ g_assert_no_error (local_error); ++ ++ check_locale_string_value (keyfile, "valid", "key1", "it", "v1"); ++ check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de"); ++ check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de"); ++ } ++ ++ g_key_file_free (keyfile); ++ ++ setlocale (LC_ALL, old_locale); ++ g_free (old_locale); ++} ++ + static void + test_lists (void) + { +@@ -1791,6 +1833,7 @@ main (int argc, char *argv[]) + g_test_add_func ("/keyfile/boolean", test_boolean); + g_test_add_func ("/keyfile/number", test_number); + g_test_add_func ("/keyfile/locale-string", test_locale_string); ++ g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads); + g_test_add_func ("/keyfile/lists", test_lists); + g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get); + g_test_add_func ("/keyfile/group-remove", test_group_remove); +-- +GitLab + From 5fd1252d630b6dd7bc5fef6cba1a1f3276e42bd8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 6 Apr 2021 09:50:42 +0200 Subject: [PATCH 108/108] gjs: import Fedora patches --- ...togenerate-accessors-for-CONSTRUCT_O.patch | 58 ++++++ ...amel-and-kebab-variants-of-CONSTRUCT.patch | 124 ++++++++++++ ...verrides-Gio-Fix-_LocalFilePrototype.patch | 27 +++ ...defined-and-not-the-actual-function-.patch | 176 ++++++++++++++++++ 4 files changed, 385 insertions(+) create mode 100644 srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch create mode 100644 srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch create mode 100644 srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch create mode 100644 srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch diff --git a/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch new file mode 100644 index 000000000000..0d54750c164b --- /dev/null +++ b/srcpkgs/gjs/patches/0001-GObject-Don-t-autogenerate-accessors-for-CONSTRUCT_O.patch @@ -0,0 +1,58 @@ +From 1572849a875632a84bec664b2acb41fee54a72c2 Mon Sep 17 00:00:00 2001 +From: Philip Chimento +Date: Sun, 21 Mar 2021 11:32:52 -0700 +Subject: [PATCH 2/6] GObject: Don't autogenerate accessors for CONSTRUCT_ONLY + properties + +Since we redefine CONSTRUCT_ONLY properties as readonly data properties +when they are set, the autogenerated accessors would be wrong. + +See: #391 +--- + installed-tests/js/testGObjectClass.js | 7 +++++++ + modules/core/_common.js | 2 ++ + 2 files changed, 9 insertions(+) + +diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js +index 4cf3a867..f0a57a84 100644 +--- a/installed-tests/js/testGObjectClass.js ++++ b/installed-tests/js/testGObjectClass.js +@@ -766,6 +766,10 @@ describe('Auto accessor generation', function () { + 'Long-named property', GObject.ParamFlags.READWRITE, 0, 100, 48), + 'construct': GObject.ParamSpec.int('construct', 'Construct', 'Construct', + GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT, 0, 100, 96), ++ 'construct-only': GObject.ParamSpec.int('construct-only', 'Construct only', ++ 'Construct-only property', ++ GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY, ++ 0, 100, 80), + 'snake-name': GObject.ParamSpec.int('snake-name', 'Snake name', + 'Snake-cased property', GObject.ParamFlags.READWRITE, 0, 100, 36), + 'camel-name': GObject.ParamSpec.int('camel-name', 'Camel name', +@@ -844,8 +848,11 @@ describe('Auto accessor generation', function () { + + it("initial value is the param spec's default value", function () { + expect(a.simple).toEqual(24); ++ expect(a.long_long_name).toEqual(48); ++ expect(a.longLongName).toEqual(48); + expect(a['long-long-name']).toEqual(48); + expect(a.construct).toEqual(96); ++ expect(a.construct_only).toEqual(80); + }); + + it('notify when the property changes', function () { +diff --git a/modules/core/_common.js b/modules/core/_common.js +index 45bbefb7..edc70215 100644 +--- a/modules/core/_common.js ++++ b/modules/core/_common.js +@@ -59,6 +59,8 @@ function _generateAccessors(pspec, propdesc, GObject) { + + function _checkAccessors(proto, pspec, GObject) { + const {name, flags} = pspec; ++ if (flags & GObject.ParamFlags.CONSTRUCT_ONLY) ++ return; + + const underscoreName = name.replace(/-/g, '_'); + const camelName = name.replace(/-([a-z])/g, match => match[1].toUpperCase()); +-- +2.30.2 + diff --git a/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch new file mode 100644 index 000000000000..b203743ac46c --- /dev/null +++ b/srcpkgs/gjs/patches/0002-GObject-Define-camel-and-kebab-variants-of-CONSTRUCT.patch @@ -0,0 +1,124 @@ +From c4231d5917b1a06d1e3b788322c71cfdb41a0249 Mon Sep 17 00:00:00 2001 +From: Philip Chimento +Date: Sun, 21 Mar 2021 11:37:58 -0700 +Subject: [PATCH 3/6] GObject: Define camel and kebab variants of + CONSTRUCT_ONLY properties + +Since we redefine CONSTRUCT_ONLY properties to be readonly data properties +when they are set, we must also define camelCase and kebab-case variations +in order to be consistent with the other property accessors. + +Closes: #391 +--- + gi/gobject.cpp | 11 +++++++---- + gjs/jsapi-util-string.cpp | 21 +++++++++++++++++++++ + gjs/jsapi-util.h | 1 + + installed-tests/js/testGObjectClass.js | 19 +++++++++++++++++++ + 4 files changed, 48 insertions(+), 4 deletions(-) + +diff --git a/gi/gobject.cpp b/gi/gobject.cpp +index 27c7d13c..65ed6638 100644 +--- a/gi/gobject.cpp ++++ b/gi/gobject.cpp +@@ -55,10 +55,13 @@ static bool jsobj_set_gproperty(JSContext* cx, JS::HandleObject object, + + GjsAutoChar underscore_name = gjs_hyphen_to_underscore(pspec->name); + +- if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) +- return JS_DefineProperty( +- cx, object, underscore_name, jsvalue, +- GJS_MODULE_PROP_FLAGS | JSPROP_READONLY); ++ if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) { ++ unsigned flags = GJS_MODULE_PROP_FLAGS | JSPROP_READONLY; ++ GjsAutoChar camel_name = gjs_hyphen_to_camel(pspec->name); ++ return JS_DefineProperty(cx, object, underscore_name, jsvalue, flags) && ++ JS_DefineProperty(cx, object, camel_name, jsvalue, flags) && ++ JS_DefineProperty(cx, object, pspec->name, jsvalue, flags); ++ } + + return JS_SetProperty(cx, object, underscore_name, jsvalue); + } +diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp +index e318b514..45f297a7 100644 +--- a/gjs/jsapi-util-string.cpp ++++ b/gjs/jsapi-util-string.cpp +@@ -4,6 +4,7 @@ + + #include + ++#include // for toupper + #include + #include // for size_t, strlen + #include // for ssize_t +@@ -53,6 +54,26 @@ char* gjs_hyphen_to_underscore(const char* str) { + return retval; + } + ++GjsAutoChar gjs_hyphen_to_camel(const char* str) { ++ GjsAutoChar retval = static_cast(g_malloc(strlen(str) + 1)); ++ const char* input_iter = str; ++ char* output_iter = retval.get(); ++ bool uppercase_next = false; ++ while (*input_iter != '\0') { ++ if (*input_iter == '-') { ++ uppercase_next = true; ++ } else if (uppercase_next) { ++ *output_iter++ = toupper(*input_iter); ++ uppercase_next = false; ++ } else { ++ *output_iter++ = *input_iter; ++ } ++ input_iter++; ++ } ++ *output_iter = '\0'; ++ return retval; ++} ++ + /** + * gjs_string_to_utf8: + * @cx: JSContext +diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h +index 11c23776..a6b66261 100644 +--- a/gjs/jsapi-util.h ++++ b/gjs/jsapi-util.h +@@ -542,6 +542,7 @@ bool gjs_object_require_converted_property(JSContext *context, + [[nodiscard]] std::string gjs_debug_id(jsid id); + + [[nodiscard]] char* gjs_hyphen_to_underscore(const char* str); ++[[nodiscard]] GjsAutoChar gjs_hyphen_to_camel(const char* str); + + #if defined(G_OS_WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1900)) + [[nodiscard]] std::wstring gjs_win32_vc140_utf8_to_utf16(const char* str); +diff --git a/installed-tests/js/testGObjectClass.js b/installed-tests/js/testGObjectClass.js +index f0a57a84..7073ccba 100644 +--- a/installed-tests/js/testGObjectClass.js ++++ b/installed-tests/js/testGObjectClass.js +@@ -853,6 +853,25 @@ describe('Auto accessor generation', function () { + expect(a['long-long-name']).toEqual(48); + expect(a.construct).toEqual(96); + expect(a.construct_only).toEqual(80); ++ expect(a.constructOnly).toEqual(80); ++ expect(a['construct-only']).toEqual(80); ++ }); ++ ++ it('set properties at construct time', function () { ++ a = new AutoAccessors({ ++ simple: 1, ++ longLongName: 1, ++ construct: 1, ++ 'construct-only': 1, ++ }); ++ expect(a.simple).toEqual(1); ++ expect(a.long_long_name).toEqual(1); ++ expect(a.longLongName).toEqual(1); ++ expect(a['long-long-name']).toEqual(1); ++ expect(a.construct).toEqual(1); ++ expect(a.construct_only).toEqual(1); ++ expect(a.constructOnly).toEqual(1); ++ expect(a['construct-only']).toEqual(1); + }); + + it('notify when the property changes', function () { +-- +2.30.2 + diff --git a/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch new file mode 100644 index 000000000000..7dfcabf1e882 --- /dev/null +++ b/srcpkgs/gjs/patches/0003-overrides-Gio-Fix-_LocalFilePrototype.patch @@ -0,0 +1,27 @@ +From ec9385b89cb2bce0615093c3c957cbbb5ea6b769 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 24 Mar 2021 23:30:19 +0100 +Subject: [PATCH 4/6] overrides/Gio: Fix _LocalFilePrototype + +Recent GIO versions return a GDummyFile for '', which isn't the prototype +people are expecting to promisify when using _LocalFilePrototype. +--- + modules/core/overrides/Gio.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/core/overrides/Gio.js b/modules/core/overrides/Gio.js +index 10872efb..d51738e0 100644 +--- a/modules/core/overrides/Gio.js ++++ b/modules/core/overrides/Gio.js +@@ -495,7 +495,7 @@ function _init() { + Gio._promisify = _promisify; + + // Temporary Gio.File.prototype fix +- Gio._LocalFilePrototype = Gio.File.new_for_path('').constructor.prototype; ++ Gio._LocalFilePrototype = Gio.File.new_for_path('/').constructor.prototype; + + // Override Gio.Settings and Gio.SettingsSchema - the C API asserts if + // trying to access a nonexistent schema or key, which is not handy for +-- +2.30.2 + diff --git a/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch new file mode 100644 index 000000000000..cc8a14cb2780 --- /dev/null +++ b/srcpkgs/gjs/patches/0004-object-Return-undefined-and-not-the-actual-function-.patch @@ -0,0 +1,176 @@ +From 78bfccd3125d54caf8e1c0b8d2b84643e717a8b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= +Date: Wed, 24 Mar 2021 18:06:06 +0100 +Subject: [PATCH 6/6] object: Return undefined and not the actual function on + disposed objects + +When calling a proto function on a disposed object we return true not to +throw, however when doing this we implicitly return to JS the actual +underlying function pointer and that may cause use the return value to +be used to wrongly set a variable or to be wrongly evaluated. + +To avoid this and be consistent, return undefined instead. + +Adapt tests for this and add more for uncovered methods. + +Fixes #396 +--- + gi/object.cpp | 17 ++++++-- + .../js/testGObjectDestructionAccess.js | 41 ++++++++++++++++--- + 2 files changed, 49 insertions(+), 9 deletions(-) + +diff --git a/gi/object.cpp b/gi/object.cpp +index 598e6bb0..39ce7f5f 100644 +--- a/gi/object.cpp ++++ b/gi/object.cpp +@@ -327,8 +327,10 @@ bool ObjectBase::prop_getter(JSContext* cx, unsigned argc, JS::Value* vp) { + + bool ObjectInstance::prop_getter_impl(JSContext* cx, JS::HandleString name, + JS::MutableHandleValue rval) { +- if (!check_gobject_disposed("get any property from")) ++ if (!check_gobject_disposed("get any property from")) { ++ rval.setUndefined(); + return true; ++ } + + GValue gvalue = { 0, }; + +@@ -1877,8 +1879,10 @@ ObjectInstance::connect_impl(JSContext *context, + + gjs_debug_gsignal("connect obj %p priv %p", m_wrapper.get(), this); + +- if (!check_gobject_disposed("connect to any signal on")) ++ if (!check_gobject_disposed("connect to any signal on")) { ++ args.rval().setInt32(0); + return true; ++ } + + JS::UniqueChars signal_name; + JS::RootedObject callback(context); +@@ -1940,8 +1944,10 @@ ObjectInstance::emit_impl(JSContext *context, + gjs_debug_gsignal("emit obj %p priv %p argc %d", m_wrapper.get(), this, + argv.length()); + +- if (!check_gobject_disposed("emit any signal on")) ++ if (!check_gobject_disposed("emit any signal on")) { ++ argv.rval().setUndefined(); + return true; ++ } + + JS::UniqueChars signal_name; + if (!gjs_parse_call_args(context, "emit", argv, "!s", +@@ -2104,8 +2110,10 @@ bool ObjectInstance::signal_find_impl(JSContext* cx, const JS::CallArgs& args) { + gjs_debug_gsignal("[Gi.signal_find_symbol]() obj %p priv %p argc %d", + m_wrapper.get(), this, args.length()); + +- if (!check_gobject_disposed("find any signal on")) ++ if (!check_gobject_disposed("find any signal on")) { ++ args.rval().setInt32(0); + return true; ++ } + + JS::RootedObject match(cx); + if (!gjs_parse_call_args(cx, "[Gi.signal_find_symbol]", args, "o", "match", +@@ -2179,6 +2187,7 @@ bool ObjectInstance::signals_action_impl(JSContext* cx, + m_wrapper.get(), this, args.length()); + + if (!check_gobject_disposed((action_name + " any signal on").c_str())) { ++ args.rval().setInt32(0); + return true; + } + JS::RootedObject match(cx); +diff --git a/installed-tests/js/testGObjectDestructionAccess.js b/installed-tests/js/testGObjectDestructionAccess.js +index ed1d6bb6..0b35d859 100644 +--- a/installed-tests/js/testGObjectDestructionAccess.js ++++ b/installed-tests/js/testGObjectDestructionAccess.js +@@ -5,6 +5,7 @@ + imports.gi.versions.Gtk = '3.0'; + + const GLib = imports.gi.GLib; ++const GObject = imports.gi.GObject; + const Gtk = imports.gi.Gtk; + + describe('Access to destroyed GObject', function () { +@@ -23,7 +24,7 @@ describe('Access to destroyed GObject', function () { + GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL, + 'Object Gtk.Window (0x*'); + +- void destroyedWindow.title; ++ expect(destroyedWindow.title).toBeUndefined(); + + GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, + 'testExceptionInDestroyedObjectPropertyGet'); +@@ -45,7 +46,7 @@ describe('Access to destroyed GObject', function () { + GLib.test_expect_message('Gtk', GLib.LogLevelFlags.LEVEL_CRITICAL, + '*GTK_IS_WINDOW*'); + +- void destroyedWindow.get_title(); ++ expect(destroyedWindow.get_title()).toBeNull(); + + GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, + 'testExceptionInDestroyedObjectMethodGet'); +@@ -67,7 +68,7 @@ describe('Access to destroyed GObject', function () { + GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL, + 'Object Gtk.Window (0x*'); + +- destroyedWindow.connect('foo-signal', () => {}); ++ expect(destroyedWindow.connect('foo-signal', () => {})).toBe(0); + + GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, + 'testExceptionInDestroyedObjectConnect'); +@@ -77,7 +78,7 @@ describe('Access to destroyed GObject', function () { + GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL, + 'Object Gtk.Window (0x*'); + +- destroyedWindow.connect_after('foo-signal', () => {}); ++ expect(destroyedWindow.connect_after('foo-signal', () => {})).toBe(0); + + GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, + 'testExceptionInDestroyedObjectConnectAfter'); +@@ -87,12 +88,42 @@ describe('Access to destroyed GObject', function () { + GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL, + 'Object Gtk.Window (0x*'); + +- destroyedWindow.emit('foo-signal'); ++ expect(destroyedWindow.emit('foo-signal')).toBeUndefined(); + + GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, + 'testExceptionInDestroyedObjectEmit'); + }); + ++ it('Proto function signals_disconnect', function () { ++ GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL, ++ 'Object Gtk.Window (0x*'); ++ ++ expect(GObject.signal_handlers_disconnect_by_func(destroyedWindow, () => {})).toBe(0); ++ ++ GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, ++ 'testExceptionInDestroyedObjectSignalsDisconnect'); ++ }); ++ ++ it('Proto function signals_block', function () { ++ GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL, ++ 'Object Gtk.Window (0x*'); ++ ++ expect(GObject.signal_handlers_block_by_func(destroyedWindow, () => {})).toBe(0); ++ ++ GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, ++ 'testExceptionInDestroyedObjectSignalsBlock'); ++ }); ++ ++ it('Proto function signals_unblock', function () { ++ GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_CRITICAL, ++ 'Object Gtk.Window (0x*'); ++ ++ expect(GObject.signal_handlers_unblock_by_func(destroyedWindow, () => {})).toBe(0); ++ ++ GLib.test_assert_expected_messages_internal('Gjs', 'testGObjectDestructionAccess.js', 0, ++ 'testExceptionInDestroyedObjectSignalsUnblock'); ++ }); ++ + it('Proto function toString', function () { + expect(destroyedWindow.toString()).toMatch( + /\[object \(FINALIZED\) instance wrapper GIName:Gtk.Window jsobj@0x[a-f0-9]+ native@0x[a-f0-9]+\]/); +-- +2.30.2 +