From b804d893d680639e042a670238914f4cb3a28f48 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 18:50:59 +0100 Subject: [PATCH 01/47] adwaita-icon-theme: update to 43. --- srcpkgs/adwaita-icon-theme/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template index 983ae9b69d55..b42a1efb0a90 100644 --- a/srcpkgs/adwaita-icon-theme/template +++ b/srcpkgs/adwaita-icon-theme/template @@ -1,13 +1,14 @@ # Template file for 'adwaita-icon-theme' pkgname=adwaita-icon-theme -version=42.0 +version=43 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" depends="librsvg" short_desc="Theme consisting of a set of icons for GTK+" -maintainer="Enno Boland " +maintainer="Michal Vasilek " 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=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0 +changelog="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/adwaita-icon-theme/${version}/adwaita-icon-theme-${version}.tar.xz" +checksum=2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6 From 7c86b5954f66801024b515c5293b2fd577b048a5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 13 Sep 2022 00:36:08 +0200 Subject: [PATCH 02/47] mutter: update to 43.2. --- common/shlibs | 8 ++++---- srcpkgs/mutter/template | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/shlibs b/common/shlibs index b9fecc044025..1591b9dadd58 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2980,10 +2980,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-10.so.0 mutter-42.0_1 -libmutter-clutter-10.so.0 mutter-42.0_1 -libmutter-cogl-10.so.0 mutter-42.0_1 -libmutter-cogl-pango-10.so.0 mutter-42.0_1 +libmutter-11.so.0 mutter-43.2_1 +libmutter-clutter-11.so.0 mutter-43.2_1 +libmutter-cogl-11.so.0 mutter-43.2_1 +libmutter-cogl-pango-11.so.0 mutter-43.2_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub-0.6.so.0 libgepub-0.6.0_4 libslopy.so.7.6 slop-7.6_1 diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 6e71320cef44..4adf8a458957 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=42.6 +version=43.2 revision=1 build_helper="gir" build_style=meson @@ -15,14 +15,14 @@ makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel wayland-protocols gnome-settings-daemon-devel libgudev-devel libwacom-devel" depends="gsettings-desktop-schemas desktop-file-utils zenity" short_desc="Wayland display server, X11 window manager and compositor library" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" -changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=66640680fe181780c12fdf8ae7eb459ae1a9fbb188bcaf7a7674d5fcfee7b5b1 -shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so - libmutter-cogl-pango-10.so" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/mutter/${version%.*}/mutter-${version}.tar.xz" +checksum=fd2eb707adc333cc277af8685e5cf39135e1c4d798a1f9d05e88e453dc3ebb84 +shlib_provides="libmutter-clutter-11.so libmutter-cogl-11.so + libmutter-cogl-pango-11.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -34,8 +34,8 @@ pre_build() { post_install() { # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are # meant to be called with 'pkg-config --variable' - vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-11|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-11.pc } mutter-devel_package() { @@ -45,7 +45,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-10/*.gir" + vmove "usr/lib/mutter-11/*.gir" vmove "usr/lib/*.so" } } From f022646d3ecd1e12c17f71d447dbb9abdb6faff2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 13 Sep 2022 00:32:21 +0200 Subject: [PATCH 03/47] gnome-shell: update to 43.2. --- srcpkgs/gnome-shell/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 7621c5fa8ee1..6aa67cd1a46b 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,27 +1,27 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=42.6 +version=43.2 revision=1 build_style=meson build_helper=gir configure_args="-Dsystemd=false -Dtests=false" -hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc +hostmakedepends="libxslt pkg-config python3 sassc asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache" makedepends="gnome-control-center-devel at-spi2-atk-devel evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel - gnome-bluetooth-devel pipewire-devel gstreamer1-devel" + gnome-bluetooth-devel pipewire-devel gstreamer1-devel gcr4-devel" depends="elogind gnome-control-center gsettings-desktop-schemas upower gstreamer1-pipewire gst-plugins-good1" checkdepends="xvfb-run mesa-dri $depends" short_desc="GNOME core user interface" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-43/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%%.*}/gnome-shell-${version}.tar.xz" -checksum=9b8ed9c9a5ded861074f4fee657768786de8417a13a8c783ce1fdc33c76c1d5d +checksum=e76fd4be9342410ee9fbdcdd6b2d81c6ff060e7c8cc5a0f1cae6a7aba25d1860 do_check() { mkdir /tmp/gnome-shell-xdg From f67ebc1815091a7d5b14a7e5f493f8ca1c82fa19 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 23 Nov 2022 10:12:52 +0100 Subject: [PATCH 04/47] gnome-shell-extensions: update to 43.1. --- srcpkgs/gnome-shell-extensions/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 414961a95f40..8b358e73b199 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,15 +1,15 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=42.3 +version=43.1 revision=1 build_style=meson configure_args="-Dextension_set=all" hostmakedepends="pkg-config gettext" depends="gnome-shell>=${version} nautilus unzip" short_desc="Extensions for GNOME shell, including classic mode" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0ec2bea32e9f28ac805891f613194d48fc0c091f09c48313065a3884f72273fc +distfiles="${GNOME_SITE}/gnome-shell-extensions/${version%.*}/gnome-shell-extensions-${version}.tar.xz" +checksum=adde04bd946a13113557e4c34c890bbe9077505a6a3f0755f17bea1c6e4a2d17 From 907c1b918650f3f3fdb96ef8e0c9dcc478217ea0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 20 Sep 2022 00:03:27 +0200 Subject: [PATCH 05/47] evolution-data-server: update to 3.46.2. --- common/shlibs | 19 ++++++++++--------- srcpkgs/evolution-data-server/template | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1591b9dadd58..db8553c31529 100644 --- a/common/shlibs +++ b/common/shlibs @@ -604,21 +604,22 @@ libicalss.so.3 libical-3.0.4_1 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.63 evolution-data-server-3.42.0_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.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 -libecal-2.0.so.1 evolution-data-server-3.34.0_1 +libcamel-1.2.so.64 evolution-data-server-3.46.0_1 +libebackend-1.2.so.11 evolution-data-server-3.46.0_1 +libebook-1.2.so.21 evolution-data-server-3.46.0_1 +libebook-contacts-1.2.so.4 evolution-data-server-3.46.0_1 +libecal-2.0.so.2 evolution-data-server-3.46.0_1 +libedata-book-1.2.so.27 evolution-data-server-3.46.0_1 +libedataserver-1.2.so.27 evolution-data-server-3.46.0_1 +libedataserverui-1.2.so.4 evolution-data-server-3.46.0_1 +libedataserverui4-1.0.so.0 evolution-data-server-3.46.0_1 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 +libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1 libgdata.so.22 libgdata-0.17.9_1 libpcap.so.1 libpcap-1.1.1_1 libiptc.so.0 iptables-1.4.7_1 diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 6304e8cc5b34..84f2dbbbe742 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,26 +1,26 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.44.4 +version=3.46.2 revision=1 build_style=cmake build_helper="gir qemu" configure_args=" -DSYSCONF_INSTALL_DIR=/etc - -DWITH_GWEATHER4=ON -DWITH_PHONENUMBER=ON - $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')" + -DWITH_PHONENUMBER=ON + $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON') + -DENABLE_WEATHER=OFF" hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel $(vopt_if gir vala)" makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel - libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel - libsoup-devel libphonenumber-devel $(vopt_if gir vala-devel)" -depends="libgweather libsoup-gnome" + libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkit2gtk50-devel + libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel" checkdepends="dbus" short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb +changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz" +checksum=f9bd52008b7e535d816920cfcec70a0e5562bde28af71f996e203ff6a86e46e0 build_options="gir" build_options_default="gir" @@ -36,7 +36,7 @@ pre_build() { evolution-data-server-devel_package() { depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel libgdata-devel>=0.15 libsecret-devel libglib-devel - libsoup-devel gtk+3-devel libxml2-devel + libsoup3-devel gtk4-devel libxml2-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From 710dd2e97d9eaaf49dc83eb31a50a9d0db6a4c04 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:01 +0200 Subject: [PATCH 06/47] evolution: update to 3.46.2. --- srcpkgs/evolution/template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index fd9d12a73e74..2dfb497a2968 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,31 +1,31 @@ # Template file for 'evolution' pkgname=evolution -version=3.44.4 -revision=2 +version=3.46.2 +revision=1 build_style=cmake build_helper="qemu" configure_args="-DSYSCONF_INSTALL_DIR=/etc -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF - -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2" + -DENABLE_WEATHER=OFF -DWITH_ENCHANT_VERSION=2" hostmakedepends="intltool itstool pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel libcanberra-devel - libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel - gnome-desktop-devel libsoup-devel cmark-devel" + libnotify-devel libwebkit2gtk41-devel ytnef-devel + gnome-desktop-devel libsoup3-devel cmark-devel" depends="gnome-keyring" short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f0b16e7abad3c7945a29c322f17dab4a08d61e99bd7cc91b8df35053c5c12e8c +changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz" +checksum=724b3bb8539aa51c6926c3f17d33bbce35a99c16ea63b8090b346c5abf68977d shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" evolution-devel_package() { - depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel + depends="libwebkit2gtk41-devel gtk+3-devel libglib-devel evolution-data-server-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From da8f89b3cd28e8499c02236ea1251ef48a085a4a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 00:05:51 +0200 Subject: [PATCH 07/47] sushi: update to 43.0. --- srcpkgs/sushi/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 4b9b2fbe1c0b..7abffcb1f708 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,20 +1,21 @@ # Template file for 'sushi' pkgname=sushi -version=42.0 +version=43.0 revision=1 build_helper="gir" build_style=meson -hostmakedepends="glib-devel intltool pkg-config +hostmakedepends="glib-devel gettext pkg-config $(vopt_if gir 'gobject-introspection') gjs" makedepends="clutter-gst3-devel clutter-gtk-devel evince-devel gjs-devel - gtksourceview4-devel libmusicbrainz5-devel libsoup-gnome-devel webkit2gtk-devel" + gtksourceview4-devel libsoup3-devel libwebkit2gtk41-devel" depends="evince nautilus" short_desc="Quick image previewer over DBus for Nautilus" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/sushi" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=45d8db7af45a79784e7a34588d149ea955c8be44bb82a36e896829405b7c8820 +changelog="https://gitlab.gnome.org/GNOME/sushi/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/sushi/${version%.*}/sushi-${version}.tar.xz" +checksum=57848526149ab1c784fb92fbc934c3514fe522aba649d5d9fedec7e1b147527b lib32disabled=yes build_options="gir" From 3267ed308f676aa71041e524d322c8fe7cef2f80 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:01 +0200 Subject: [PATCH 08/47] evolution-ews: update to 3.46.2. --- srcpkgs/evolution-ews/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 2446b3edd159..df96dec71cfd 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,16 +1,16 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.44.4 +version=3.46.2 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" hostmakedepends="cmake glib-devel intltool libmspack pkg-config" -makedepends="evolution-devel libmspack-devel webkit2gtk-devel - gnome-desktop-devel libsoup-devel" +makedepends="evolution-devel libmspack-devel libwebkit2gtk41-devel + gnome-desktop-devel libsoup3-devel" short_desc="MS Exchange integration through Exchange Web Services" maintainer="Peter Kuchar " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4f182b05a13ac1b7b33b08fb066e8395caa95ba7da808886aa91b1429d6d7db3 +changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz" +checksum=eaca50cf8a2aeac153d9b0a66a2c552436d3c35c0cdcb4059a0dc4d6dad9df41 From 8c18e8a4a4edd4bbebaf00515b3bb8802a0d67f0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:01 +0200 Subject: [PATCH 09/47] folks: revbump for evolution-data-server 3.46 --- srcpkgs/folks/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index fbc56862bde7..010ccbedc48e 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -1,7 +1,7 @@ # Template file for 'folks' pkgname=folks version=0.15.5 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Db_lto=false" @@ -11,11 +11,11 @@ makedepends="readline-devel telepathy-glib-devel zeitgeist-devel libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)" depends="zeitgeist" short_desc="GObject Library to aggregate people into metacontacts" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Folks" changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz" checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086 build_options="gir" From 91a5fafe2e7f7fd450404136ae5c951c60b9038f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 15:25:02 +0200 Subject: [PATCH 10/47] pidgin: revbump for evolution-data-server 3.46 --- srcpkgs/pidgin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index c60afea1d67b..51401d93aa18 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -1,7 +1,7 @@ # Template file for 'pidgin' pkgname=pidgin version=2.14.10 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-schemas-install --disable-meanwhile --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv From a1e097c02acf4d774c2c60a4402c758824d6fcd8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 20:24:06 +0200 Subject: [PATCH 11/47] gnome-control-center: update to 43.1. --- srcpkgs/gnome-control-center/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 84ff92b93ae8..a3866ac31251 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=42.3 +version=43.1 revision=1 build_style=meson build_helper="gir" @@ -18,12 +18,12 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop libgnomekbd" short_desc="GNOME control center" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" -changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ce0ae3650de2af7ebcb0a7e1fc9912eddb6eff8d257f3fe50ff8b29c19341c7e +changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/gnome-control-center/${version%.*}/gnome-control-center-${version}.tar.xz" +checksum=e98bc6b784afd04f297db5e8e6c59910e2cd090332710774f26dc8de89af4fc7 make_check=no # needs X11 and requires altered filesystem pre_build() { From 76aa5ecb24096e89364f6365ca51b49d8710d2f8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 20:24:08 +0200 Subject: [PATCH 12/47] gdm: update to 43.0. --- srcpkgs/gdm/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index b504f4ba2adf..424128db0fad 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm -version=42.0 -revision=3 +version=43.0 +revision=1 build_helper="gir" build_style=meson configure_args=" @@ -20,11 +20,12 @@ depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb" checkdepends="check-devel" short_desc="GNOME Display Manager" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855 +changelog="https://gitlab.gnome.org/GNOME/gdm/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/gdm/${version%.*}/gdm-${version}.tar.xz" +checksum=94d70d6ed7df59fa7fde4fd02fed1168593a8adce10fcee113c148d52b392294 conf_files=" /etc/gdm/custom.conf From cb999c7edfd8308b39905ee41bc4ce16630fcd7f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 20:51:14 +0200 Subject: [PATCH 13/47] gnome-session: update to 43.0. --- srcpkgs/gnome-session/template | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 76b1f49f1cdc..062d5b8b5033 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,23 +1,18 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=42.0 -revision=2 +version=43.0 +revision=1 build_style=meson configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" -hostmakedepends="glib-devel intltool pkg-config xmlto" +hostmakedepends="glib-devel gettext pkg-config xmlto" makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel - libglib-devel libICE-devel libSM-devel libXtst-devel startup-notification-devel - upower-devel xtrans" -depends="dconf desktop-file-utils bash - gsettings-desktop-schemas hicolor-icon-theme polkit" + libglib-devel libICE-devel libSM-devel xtrans" +depends="dconf desktop-file-utils bash gsettings-desktop-schemas + hicolor-icon-theme polkit" short_desc="GNOME session management utilities" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" -changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa - -post_install() { - rm -rf ${DESTDIR}/tmp -} +changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/gnome-session/${version%.*}/gnome-session-${version}.tar.xz" +checksum=3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2 From f11181d0d36f83b4053c107ccf47ba1e3c1308f9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 21:10:24 +0200 Subject: [PATCH 14/47] gnome-desktop: update to 43. --- common/shlibs | 8 +- .../patches/optional_introspection.patch | 93 ------------------- srcpkgs/gnome-desktop/template | 13 +-- 3 files changed, 11 insertions(+), 103 deletions(-) delete mode 100644 srcpkgs/gnome-desktop/patches/optional_introspection.patch diff --git a/common/shlibs b/common/shlibs index db8553c31529..1725ea3b1208 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1139,10 +1139,10 @@ libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 -libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 -libgnome-desktop-4.so.1 gnome-desktop-42.0_1 -libgnome-bg-4.so.1 gnome-desktop-42.0_1 -libgnome-rr-4.so.1 gnome-desktop-42.0_1 +libgnome-desktop-3.so.20 gnome-desktop-43.0_1 +libgnome-desktop-4.so.2 gnome-desktop-43.0_1 +libgnome-bg-4.so.2 gnome-desktop-43.0_1 +libgnome-rr-4.so.2 gnome-desktop-43.0_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/patches/optional_introspection.patch b/srcpkgs/gnome-desktop/patches/optional_introspection.patch deleted file mode 100644 index b960ef27c588..000000000000 --- a/srcpkgs/gnome-desktop/patches/optional_introspection.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Wed, 18 Sep 2019 22:28:21 +0300 -Subject: [PATCH] meson: Add optionality for introspection - ---- - libgnome-desktop/meson.build | 48 +++++++++++++++++++----------------- - meson_options.txt | 4 +++ - 2 files changed, 30 insertions(+), 22 deletions(-) - -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index a0fb11f8..375cf57c 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -125,17 +125,19 @@ if get_option('build_gtk4') - ], - ) - -- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -- export_packages: 'gnome-desktop-4', -- namespace: 'GnomeDesktop', -- nsversion: '4.0', -- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true, -- ) -+ if get_option('introspection') -+ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, -+ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], -+ export_packages: 'gnome-desktop-4', -+ namespace: 'GnomeDesktop', -+ nsversion: '4.0', -+ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true, -+ ) -+ endif - - pkg.generate( - libgnome_desktop_base, -@@ -255,17 +257,19 @@ if get_option('legacy_library') - ], - ) - -- gnome.generate_gir(libgnome_desktop, -- sources: introspection_sources + libgnome_desktop_headers, -- export_packages: 'gnome-desktop-3.0', -- namespace: 'GnomeDesktop', -- nsversion: '3.0', -- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true -- ) -+ if get_option('introspection') -+ gnome.generate_gir(libgnome_desktop, -+ sources: introspection_sources + libgnome_desktop_headers, -+ export_packages: 'gnome-desktop-3.0', -+ namespace: 'GnomeDesktop', -+ nsversion: '3.0', -+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true -+ ) -+ endif - - pkg.generate( - libraries: libgnome_desktop, -diff --git a/meson_options.txt b/meson_options.txt -index e17e7330..c4db6eaf 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -17,6 +17,10 @@ option('debug_tools', - type: 'boolean', value: true, description: 'Build debug tools' - ) - -+option('introspection', -+ type: 'boolean', value: true, description: 'Whether to build introspection files' -+) -+ - option('udev', - type: 'feature', description: 'Udev support' - ) --- -GitLab diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 86b8ca890776..ec82aeb9d2bf 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,10 +1,10 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=42.6 +version=43 revision=1 build_style=meson build_helper="gir" -configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled +configure_args="-Dudev=enabled -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel @@ -12,12 +12,13 @@ makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+ libxkbfile-devel libXrandr-devel gdk-pixbuf-devel" depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config" short_desc="GNOME desktop management utilities" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" -changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ac713a8274d10918dfba8cf19d278de93acf833341dff8a15bab2b9f6429739b +#changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gnome-desktop/${version%.*}/gnome-desktop-${version}.tar.xz" +checksum=3d6e153317486157596aa3802f87676414c570738f450a94a041fe8835420a69 build_options="gir" build_options_default="gir" From 44c0ec3ca3cc9aa2b46f093af2e1652b14e7d316 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 21:54:44 +0200 Subject: [PATCH 15/47] gnome-settings-daemon: update to 43.0. --- srcpkgs/gnome-settings-daemon/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index ea3ac6838044..f22bdbdb61f4 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,12 +1,12 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=42.2 -revision=2 +version=43.0 +revision=1 build_style=meson configure_args="-Dsystemd=false" hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt perl pkg-config" -makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-devel +makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr4-devel geoclue2-devel gnome-desktop-devel ibus-devel libcanberra-devel libgnomekbd-devel libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel polkit-devel pulseaudio-devel startup-notification-devel upower-devel @@ -15,12 +15,12 @@ depends="hicolor-icon-theme" checkdepends="elogind libnotify python3-dbusmock python3-gobject python3-pycodestyle which hwids eudev" short_desc="GNOME settings daemon" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9c449714aa8ec1271c0db5137df3458195943f05ccd0ac8935d93397770bab00 +distfiles="${GNOME_SITE}/gnome-settings-daemon/${version%.*}/gnome-settings-daemon-${version}.tar.xz" +checksum=3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0 CFLAGS="-UG_DISABLE_ASSERT" if [ "$CROSS_BUILD" ]; then From 016ce3cdd940bcc148fe00da0fecdc43528ff8bd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:00:07 +0200 Subject: [PATCH 16/47] gnome-contacts: revbump for gnome-desktop 43 --- srcpkgs/gnome-contacts/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 64ecf75826b7..cee511c32883 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,15 +1,15 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=42.0 -revision=2 +version=43.0 +revision=1 build_style=meson hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala" -makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-devel +makedepends="cheese-devel folks-devel gnome-desktop-devel libportal-gtk4-devel libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel" depends="desktop-file-utils" short_desc="GNOME contacts manager" 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=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216 +distfiles="${GNOME_SITE}/gnome-contacts/${version%.*}/gnome-contacts-${version}.tar.xz" +checksum=55b61df7e93f0abe1ffa465e18e3c5de4f49a90f268ea9d11edc86af06d071e1 From 72116c25e0c937fe4c116774be04101afaa1c7a6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:03:56 +0200 Subject: [PATCH 17/47] cheese: update to 43.0. --- srcpkgs/cheese/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 066828c02207..abbadbce4daf 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,6 +1,6 @@ # Template file for 'cheese' pkgname=cheese -version=41.1 +version=43.0 revision=1 build_style=meson build_helper="gir" @@ -15,8 +15,9 @@ short_desc="GNOME tool to take pictures and videos from your webcam" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Cheese" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=522960ca28730ff66439070b04418c9e0a4bb55560d75bfe08b218da2c67e547 +changelog="https://gitlab.gnome.org/GNOME/cheese/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/cheese/${version%.*}/cheese-${version}.tar.xz" +checksum=74574c4a3c327327f1a2d6d0b3f937be2afb07a6159b6d78db9c192de6667f0b build_options="gir gtk_doc" build_options_default="gir" From 5964ecf1ddaaf5e6f3caf6e4a2d040fac9cfd83f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 22:37:58 +0200 Subject: [PATCH 18/47] gnome-calendar: update to 43.1. --- srcpkgs/gnome-calendar/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index 086915b3988f..70cc9f9dfcda 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,20 +1,21 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=42.2 -revision=2 +version=43.1 +revision=1 build_style=meson hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache $(vopt_if gir 'gobject-introspection')" -makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-libsoup2-devel +makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel - libgweather-devel libical-devel libpeas-devel libsoup-devel" + libgweather-devel libical-devel libpeas-devel libsoup3-devel" short_desc="Calendar application designed to perfectly fit the GNOME desktop" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" -changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ae7cc63aae96a02aa599b6d6a348585f4e76f729536f39efb744302b05b5fbbd +#changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/gnome-calendar/${version%.*}/gnome-calendar-${version}.tar.xz" +checksum=afa5fc66e2f691553cc7d517db2363cff2d62cd1b5df455e5f4f7133139d21f2 build_options="gir" build_options_default="gir" From c1b8af62f355b39bb7ae46b1e67be01ae793df78 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 19/47] evince: revbump for gnome-desktop 43 --- srcpkgs/evince/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index bfe74853c0c3..e6cde7202b63 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,7 +1,7 @@ # Template file for 'evince' pkgname=evince version=43.1 -revision=1 +revision=2 build_helper="gir" build_style=meson configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) From f999ef04871ef7428950fe55f39c6b854fca6d62 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 20/47] totem: revbump for gnome-desktop 43 --- srcpkgs/totem/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 0eb8af318ac2..b481d520e2a2 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,7 +1,7 @@ # Template file for 'totem' pkgname=totem version=43.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Denable-python=no" From c992adb84d2cc0ee563b629902e6fc7cf90402a7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:11:51 +0200 Subject: [PATCH 21/47] nautilus: revbump for gnome-desktop 43 --- srcpkgs/nautilus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index 571013b24c7d..ea8f2ad81d47 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,7 +1,7 @@ # Template file for 'nautilus' pkgname=nautilus version=42.2 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" From 7ed6c304b91c3a30cc183eca0d8364dba262c557 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 2 Oct 2022 13:23:42 +0200 Subject: [PATCH 22/47] gnome-clocks: update to 43.0. --- srcpkgs/gnome-clocks/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index 9197dbbcbd46..1afa0de1dac8 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,19 +1,20 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=42.0 -revision=2 +version=43.0 +revision=1 build_helper="gir" build_style=meson hostmakedepends="pkg-config gettext itstool glib-devel vala gtk-update-icon-cache desktop-file-utils" makedepends="glib-devel vala-devel gnome-desktop-devel gtk4-devel libadwaita-devel libnotify-devel gsound-devel - libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel + libgweather-devel geocode-glib-devel geoclue2-devel hicolor-icon-theme" depends="desktop-file-utils hicolor-icon-theme" short_desc="Clock application for the GNOME Desktop" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Clocks" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0 +changelog="https://gitlab.gnome.org/GNOME/gnome-clocks/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gnome-clocks/${version%.*}/gnome-clocks-${version}.tar.xz" +checksum=b0743b70d00880aa3bcdcc7f7f34c8c2286257b5c81737d4f981bc8c4f4f981d From 62d46bb56fc1748e4f329bf207656b751c3802d8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:16:58 +0200 Subject: [PATCH 23/47] nautilus: update to 43.1. --- common/shlibs | 2 +- srcpkgs/nautilus/template | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1725ea3b1208..c30b43fdea57 100644 --- a/common/shlibs +++ b/common/shlibs @@ -675,7 +675,7 @@ libgvfscommon.so.0 gvfs-1.7.2_1 libgvfscommon-dnssd.so.0 gvfs-1.7.2_1 libgvfsdaemon.so gvfs-1.20_1 libgvfscommon.so gvfs-1.20_1 -libnautilus-extension.so.1 libnautilus-3.2.1_1 +libnautilus-extension.so.4 libnautilus-43.0_1 libmpc.so.3 libmpc-1.0.1_1 libsigc-2.0.so.0 libsigc++-1.1_1 libsigc-3.0.so.0 libsigc++3-3.0.3_1 diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index ea8f2ad81d47..cfeaa56f731a 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,25 +1,25 @@ # Template file for 'nautilus' pkgname=nautilus -version=42.2 -revision=2 +version=43.1 +revision=1 build_style=meson build_helper="gir" configure_args="-Dtests=headless -Dintrospection=$(vopt_if gir true false)" -hostmakedepends="gettext glib-devel libxslt pkg-config tracker" -makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel +hostmakedepends="gettext glib-devel libxslt pkg-config tracker desktop-file-utils" +makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk4-devel libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel libxml2-devel tracker-devel gst-plugins-base1-devel harfbuzz-devel - libhandy1-devel libportal-gtk3-devel" + libadwaita-devel libportal-gtk4-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tracker-miners tracker" checkdepends="tracker tracker-miners python3-gobject dbus" short_desc="GNOME file manager" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" -changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" -checksum=99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2 +changelog="https://gitlab.gnome.org/GNOME/nautilus/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/nautilus/${version%%.*}/nautilus-${version}.tar.xz" +checksum=0da1003c0cda08ac0546a4c143ed3a1697e36823c60fa73f4d2f4da7723bccaf # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s make_check=extended @@ -40,7 +40,7 @@ libnautilus_package() { } } nautilus-devel_package() { - depends="gtk+3-devel libnautilus>=${version}_${revision}" + depends="gtk4-devel libnautilus>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 54e8c4e461a2e7445e936a21d2e35814860d119a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:25:11 +0200 Subject: [PATCH 24/47] evince: disable nautilus extension * the extension doesn't support nautilus 43 --- srcpkgs/evince/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index e6cde7202b63..841968f28958 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,16 +1,17 @@ # Template file for 'evince' pkgname=evince version=43.1 -revision=2 +revision=3 build_helper="gir" build_style=meson configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) - -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled" + -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled + -Dnautilus=false" hostmakedepends="adwaita-icon-theme gettext $(vopt_if gtk_doc gi-docgen) glib-devel itstool pkg-config perl-XML-Parser appstream-glib" # 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 + libgxps-devel libsecret-devel libspectre-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" From 9aad4fed11de8ca7e604ca87967f3dfbc2dba2f6 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 28 Sep 2022 23:35:02 +0200 Subject: [PATCH 25/47] file-roller: update to 43.0. --- srcpkgs/file-roller/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 1baaf1e1922f..a726f3d2d159 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,16 +1,16 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.42.0 +version=43.0 revision=1 build_style=meson -hostmakedepends="gettext glib-devel itstool pkg-config" +hostmakedepends="gettext glib-devel itstool pkg-config desktop-file-utils" makedepends="gtk+3-devel json-glib-devel libarchive-devel libglib-devel - libnotify-devel nautilus-devel libhandy1-devel" + libnotify-devel nautilus-devel libhandy1-devel libportal-gtk3-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME Front-end to archiving programs like tar and zip" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/FileRoller" changelog="https://gitlab.gnome.org/GNOME/file-roller/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1c438e6d53ec10ff4f2eb5b22d7bbf28a7c2a84957ab64a751c1cdf3c52302c7 +distfiles="${GNOME_SITE}/file-roller/${version%.*}/file-roller-${version}.tar.xz" +checksum=298729fdbdb9da8132c0bbc60907517d65685b05618ae05167335e6484f573a1 From 355af0deed36573f324b15a7111f54d176b437b7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 00:24:44 +0200 Subject: [PATCH 26/47] gnome-online-accounts: update to 3.46.0. --- srcpkgs/gnome-online-accounts/template | 27 +++++++++++--------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index fa21b95b7434..f936f384468e 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,27 +1,22 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts -version=3.44.0 -revision=2 -build_style=gnu-configure +version=3.46.0 +revision=1 +build_style=meson build_helper="gir" -configure_args="$(vopt_enable gir introspection) - --enable-documentation --enable-backend - --enable-google --enable-kerberos --enable-flickr - --enable-facebook --disable-static --enable-exchange --enable-imap-smtp - --enable-owncloud --enable-windows-live - --enable-lastfm --enable-media-server" -hostmakedepends="docbook-xsl gettext glib-devel - libxslt pkg-config $(vopt_if gir vala)" -makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel - libsoup-devel mit-krb5-devel rest0-devel telepathy-glib-devel webkit2gtk-devel" +configure_args="$(vopt_bool gir introspection) $(vopt_bool gir vapi) + -Dmedia_server=true -Dman=true" +hostmakedepends="pkg-config gettext glib-devel docbook-xsl" +makedepends="gtk+3-devel libwebkit2gtk41-devel json-glib-devel libsecret-devel + rest-devel gcr-devel mit-krb5-devel libsoup3-devel" depends="hicolor-icon-theme" short_desc="GNOME service to access online accounts" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" -changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-43/NEWS" distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz" -checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342 +checksum=5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa build_options="gir" build_options_default="gir" From 269ca59f5c91d608eb4c16807b0ee49bd27e4eab Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 30 Sep 2022 21:44:30 +0200 Subject: [PATCH 27/47] gnome-console: update to 43.0. console nautilus plugin is now included in nautilus --- srcpkgs/gnome-console/template | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template index 7e09b6cc9945..c041023d594b 100644 --- a/srcpkgs/gnome-console/template +++ b/srcpkgs/gnome-console/template @@ -1,26 +1,23 @@ # Template file for 'gnome-console' pkgname=gnome-console -version=42.2 +version=43.0 revision=1 build_style=meson -configure_args="-Dnautilus=enabled" -hostmakedepends="pkg-config desktop-file-utils gettext sassc +hostmakedepends="pkg-config desktop-file-utils gettext gobject-introspection glib-devel gtk-update-icon-cache" -makedepends="libhandy1-devel vte3-devel libgtop-devel nautilus-devel +makedepends="libadwaita-devel vte3-gtk4-devel libgtop-devel gsettings-desktop-schemas-devel pcre2-devel" depends="gsettings-desktop-schemas" short_desc="Simple user-friendly terminal emulator for the GNOME desktop" -maintainer="oreo639 " +maintainer="oreo639 " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/console" -changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7d26e6c18744c575a787293263f60ceff630107098e9e58a7765b00ac7437049 +changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-43/NEWS" +distfiles="${GNOME_SITE}/gnome-console/${version%.*}/gnome-console-${version}.tar.xz" +checksum=b9642485a37a70e82cc10553b0e2681756ba361ff5e4cbf3182f150231fea99e nautilus-gnome-console-extension_package() { depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - nautilus integration" - pkg_install() { - vmove usr/lib/nautilus/extensions-3.0 - } + short_desc+=" - transitional package" + build_style=meta } From 1e662a88678cc627c3b256e10b03109caccc8ba1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:37:19 +0200 Subject: [PATCH 28/47] libgweather: update to 4.2.0. --- .../patches/fix-cross-introspection.patch | 14 ----- ...metar-test-dont-use-known-duplicates.patch | 51 ------------------- srcpkgs/libgweather/template | 14 ++--- 3 files changed, 8 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/libgweather/patches/fix-cross-introspection.patch delete mode 100644 srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch diff --git a/srcpkgs/libgweather/patches/fix-cross-introspection.patch b/srcpkgs/libgweather/patches/fix-cross-introspection.patch deleted file mode 100644 index fbec0c3317fa..000000000000 --- a/srcpkgs/libgweather/patches/fix-cross-introspection.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgweather/meson.build b/libgweather/meson.build -index 08311af4..ef554f2e 100644 ---- a/libgweather/meson.build -+++ b/libgweather/meson.build -@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', - ) - - g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) --build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() -+build_gir = get_option('introspection') and g_ir_scanner.found() - - enable_vala = get_option('enable_vala') - vapigen = find_program('vapigen', required: enable_vala == 'true') - diff --git a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch b/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch deleted file mode 100644 index 5646cd24cc21..000000000000 --- a/srcpkgs/libgweather/patches/metar-test-dont-use-known-duplicates.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8b4fe0ad32bac4da47188207541b0aec3f786498 Mon Sep 17 00:00:00 2001 -From: Pierre Labastie -Date: Sun, 10 Apr 2022 22:24:47 +0200 -Subject: [PATCH] metar test: Don't use "known" duplicates - -The metar list provided by NOAA contains duplicate ICAO codes. -Those duplicates may change over time, so it does not make sense -to use an array of known duplicates. Presently a duplicate is rejected -when it is known, and inserted if it is not, leading to a difference -in the number of insertions and the number of keys, so that the test -fails. If any duplicate is rejected, the number of insertions is -always equal to the number of keys (unless something goes wrong -in g_hash_table_insert). And this is the default behavior for known -duplicates anyway. - -Closes: https://gitlab.gnome.org/GNOME/libgweather/-/issues/168 ---- - libgweather/tests/metar.c | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c -index 7d6c7c04..a6fa7e79 100644 ---- a/libgweather/tests/metar.c -+++ b/libgweather/tests/metar.c -@@ -41,20 +41,11 @@ parse_metar_stations (const char *contents) - continue; - } - -+ /* If it is a duplicate discard it */ - if (g_hash_table_lookup (stations_ht, station)) { -- const char * const known_duplicates[] = { -- "VOGO", -- "KHQG", -- "KOEL", -- "KTQK", -- "KX26", -- NULL -- }; -- if (g_strv_contains (known_duplicates, station)) { -- g_free (station); -- continue; -- } - g_test_message ("Weather station '%s' already defined\n", station); -+ g_free (station); -+ continue; - } - - g_hash_table_insert (stations_ht, station, g_strdup (line)); --- -GitLab - diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index b4fcfcb12563..15b9aabf1110 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,22 +1,24 @@ # Template file for 'libgweather' pkgname=libgweather reverts="40.0_1" -version=4.0.0 -revision=3 +version=4.2.0 +revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo" -hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala) +hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel + json-glib-devel $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)" -makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel" +makedepends="geocode-glib-devel gtk+3-devel libsoup3-devel" depends="tzdata" short_desc="GNOME Weather information access library" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" +changelog="https://gitlab.gnome.org/GNOME/libgweather/-/raw/main/NEWS" distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz" -checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c +checksum=af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203 build_options="gir gtk_doc" build_options_default="gir gtk_doc" From 09a559d68ae9b673f25e33f77227f86295bd9e52 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:43:06 +0200 Subject: [PATCH 29/47] geary: update to 43.0. --- srcpkgs/geary/patches/vala-0.56a.patch | 25 ---------------- srcpkgs/geary/patches/vala-0.56b.patch | 40 -------------------------- srcpkgs/geary/template | 13 +++++---- 3 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/geary/patches/vala-0.56a.patch delete mode 100644 srcpkgs/geary/patches/vala-0.56b.patch diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch deleted file mode 100644 index df2c3902db14..000000000000 --- a/srcpkgs/geary/patches/vala-0.56a.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Sun, 30 Jan 2022 19:54:11 +0100 -Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument - ---- - src/client/util/util-cache.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala -index f054e32e5..ecc275e84 100644 ---- a/src/client/util/util-cache.vala -+++ b/src/client/util/util-cache.vala -@@ -12,7 +12,7 @@ public class Util.Cache.Lru : Geary.BaseObject { - private class CacheEntry { - - -- public static int lru_compare(CacheEntry a, CacheEntry b) { -+ public static int lru_compare(CacheEntry a, CacheEntry b) { - if (a.key == b.key) { - return 0; - } --- -GitLab - diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch deleted file mode 100644 index 2d071a133751..000000000000 --- a/srcpkgs/geary/patches/vala-0.56b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Tue, 30 Nov 2021 15:31:31 +0100 -Subject: [PATCH] Fix accessibility issues with initializer of constants - ---- - src/client/application/application-client.vala | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala -index 6ce19ce2a..e6ba85331 100644 ---- a/src/client/application/application-client.vala -+++ b/src/client/application/application-client.vala -@@ -8,16 +8,16 @@ - - // Defined by CMake build script. - extern const string GETTEXT_PACKAGE; --extern const string _APP_ID; --extern const string _BUILD_ROOT_DIR; --extern const string _GSETTINGS_DIR; --extern const string _INSTALL_PREFIX; --extern const string _NAME_SUFFIX; -+public extern const string _APP_ID; -+public extern const string _BUILD_ROOT_DIR; -+public extern const string _GSETTINGS_DIR; -+public extern const string _INSTALL_PREFIX; -+public extern const string _NAME_SUFFIX; - extern const string _PLUGINS_DIR; - extern const string _PROFILE; - extern const string _REVNO; --extern const string _SOURCE_ROOT_DIR; --extern const string _VERSION; -+public extern const string _SOURCE_ROOT_DIR; -+public extern const string _VERSION; - extern const string _WEB_EXTENSIONS_DIR; - - --- -GitLab - diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index e1360898bfdc..79642f2195bd 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -1,14 +1,14 @@ # Template file for 'geary' pkgname=geary -version=40.0 -revision=5 +version=43.0 +revision=1 build_helper="gir" build_style=meson configure_args="-Dprofile=release -Dcontractor=enabled" hostmakedepends="desktop-file-utils iso-codes pkg-config itstool gobject-introspection vala glib-devel gettext" -makedepends="enchant2-devel gcr-devel gmime3-devel libsoup-devel libglib-devel - libgee08-devel libsecret-devel webkit2gtk-devel libxml2-devel +makedepends="enchant2-devel gcr-devel gmime3-devel libsoup3-devel libglib-devel + libgee08-devel libsecret-devel libwebkit2gtk41-devel libxml2-devel gnome-online-accounts-devel json-glib-devel libunwind-devel libcanberra-devel folks-devel appstream-glib-devel gspell-devel ytnef-devel libhandy1-devel libpeas-devel gsound-devel libstemmer-devel" @@ -17,8 +17,9 @@ short_desc="Lightweight email program for the GNOME desktop" maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Geary" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz" -checksum=3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0 +changelog="https://gitlab.gnome.org/GNOME/geary/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/geary/${version%.*}/geary-${version}.tar.xz" +checksum=489166f87dd9d29011f5e5b79694f2588b473f7e191c59ce9013c8c8e0e363e7 make_check=no # tests fail with a webkit process crash post_patch() { From b3f4b1ba858d14260493d510af6876ad986c9901 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:43:12 +0200 Subject: [PATCH 30/47] gnome-initial-setup: update to 43.2. --- srcpkgs/gnome-initial-setup/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index d8d472d4bfd9..b6adfa30f8fb 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,21 +1,21 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=42.2 -revision=2 +version=43.2 +revision=1 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" hostmakedepends="pkg-config glib-devel gettext" makedepends="NetworkManager-devel accountsservice-devel libglib-devel - gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel + gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel gnome-online-accounts-devel gdm-devel libpwquality-devel mit-krb5-devel vala-devel libnma-devel polkit-devel - rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel - pango-devel libhandy1-devel geocode-glib-libsoup2-devel" + rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel + pango-devel libadwaita-devel geocode-glib-devel" depends="iso-codes" short_desc="GNOME initial setup" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz" -checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b +checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698 From 4c8e7ffbfe4c14a3214fa17172072e9ca19fd15c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 18:40:02 +0200 Subject: [PATCH 31/47] grilo-plugins: disable goa --- srcpkgs/grilo-plugins/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index d49a8ec8b200..8fbcaeb4fed8 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -1,14 +1,15 @@ # Template file for 'grilo-plugins' pkgname=grilo-plugins version=0.3.14 -revision=2 +revision=3 build_style=meson -hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3" +configure_args="-Dgoa=disabled" +hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker" # XXX missing plugins: fakemetadata. makedepends="grilo-devel gom-devel json-glib-devel libquvi-devel rest0-devel sqlite-devel libgcrypt-devel - tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel - gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel + tracker-devel totem-pl-parser-devel libgdata-devel libmediaart-devel + gstreamer1-devel libdmapsharing-devel lua53-devel avahi-glib-libs-devel" checkdepends="python3-gobject gst-plugins-bad1 dbus" short_desc="Plugins for Grilo" From 15d0e21a1eecd25ea499cac53140dfabf5d25257 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 23 Nov 2022 10:33:08 +0100 Subject: [PATCH 32/47] xdg-desktop-portal-gnome: revbump for gnome-desktop 43 --- srcpkgs/xdg-desktop-portal-gnome/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template index fe0c1b213f1f..4f0ea1e9b00a 100644 --- a/srcpkgs/xdg-desktop-portal-gnome/template +++ b/srcpkgs/xdg-desktop-portal-gnome/template @@ -1,7 +1,7 @@ # Template file for 'xdg-desktop-portal-gnome' pkgname=xdg-desktop-portal-gnome version=43.1 -revision=1 +revision=2 build_style=meson configure_args="-Dsystemduserunitdir=/usr/lib/systemd/user" hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext" From 39d16128cd216f5a4107e619f5a7c27d5217fb3a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 23 Nov 2022 10:57:02 +0100 Subject: [PATCH 33/47] gsettings-desktop-schemas: update to 43.0. --- srcpkgs/gsettings-desktop-schemas/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 1779e26f56df..636b7a5cabf6 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=42.0 +version=43.0 revision=1 build_helper="gir" build_style=meson @@ -8,12 +8,12 @@ configure_args="-Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext pkg-config glib-devel" makedepends="libglib-devel" short_desc="Collection of GSettings schemas" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" changelog="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2 +distfiles="${GNOME_SITE}/gsettings-desktop-schemas/${version%.*}/gsettings-desktop-schemas-${version}.tar.xz" +checksum=5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe # Package build options build_options="gir" From 381bfbdf085e40e026371c81d207ebf204af10cd Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 23 Nov 2022 19:05:46 +0100 Subject: [PATCH 34/47] GPaste: update to 43.0. --- srcpkgs/GPaste/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/GPaste/template b/srcpkgs/GPaste/template index 17f2e3122ba5..f2ba159d2105 100644 --- a/srcpkgs/GPaste/template +++ b/srcpkgs/GPaste/template @@ -1,6 +1,6 @@ # Template file for 'GPaste' pkgname=GPaste -version=42.1 +version=43.0 revision=1 build_helper="gir" build_style=meson @@ -10,14 +10,15 @@ configure_args="$(vopt_bool gnome_shell gnome-shell) hostmakedepends="gettext glib-devel pkg-config vala gobject-introspection" makedepends="gtk+3-devel gtk4-devel appstream-glib-devel dbus-devel gdk-pixbuf-devel libadwaita-devel libglib-devel libXi-devel libXtst-devel libX11-devel harfbuzz-devel - $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel" + $(vopt_if gnome_shell 'gjs-devel mutter-devel') vala-devel gcr-devel" short_desc="Clipboard management system" maintainer="Enno Boland " license="BSD-2-Clause" homepage="https://www.imagination-land.org/tags/GPaste.html" -changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-42/NEWS" +#changelog="https://raw.githubusercontent.com/Keruspe/GPaste/gpaste-43/NEWS" +changelog="https://raw.githubusercontent.com/Keruspe/GPaste/master/NEWS" distfiles="https://www.imagination-land.org/files/gpaste/GPaste-${version}.tar.xz" -checksum=d6b3d4c2a43ff53de3b1ec0b41222064aafaadcc65817d654476ea9e2da4ccb9 +checksum=383e3474ecc78ad7312ab336e19ca112959412db4b4274c6b59dc9153b0ba5de build_options="gnome_shell" desc_option_gnome_shell="Build GNOME Shell integration and extension" @@ -28,7 +29,7 @@ post_install() { } GPaste-devel_package() { - depends="libgpaste-${version}_${revision}" + depends="libgpaste>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From bed781c4e112b7bd9352937d0d3993a27c252790 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 23 Nov 2022 21:08:05 +0100 Subject: [PATCH 35/47] gnome-terminal: update to 3.46.7. --- srcpkgs/gnome-terminal/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index f12986cc45af..6e6d4241be04 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,10 +1,10 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.44.1 +version=3.46.7 revision=1 build_style=meson -configure_args="-Dnautilus_extension=true -Db_ndebug=false" -hostmakedepends="glib-devel intltool itstool pkg-config docbook-xsl libxslt" +configure_args="-Dnautilus_extension=true -Db_ndebug=false -Db_lto=false" +hostmakedepends="glib-devel gettext itstool pkg-config docbook-xsl libxslt" makedepends="dconf-devel gnome-shell gsettings-desktop-schemas-devel nautilus-devel vte3-devel" depends="desktop-file-utils" @@ -12,8 +12,8 @@ short_desc="GNOME terminal emulator application" 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=fb6f20ee1ff231a9aaedab13d5dc6e5a64c955711224848b790086e88959d37b +distfiles="https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz" +checksum=e4a57d33ebb179e3535e2255d0e2f6811d437a510a16298c62f8eba1e2293fad lib32disabled=yes if [ "$CROSS_BUILD" ]; then @@ -25,6 +25,6 @@ nautilus-gnome-terminal-extension_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - nautilus integration" pkg_install() { - vmove usr/lib/nautilus/extensions-3.0 + vmove usr/lib/nautilus/extensions-4 } } From 5d2d4ee2caeab51dd9c5317f83513855f49508a1 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 18:59:18 +0100 Subject: [PATCH 36/47] gnome-user-docs: update to 43.0. --- srcpkgs/gnome-user-docs/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 773c9913d74f..2f03d3bdb057 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,15 +1,15 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=42.0 +version=43.0 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config itstool" makedepends="yelp" depends="yelp" short_desc="User documentation for GNOME" -maintainer="Enno Boland " +maintainer="Michal Vasilek " license="CC-BY-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs" -changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905 +changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/gnome-user-docs/${version%.*}/gnome-user-docs-${version}.tar.xz" +checksum=3607160effd6f91e25a8798b57defb2099dd70b8fee4e7e2f20f2637ac28caee From 544451ce73bd50c8de5ac4002229dbe8df111f08 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 19:37:00 +0100 Subject: [PATCH 37/47] gnome-font-viewer: update to 43.0. --- srcpkgs/gnome-font-viewer/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index bdc99f9a8d8c..73344ff10aa6 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,6 +1,6 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=42.0 +version=43.0 revision=1 build_style=meson hostmakedepends="pkg-config glib-devel gettext" @@ -8,8 +8,9 @@ makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel gnome-desktop-devel harfbuzz-devel libadwaita-devel" depends="desktop-file-utils" short_desc="Font viewer for GNOME" -maintainer="Enno Boland " +maintainer="Michal Vasilek " 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=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc +changelog="https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/gnome-font-viewer/${version%.*}/gnome-font-viewer-${version}.tar.xz" +checksum=81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9 From 10bab3a7c1d0edf5a8fc983d9eaf2f2e82060461 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 19:53:07 +0100 Subject: [PATCH 38/47] orca: update to 43.0. --- srcpkgs/orca/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index ad4d14ce838e..2b235df6f70b 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,7 +1,7 @@ # Template file for 'orca' pkgname=orca -version=42.3 -revision=2 +version=43.0 +revision=1 build_style=gnu-configure hostmakedepends="gettext itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel" @@ -12,9 +12,10 @@ short_desc="Screen reader for individuals who are blind or visually impaired" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" -changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=fadcba0bfeae1e6672266264e76f63fe5abf8f0efb34be118b5a973fb6f2f724 +#changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/orca/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/orca/${version%.*}/orca-${version}.tar.xz" +checksum=1ca75a00c4a8512a09e4a26eb339fad7944d1ed41aca32f70f69627244218250 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 5a46c0a16d58c29983a24786ec3450383afcf3bc Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 19:57:53 +0100 Subject: [PATCH 39/47] freerdp: update to 2.9.0. --- srcpkgs/freerdp/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index 62b4f17634ef..acb6d637a833 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,7 +1,7 @@ # Template file for 'freerdp' pkgname=freerdp -version=2.7.0 -revision=2 +version=2.9.0 +revision=1 build_style=cmake configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON -DWITH_GSTREAMER_0_10=OFF -DWITH_GSTREAMER_1_0=OFF -DWITH_JPEG=ON @@ -18,8 +18,9 @@ short_desc="Free RDP (Remote Desktop Protocol) client" maintainer="Orphaned " license="Apache-2.0" homepage="https://www.freerdp.com/" +changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/stable-2.0/ChangeLog" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz" -checksum=2350097b2dc865e54a3e858bce0b13a99711428d397ee51d60cf91ccb56c0415 +checksum=ab8de7e962bdc3c34956160de2de8ed28423d39a78452b7686b72c94b1953b27 CFLAGS="-Wno-dev" case "$XBPS_TARGET_MACHINE" in @@ -28,7 +29,7 @@ case "$XBPS_TARGET_MACHINE" in esac post_install() { - rm -f ${DESTDIR}/usr/lib64 + rm ${DESTDIR}/usr/lib64 } # first we want to separate -server, everything else then goes to client From 5be335de4f3f47cb0ee69c843dd2e7b9ed59f740 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 19:56:10 +0100 Subject: [PATCH 40/47] gnome-remote-desktop: update to 43.2. --- .../patches/remove-systemd-dep.patch | 26 ------------------- srcpkgs/gnome-remote-desktop/template | 10 +++---- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch diff --git a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch b/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch deleted file mode 100644 index 129a59dcfa7b..000000000000 --- a/srcpkgs/gnome-remote-desktop/patches/remove-systemd-dep.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -20,7 +20,6 @@ glib_dep = dependency('glib-2.0', version: '>= 2.68') - gio_dep = dependency('gio-2.0') - gio_unix_dep = dependency('gio-unix-2.0') - pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.0') --systemd_dep = dependency('systemd', required: get_option('systemd')) - libsecret_dep = dependency('libsecret-1') - libnotify_dep = dependency('libnotify') - epoxy_dep = dependency('epoxy') -@@ -83,15 +82,6 @@ configure_file(input: 'config.h.meson', - configinc = include_directories('.') - - servicedir = get_option('systemd_user_unit_dir') --if systemd_dep.found() -- if servicedir == '' -- servicedir = systemd_dep.get_pkgconfig_variable('systemduserunitdir') -- endif -- -- if servicedir == '' -- error('Couldn\'t determine systemd user unit service directory') -- endif --endif - - top_srcdir = meson.current_source_dir() - builddir = meson.current_build_dir() diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template index b826155a3ab7..4a7278c35ab7 100644 --- a/srcpkgs/gnome-remote-desktop/template +++ b/srcpkgs/gnome-remote-desktop/template @@ -1,18 +1,18 @@ # Template file for 'gnome-remote-desktop' pkgname=gnome-remote-desktop -version=42.3 +version=43.2 revision=1 build_style=meson -configure_args="-Drdp=true -Dvnc=true +configure_args="-Drdp=true -Dvnc=true -Dsystemd=false -Dsystemd_user_unit_dir=/var/lib/systemd/user" -hostmakedepends="pkg-config gettext glib-devel" +hostmakedepends="pkg-config gettext glib-devel asciidoc" makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel - libgudev-devel nv-codec-headers" + libgudev-devel nv-codec-headers tpm2-tss-devel fdk-aac-devel" short_desc="GNOME remote desktop server" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop" distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz" -checksum=a296ad58f8b3bdac0e2e0d87db12a9395e72770a960e787fbcc1be3f0068b642 +checksum=84a9fd65a9bad8cef73482fda2d20acd122f0b8521b1de86c9413889b9fa9771 make_check=no # xvfb failed to start From d5f97f9bec0ee9bee6dcd568c78232968c3c5afe Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 20:06:56 +0100 Subject: [PATCH 41/47] devhelp: update to 43.0. --- srcpkgs/devhelp/patches/meson-0.61.patch | 48 ------------------------ srcpkgs/devhelp/template | 11 +++--- 2 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch deleted file mode 100644 index dfea339688e3..000000000000 --- a/srcpkgs/devhelp/patches/meson-0.61.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Wed, 17 Nov 2021 18:02:20 +0800 -Subject: [PATCH] Remove incorrect arg for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments and -explicitly rejects with error "ERROR: Function does not take -positional arguments" since meson 0.60.0 ---- - data/meson.build | 2 -- - plugins/gedit-plugin/meson.build | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index c6aeffb4..0bc531a2 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -19,7 +19,6 @@ appdata_conf = configuration_data() - appdata_conf.set('application_id', APPLICATION_ID) - appdata = APPLICATION_ID + '.appdata.xml' - appdata_file = I18N.merge_file( -- appdata, - input: configure_file( - input: 'org.gnome.Devhelp.appdata.xml.in.in', - output: APPLICATION_ID + '.appdata.xml.in', -@@ -45,7 +44,6 @@ desktop_conf = configuration_data() - desktop_conf.set('application_id', APPLICATION_ID) - desktop = APPLICATION_ID + '.desktop' - desktop_file = I18N.merge_file( -- desktop, - type: 'desktop', - input: configure_file( - input: 'org.gnome.Devhelp.desktop.in.in', -diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build -index 4f779886..877a01ff 100644 ---- a/plugins/gedit-plugin/meson.build -+++ b/plugins/gedit-plugin/meson.build -@@ -7,7 +7,6 @@ install_data( - - plugin_info_file = 'devhelp.plugin' - I18N.merge_file( -- plugin_info_file, - type: 'desktop', - input: plugin_info_file + '.desktop.in', - output: plugin_info_file, --- -GitLab - diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index 9a9693598317..d4eb843ee6ba 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,22 +1,23 @@ # Template file for 'devhelp' pkgname=devhelp -version=41.2 +version=43.0 revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" -makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel" +makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel" short_desc="API documentation browser for GTK+ and GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Devhelp" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2 +changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz" +checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04 replaces="devhelp-gedit-plugin<=40.0_1" devhelp-devel_package() { short_desc+=" - development files" - depends="gsettings-desktop-schemas-devel webkit2gtk-devel + depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel devhelp-libs>=${version}_${revision}" pkg_install() { vmove usr/include From 21aafc978ecfb82e17121ae618a6dfcff732430f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 20:29:57 +0100 Subject: [PATCH 42/47] sysprof: update to 3.46.0. --- common/shlibs | 2 +- srcpkgs/sysprof/template | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index c30b43fdea57..b33314aeeb5c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3119,7 +3119,7 @@ libunbound.so.8 libunbound-1.13.1_2 libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 libsysprof-4.so sysprof-3.37.90_1 -libsysprof-ui-4.so sysprof-3.37.90_1 +libsysprof-ui-5.so sysprof-3.46.0_1 libvala-0.56.so.0 libvala-0.56.0_1 libvaladoc-0.56.so.0 libvaladoc-0.56.0_1 libvalaccodegen.so libvala-0.44.0_1 diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 4d644691bee4..f6b18f00c4f0 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,20 +1,19 @@ # Template file for 'sysprof' pkgname=sysprof -reverts="3.46.0_1" -version=3.44.0 +version=3.46.0 revision=2 build_style=meson -configure_args="-Denable_gtk=true -Dsystemdunitdir=/usr/lib/systemd" -hostmakedepends="gettext pkg-config itstool glib-devel" -makedepends="gtk+3-devel libdazzle-devel polkit-devel glib-devel elogind-devel - json-glib-devel libunwind-devel" +configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd" +hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils" +makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel +json-glib-devel libunwind-devel libadwaita-devel" short_desc="System-wide profiler for Linux" maintainer="Enno Boland " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/sysprof" changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b +distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz" +checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071 # for ITS rules if [ "$CROSS_BUILD" ]; then From da9fe0e36b32a1dce2a4711192f3f840e17808da Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 21:34:31 +0100 Subject: [PATCH 43/47] gnome-builder: update to 43.4. --- srcpkgs/gnome-builder/template | 36 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 726853f194fa..b89928e1c7e4 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,34 +1,32 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=42.1 -revision=3 +version=43.4 +revision=1 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection - gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext" -makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel - gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel - libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel - libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel - libhandy1-devel pcre-devel libgit2-devel atk-devel gobject-introspection - python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel - libsoup-devel cmark-devel pango-devel fontconfig-devel libportal-devel" -depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" -checkdepends="xvfb-run" + llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext" +makedepends="cairo-devel clang enchant2-devel flatpak-devel + gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel + libgit2-glib-devel libglib-devel libostree-devel libpeas-devel + libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel + libadwaita-devel pcre2-devel libgit2-devel gobject-introspection + python3-gobject-devel sysprof-devel libportal-gtk4-devel + libsoup3-devel cmark-devel pango-devel libportal-devel + libpanel-devel d-spy-devel editorconfig-devel" +depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject" +checkdepends="xvfb-run cmark-devel" short_desc="IDE for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" -changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5d4d51b702865b48017201f0c607e24a27d72031a8f5c88d4fce875b5545670a +changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS" +distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz" +checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc +make_check_pre="xvfb-run" if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" LIBS="-lexecinfo" fi - -do_check() { - xvfb-run ninja -C build test -} From 8ccaebb55f8360f5592fe258850dd5865f2e26a5 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 15 Dec 2022 16:57:45 +0100 Subject: [PATCH 44/47] yelp: use libwebkit2gtk41 --- srcpkgs/yelp/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index ee51f61289ca..09930e80e65c 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -1,12 +1,12 @@ # Template file for 'yelp' pkgname=yelp version=42.1 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0" +configure_args="--disable-schemas-compile --disable-static" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="bzip2-devel gtk+3-devel libgcrypt-devel libglib-devel liblzma-devel - libxml2-devel libxslt-devel sqlite-devel webkit2gtk-devel yelp-xsl libhandy1-devel" + libxml2-devel libxslt-devel sqlite-devel libwebkit2gtk41-devel yelp-xsl libhandy1-devel" depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl" short_desc="Help browser for GNOME desktop" maintainer="Érico Nogueira " @@ -14,11 +14,11 @@ license="GPL-2.0-or-later" 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/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +distfiles="${GNOME_SITE}/yelp/${version%.*}/yelp-${version}.tar.xz" checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41 yelp-devel_package() { - depends="yelp-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 7e3ba0abd5a875bbe78bcb305018a10017570f8e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 15 Dec 2022 16:57:49 +0100 Subject: [PATCH 45/47] zenity: update to 3.43.0. --- srcpkgs/zenity/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template index e5513bcbedf8..e12e09c0afb4 100644 --- a/srcpkgs/zenity/template +++ b/srcpkgs/zenity/template @@ -1,18 +1,18 @@ # Template file for 'zenity' pkgname=zenity -version=3.42.1 +version=3.43.0 revision=1 build_style=meson configure_args="-Dwebkitgtk=$(vopt_if webkit true false)" hostmakedepends="gettext itstool perl pkg-config" -makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit webkit2gtk-devel)" +makedepends="gtk+3-devel libglib-devel libnotify-devel $(vopt_if webkit libwebkit2gtk41-devel)" short_desc="Display GNOME dialogs from the command line" maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://help.gnome.org/users/zenity/" changelog="https://gitlab.gnome.org/GNOME/zenity/-/raw/master/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a08e0c8e626615ee2c23ff74628eba6f8b486875dd54371ca7e2d7605b72a87c +distfiles="${GNOME_SITE}/zenity/${version%.*}/zenity-${version}.tar.xz" +checksum=b0d7ca1e0c1868fa18f05c210260d8a7be1f08ee13b7f5cfdbab9b61fa16f833 build_options="webkit" build_options_default="webkit" From c89d4162ca61dc15278efce67ac8eac1ffd6dff3 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 18:46:18 +0100 Subject: [PATCH 46/47] gnome-core: update to 43.0. --- srcpkgs/gnome-core/template | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index 3c749515351e..a281f5705318 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,10 +1,10 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=42.0 -revision=4 +version=43.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" -maintainer="Orphaned " +maintainer="Michal Vasilek " license="GPL-2.0-only, LGPL-2.0-only" homepage="https://www.gnome.org" @@ -14,24 +14,24 @@ depends=" at-spi2-atk>=2.38.0 cantarell-fonts>=0.301 dconf>=0.40.0 - evolution-data-server>=3.${version} - folks>=0.15.4 + evolution-data-server>=3.46.0 + folks>=0.15.5 font-adobe-source-code-pro>=2.030R gcr>=3.41.0 gdm>=${version} - geocode-glib-libsoup2>=3.26.2 - gjs>=1.72.0 - glib>=2.72.0 - glib-networking>=2.72.0 + geocode-glib>=3.26.4 + gjs>=1.74.0 + glib>=2.74.0 + glib-networking>=2.74.0 gmime>=3.2.7 gnome-backgrounds>=${version} - gnome-bluetooth>=${version} + gnome-bluetooth>=42.4 gnome-color-manager>=3.36.0 gnome-control-center>=${version} gnome-desktop>=${version} gnome-initial-setup>=${version} - gnome-keyring>=40.0 - gnome-online-accounts>=3.44.0 + gnome-keyring>=42.0 + gnome-online-accounts>=3.46.0 gnome-session>=${version} gnome-settings-daemon>=${version} gnome-shell>=${version} @@ -43,8 +43,8 @@ depends=" gvfs>=1.50.0 mutter>=${version} nautilus>=${version} - sushi>=41.0 - tracker>=3.3.0 - yelp>=${version} + sushi>=43.0 + tracker>=3.4.0 + yelp>=42 xdg-desktop-portal-gnome>=${version} zenity>=3.${version}" From bf0a667bbaaf14c0daa822fedee9570c7341f959 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 11 Dec 2022 19:14:22 +0100 Subject: [PATCH 47/47] gnome: update to 43.0. * replace gnome-terminal with gnome-console --- srcpkgs/gnome/template | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 72507f88501e..974196feb393 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,7 @@ # Template file for 'gnome' pkgname=gnome -version=42.0 -revision=5 +version=43.0 +revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux" maintainer="Michal Vasilek " @@ -11,10 +11,10 @@ homepage="https://www.gnome.org" depends=" gnome-core>=${version} baobab>=${version} - cheese>=41.1 + cheese>=${version} eog>=${version} evince>=${version} - file-roller>=3.${version} + file-roller>=${version} gnome-calculator>=${version} gnome-calendar>=${version} gnome-characters>=${version} @@ -23,26 +23,26 @@ depends=" gnome-disk-utility>=${version} gnome-font-viewer>=${version} gnome-maps>=${version} - gnome-music>=${version} + gnome-music>=42 gnome-remote-desktop>=${version} - gnome-system-monitor>=${version} - gnome-terminal>=3.${version} + gnome-system-monitor>=42 + gnome-console>=${version} gnome-text-editor>=${version} gnome-tweaks>=42.beta gnome-weather>=${version} gsound>=1.0.3 - gspell>=1.10.0 + gspell>=1.11.0 mousetweaks>=3.32.0 orca>=${version} - phodav>=2.5 - simple-scan>=${version} + phodav>=3.0 + simple-scan>=42 totem>=${version}" _apps_depends=" Endeavour>=${version} bijiben>=40.1 dconf-editor>=3.38.3 - devhelp>=41.2 + devhelp>=${version} epiphany>=${version} evolution>=3.44.0 ghex>=${version} @@ -58,13 +58,13 @@ _apps_depends=" gnome-disk-utility>=${version} gnome-font-viewer>=${version} gnome-maps>=${version} - gnome-music>=${version} + gnome-music>=42 gnome-nettool>=${version} gnome-photos>=${version} gnome-screenshot>=41.0 gnome-sound-recorder>=${version} - gnome-system-monitor>=${version} - gnome-terminal>=3.${version} + gnome-system-monitor>=42 + gnome-console>=${version} gnome-text-editor>=${version} gnote>=${version} polari>=3.38.0