From 901addfe557726130e5e6f0c69f08384f9c60a11 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:01:09 -0700 Subject: [PATCH 01/76] xdg-desktop-portal: update to 1.14.1 --- srcpkgs/xdg-desktop-portal/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template index 2f1c240cebb0..5d9fb873dfe6 100644 --- a/srcpkgs/xdg-desktop-portal/template +++ b/srcpkgs/xdg-desktop-portal/template @@ -1,11 +1,11 @@ # Template file for 'xdg-desktop-portal' pkgname=xdg-desktop-portal -version=1.8.1 +version=1.14.1 revision=1 build_style=gnu-configure -configure_args="--enable-pipewire --enable-geoclue --enable-libportal" +configure_args="--enable-pipewire --enable-geoclue --enable-libportal --with-systemd=false" hostmakedepends="pkg-config glib-devel" -makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel +makedepends="flatpak-devel fuse3-devel pipewire-devel geoclue2-devel libportal-devel" checkdepends="dbus" short_desc="Portal frontend service for Flatpak" @@ -13,7 +13,7 @@ maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=01f5f87d3546b63bad85cdba40619913435235a499af3c48ec7554ce8200dcdf +checksum=698159680592c77c7df60c8849f3ae1df421b23972fcdc7b16db40d01996e3ec do_check() { # some tests require a dbus session From 0e40367dc8d9d309951184431c526bc2f06a66f9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:01:19 -0700 Subject: [PATCH 02/76] xdg-desktop-portal-gtk: update to 1.14.0 --- srcpkgs/xdg-desktop-portal-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template index 7517d1b32d8d..597f5977cabf 100644 --- a/srcpkgs/xdg-desktop-portal-gtk/template +++ b/srcpkgs/xdg-desktop-portal-gtk/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-gtk' pkgname=xdg-desktop-portal-gtk -version=1.8.0 +version=1.14.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal-gtk" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=a52529ed321e044ca9adca5e9718d9ba57c414a2634dd4109df344c5b9eed77f +checksum=f621210716a9cf821d969eecb1df1e3e46fc687b87f7add83300d35321594954 post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" From 997f261729d211b8a64720dbce524ab6a58c6942 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 22 Mar 2022 19:25:46 -0700 Subject: [PATCH 03/76] New package: xdg-desktop-portal-gnome-42.0.1 --- srcpkgs/xdg-desktop-portal-gnome/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/xdg-desktop-portal-gnome/template diff --git a/srcpkgs/xdg-desktop-portal-gnome/template b/srcpkgs/xdg-desktop-portal-gnome/template new file mode 100644 index 000000000000..b7951deec327 --- /dev/null +++ b/srcpkgs/xdg-desktop-portal-gnome/template @@ -0,0 +1,20 @@ +# Template file for 'xdg-desktop-portal-gnome' +pkgname=xdg-desktop-portal-gnome +version=42.0.1 +revision=1 +build_style=meson +configure_args="-Dsystemduserunitdir=/tmp" +hostmakedepends="pkg-config glib-devel xdg-desktop-portal gettext" +makedepends="gtk4-devel libadwaita-devel libglib-devel + gnome-desktop-devel gsettings-desktop-schemas-devel" +depends="xdg-desktop-portal xdg-desktop-portal-gtk dbus" +short_desc="GNOME portal backend for xdg-desktop-portal" +maintainer="oreo639 " +license="LGPL-2.1-or-later" +homepage="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=dfe8b52450f32838f9f9e898e95aa8dfa2705ce12d438305557c128b9ce0e2e6 + +post_install() { + rm -rf ${DESTDIR}/tmp +} From 0070e8e79c7fa99eab6685ecebbe0f5fcf512173 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:32:28 -0700 Subject: [PATCH 04/76] adwaita-icon-theme: update to 42.0 --- srcpkgs/adwaita-icon-theme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template index a60f4a865de9..983ae9b69d55 100644 --- a/srcpkgs/adwaita-icon-theme/template +++ b/srcpkgs/adwaita-icon-theme/template @@ -1,6 +1,6 @@ # Template file for 'adwaita-icon-theme' pkgname=adwaita-icon-theme -version=41.0 +version=42.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,4 +10,4 @@ maintainer="Enno Boland " license="LGPL-3.0-or-later, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme" distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" -checksum=ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba +checksum=5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0 From 041c7f624a0afa1435e64e3940308ebee0bbbb27 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:33:19 -0700 Subject: [PATCH 05/76] at-spi2-core: update to 2.44.0 --- srcpkgs/at-spi2-core/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index d347d5ceed64..898d62a5e843 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -1,6 +1,6 @@ # Template file for 'at-spi2-core' pkgname=at-spi2-core -version=2.42.0 +version=2.44.0 revision=1 build_style=meson build_helper="gir" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/at-spi2-core" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386 +checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353 # Package build options build_options="gir" From f4ca47eee53ae329ce45a18d09a3e2bf2c5a2398 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:34:11 -0700 Subject: [PATCH 06/76] baobab: update to 42.0 --- srcpkgs/baobab/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index 259cc5bcf1a1..23e3372ea262 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -1,14 +1,14 @@ # Template file for 'baobab' pkgname=baobab -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel vala" -makedepends="gtk+3-devel vala-devel gsettings-desktop-schemas-devel libhandy1-devel" +makedepends="gtk4-devel libadwaita-devel vala-devel gsettings-desktop-schemas-devel" depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.14" short_desc="Graphical directory tree analyzer for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later" homepage="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=cad6278d2dcc80c84b57105aa5bb58d8a30ce98d6fabd767519ddb86c857e855 +checksum=4b1aabe6bab1582b3fea79a2829bce7f2415bb6e5062f25357aeedd5317a50dc From e69f3fb42e894ef69783d74d7981ad559827bb61 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:35:48 -0700 Subject: [PATCH 07/76] eog: update to 42.0 --- srcpkgs/eog/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index 54f322ee5be3..44bc9fcd54cd 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,20 +1,21 @@ # Template file for 'eog' pkgname=eog -version=41.1 +version=42.0 revision=1 build_helper="gir" build_style=meson configure_args="-Dintrospection=$(vopt_if gir true false)" -hostmakedepends="gettext glib-devel itstool pkg-config" +hostmakedepends="gettext glib-devel itstool pkg-config gtk4-update-icon-cache" makedepends="exempi-devel gnome-desktop-devel libexif-devel libpeas-devel - librsvg-devel lcms2-devel libportal-devel" + librsvg-devel lcms2-devel libportal-gtk3-devel libhandy1-devel" depends="desktop-file-utils hicolor-icon-theme shared-mime-info" short_desc="Eye of GNOME graphics viewer program" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" +changelog="https://gitlab.gnome.org/GNOME/eog/-/raw/master/NEWS" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9 +checksum=fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8 shlib_provides="libeog.so" lib32disabled=yes From 0a66aeb9e446c921747a33a380089efe34e84586 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:36:03 -0700 Subject: [PATCH 08/76] eog-plugins: update to 42.0 --- srcpkgs/eog-plugins/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template index e590c4f61c84..4de58d3a0fe3 100644 --- a/srcpkgs/eog-plugins/template +++ b/srcpkgs/eog-plugins/template @@ -1,19 +1,20 @@ # Template file for 'eog-plugins' pkgname=eog-plugins -version=3.26.8 +version=42.0 revision=1 -build_style=gnu-configure +build_style=meson pycompile_dirs="usr/lib/eog/plugins" -hostmakedepends="glib-devel pkg-config intltool" -makedepends="eog-devel libgdata-devel +hostmakedepends="glib-devel pkg-config gettext" +makedepends="eog-devel libhandy1-devel libgdata-devel libchamplain-devel libpeas-devel libexif-devel exempi-devel gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel" depends="eog gsettings-desktop-schemas python3-gobject" short_desc="Eye of GNOME plugins" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins" +changelog="https://gitlab.gnome.org/GNOME/eog-plugins/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=80709f435232375f71f4b5d74267597a16b0922b271d1c81e522817eae6c9db5 +checksum=3461572401b023d1fc1b07c4baf4240c64d81947ff8b62e02d35968405927caa python_version=3 lib32disabled=yes From 7189c2f0bdd0d2b0e1c105994c0aacaa8e17b91f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:40:26 -0700 Subject: [PATCH 09/76] gjs: update to 1.72.0 --- srcpkgs/gjs/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index b028c09437bb..880cb63af4bb 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,20 +1,20 @@ # Template file for 'gjs' pkgname=gjs -version=1.70.1 +version=1.72.0 revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dprofiler=disabled -Dinstalled_tests=false" hostmakedepends="glib-devel pkg-config" -makedepends="dbus-glib-devel mozjs78-devel readline-devel sysprof-devel" +makedepends="dbus-glib-devel mozjs91-devel readline-devel sysprof-devel" checkdepends="xvfb-run" short_desc="Mozilla-based javascript bindings for the GNOME platform" maintainer="Enno Boland " license="MIT, LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gjs" -changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f +checksum=3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -35,7 +35,7 @@ post_install() { } gjs-devel_package() { - depends="libgirepository-devel mozjs78-devel ${sourcepkg}>=${version}_${revision}" + depends="libgirepository-devel mozjs91-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From fbd00cfbb337640e48871a5c1eddabd64a8f7f97 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:43:30 -0700 Subject: [PATCH 10/76] libgweather: update to 4.0.0 --- common/shlibs | 2 +- srcpkgs/libgweather/template | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7079375524fc..5edd87fd987f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1126,7 +1126,7 @@ libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 libsecret-1.so.0 libsecret-0.10_1 -libgweather-3.so.16 libgweather-3.34.0_1 +libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 libibus-1.0.so.5 ibus-1.4.99.20120917_1 diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index 857006ea8786..d30ddcb541c3 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -1,11 +1,12 @@ # Template file for 'libgweather' pkgname=libgweather -version=40.0 +reverts="40.0_1" +version=4.0.0 revision=1 build_style=meson build_helper="gir" -configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo" -hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)" +configure_args="$(vopt_bool gir enable_vala) -Dgtk_doc=false -Dzoneinfo_dir=/usr/share/zoneinfo" +hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)" makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" depends="tzdata" short_desc="GNOME Weather information access library" @@ -13,7 +14,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/LibGWeather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6 +checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c build_options="gir" build_options_default="gir" @@ -21,7 +22,7 @@ build_options_default="gir" post_patch() { # This test requires LC_IDENTIFICATION, which is a GLIBC's extension # And looks like we didn't ship it. - vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c + vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/tests/test_libgweather.c } libgweather-devel_package() { From dfc240afbdef6e80d1ac415ea4b03fd9466b7442 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:46:28 -0700 Subject: [PATCH 11/76] gnome-bluetooth: update to 42.0 --- common/shlibs | 2 +- .../gnome-bluetooth/patches/meson-0.61.patch | 25 ------------------- srcpkgs/gnome-bluetooth/template | 8 +++--- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch diff --git a/common/shlibs b/common/shlibs index 5edd87fd987f..2365b8e028ca 100644 --- a/common/shlibs +++ b/common/shlibs @@ -683,7 +683,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1 libgtkmm-3.0.so.1 gtkmm-2.99.5_1 libgdkmm-3.0.so.1 gtkmm-2.99.5_1 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1 -libgnome-bluetooth.so.13 gnome-bluetooth-3.12.0_1 +libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1 libsasl2.so.3 libsasl-2.1.26_1 liblber-2.4.so.2 libldap-2.4.21_1 libldap-2.4.so.2 libldap-2.4.21_1 diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch deleted file mode 100644 index c6962edd4f05..000000000000 --- a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 7 Jan 2022 12:51:22 +0100 -Subject: [PATCH] build: Fix build for newer versions of meson - -sendto/meson.build:24:5: ERROR: Function does not take positional arguments. ---- - sendto/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sendto/meson.build b/sendto/meson.build -index 24a4e394..3e233a03 100644 ---- a/sendto/meson.build -+++ b/sendto/meson.build -@@ -22,7 +22,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, --- -GitLab - diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index e6861631b08d..35f65d377d78 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -1,13 +1,13 @@ # Template file for 'gnome-bluetooth' pkgname=gnome-bluetooth -version=3.34.5 +version=42.0 revision=1 build_helper="gir" build_style=meson configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel" -makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel - gvfs-devel bluez eudev-libudev-devel libcanberra-devel" +makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel + gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel" depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils" checkdepends="python3-dbus" short_desc="GNOME Bluetooth Subsystem" @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomeBluetooth" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9 +checksum=3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170 build_options="gir" build_options_default="gir" From 2e5671ca71fdb719c05c9a3a9d8862f011c423fb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:51:10 -0700 Subject: [PATCH 12/76] vala: update to 0.56.0 --- common/shlibs | 2 +- srcpkgs/vala/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2365b8e028ca..e1adf8a99f2d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3127,7 +3127,7 @@ 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 -libvala-0.54.so.0 libvala-0.54.0_1 +libvala-0.56.so.0 libvala-0.56.0_1 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index 9b5335cdde1b..51b0dd9c836e 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -1,7 +1,7 @@ # Template file for 'vala' pkgname=vala # Should be kept in sync with 'valadoc' (shared distfiles) -version=0.54.7 +version=0.56.0 revision=1 build_style=gnu-configure configure_args="--disable-valadoc" @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7 +checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040 shlib_provides="libvalaccodegen.so" make_check=extended From 30d7ad011f2f6826543c737cb0d2cb2a750d04fb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:51:35 -0700 Subject: [PATCH 13/76] valadoc: update to 0.56.0 --- common/shlibs | 2 +- srcpkgs/valadoc/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index e1adf8a99f2d..7714076af15f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3128,7 +3128,7 @@ 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 libvala-0.56.so.0 libvala-0.56.0_1 -libvaladoc-0.54.so.0 libvaladoc-0.54.0_1 +libvaladoc-0.56.so.0 libvaladoc-0.56.0_1 libvalaccodegen.so libvala-0.44.0_1 libphodav-2.0.so.0 phodav-2.2_1 libgfshare.so.2 libgfshare-2.0.0_1 diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template index debe8f29768c..416fee531d3a 100644 --- a/srcpkgs/valadoc/template +++ b/srcpkgs/valadoc/template @@ -1,7 +1,7 @@ # Template file for 'valadoc' pkgname=valadoc # Should be kept in sync with 'vala' (shared distfiles) -version=0.54.7 +version=0.56.0 revision=1 wrksrc="vala-${version}" build_style=gnu-configure @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Vala" changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS" distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz" -checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7 +checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040 pre_configure() { autoreconf -if From 34a3b234b85f3c88f28a384c11dfc961da191ebf Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:53:41 -0700 Subject: [PATCH 14/76] gcr: update to 3.41.0 --- srcpkgs/gcr/patches/unbreak-no-systemd.patch | 23 ++++++++++++++++++++ srcpkgs/gcr/template | 10 ++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/gcr/patches/unbreak-no-systemd.patch diff --git a/srcpkgs/gcr/patches/unbreak-no-systemd.patch b/srcpkgs/gcr/patches/unbreak-no-systemd.patch new file mode 100644 index 000000000000..ca2660244c37 --- /dev/null +++ b/srcpkgs/gcr/patches/unbreak-no-systemd.patch @@ -0,0 +1,23 @@ +From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Sun, 24 Oct 2021 10:26:03 +0200 +Subject: [PATCH] Unbreak build without systemd. + +This fixes the check for WITH_SYSTEMD and prevents a fatal error: +'systemd/sd-daemon.h' file not found when building with systemd disabled. +--- + gcr/gcr-ssh-agent-service.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c +index 3b5a4ca..b7e8928 100644 +--- a/gcr/gcr-ssh-agent-service.c ++++ b/gcr/gcr-ssh-agent-service.c +@@ -39,7 +39,7 @@ + #include + #include + +-#ifdef WITH_SYSTEMD ++#if WITH_SYSTEMD + #include + #endif diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index e42bd6277d1b..5ab7455fb539 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -1,20 +1,20 @@ # Template file for 'gcr' pkgname=gcr -version=3.40.0 +version=3.41.0 revision=1 build_style=meson build_helper="gir" -hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config +hostmakedepends="gettext glib-devel gnupg2 gtk-doc intltool pkg-config openssh libxslt $(vopt_if vala vala)" -makedepends="gtk+3-devel libgcrypt-devel p11-kit-devel libxslt-devel +makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel $(vopt_if vala vala)" depends="desktop-file-utils hicolor-icon-theme gnupg2" short_desc="GNOME crypto package" maintainer="Orphaned " license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later" -homepage="http://www.gnome.org" +homepage="https://gitlab.gnome.org/GNOME/gcr" distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz" -checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 +checksum=0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01 if [ "$CROSS_BUILD" ]; then configure_args="-Dgtk_doc=false" From fb4c807c924fae1690427505f88e592c5451bed0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:55:44 -0700 Subject: [PATCH 15/76] gnome-autoar: update to 0.4.3 --- srcpkgs/gnome-autoar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template index a35c22359b6f..5edd6e9381a7 100644 --- a/srcpkgs/gnome-autoar/template +++ b/srcpkgs/gnome-autoar/template @@ -1,6 +1,6 @@ # Template file for 'gnome-autoar' pkgname=gnome-autoar -version=0.4.2 +version=0.4.3 revision=1 build_style=meson build_helper="gir" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=1d20694079300e12feabdb77304a969d1cc190d1d12a949be845cad01c78a5d3 +checksum=7bdf0789553496abddc3c963b0ce7363805c0c02c025feddebcaacc787249e88 build_options="gir" build_options_default="gir" From bbc0d4648ff0e8a2fbb937dd99d4e63f5563748b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:56:12 -0700 Subject: [PATCH 16/76] gnome-backgrounds: update to 42.0 --- srcpkgs/gnome-backgrounds/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index d0cb63ab2183..46b86e2f6317 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -1,6 +1,6 @@ # Template file for 'gnome-backgrounds' pkgname=gnome-backgrounds -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends=gettext @@ -9,4 +9,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145 +checksum=4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d From 6694ce75385937bc9e143e99a59a86b450f46302 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:59:38 -0700 Subject: [PATCH 17/76] gsettings-desktop-schemas: update to 42.0 --- srcpkgs/gsettings-desktop-schemas/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index 3d841c45f8a8..1779e26f56df 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=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -11,8 +11,9 @@ short_desc="Collection of GSettings schemas" maintainer="Enno Boland " 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=77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed +checksum=6686335a9ed623f7ae2276fefa50a410d4e71d4231880824714070cb317323d2 # Package build options build_options="gir" From 6e03877a0ecc93a41b252118a824699363e98a92 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:01:29 -0700 Subject: [PATCH 18/76] libsoup3: update to 3.0.5 --- srcpkgs/libsoup3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libsoup3/template b/srcpkgs/libsoup3/template index 61ed3d167f17..d0a352b7fd83 100644 --- a/srcpkgs/libsoup3/template +++ b/srcpkgs/libsoup3/template @@ -1,6 +1,6 @@ # Template file for 'libsoup3' pkgname=libsoup3 -version=3.0.4 +version=3.0.5 revision=1 wrksrc="libsoup-$version" build_style=meson @@ -19,7 +19,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/libsoup" changelog="https://gitlab.gnome.org/GNOME/libsoup/-/raw/master/NEWS" distfiles="${GNOME_SITE}/libsoup/${version%.*}/libsoup-${version}.tar.xz" -checksum=5bd38b5e091f707fd7fa3ed7c37aacca3f8e16c65787f1cc17dc38d1dcde567b +checksum=f5d143db6830b3825edc2a1c4449d639273b0bfa017a4970871962d9bca22145 make_check=no # gio tests can't run in chroot # Package build options From 7bd1c6f5c675696aa4eaedf0a8a264cd1acdbe4d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:53:28 -0700 Subject: [PATCH 19/76] upower: update to 0.99.17 --- srcpkgs/upower/template | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index b87ec0d5f9e0..c3c73de42620 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -1,15 +1,15 @@ # Template file for 'upower' pkgname=upower -version=0.99.13 +version=0.99.17 revision=1 -_distver="${version//./_}" -wrksrc="upower-UPOWER_${_distver}" -build_style=gnu-configure +wrksrc="upower-v${version}" build_helper="gir" -configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)" +build_style=meson +configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no + -Dintrospection=$(vopt_if gir enabled disabled)" conf_files="/etc/UPower/UPower.conf" -hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc - intltool libtool libxslt pkg-config which" +hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection gtk-doc + libtool libxslt pkg-config which" makedepends="libusb-devel libgudev-devel dbus-glib-devel libimobiledevice-devel polkit-devel" checkdepends="python3-dbus python3-packaging" @@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices" maintainer="cinerea0 " license="GPL-2.0-or-later" homepage="https://upower.freedesktop.org" -distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2" -checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d +distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2" +checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d provides="upower0-${version}_${revision}" replaces="upower0>=0" @@ -27,14 +27,6 @@ replaces="upower0>=0" build_options="gir" build_options_default="gir" -post_patch() { - vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/' -} - -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - libupower-glib3_package() { short_desc+=" - runtime library" pkg_install() { From 88abde8fa69f785f9f2fd1b2a4ccf878e8541b57 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:54:34 -0700 Subject: [PATCH 20/76] yelp: update to 42.0 --- srcpkgs/yelp/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index f921e1c76c63..ee51f61289ca 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -1,28 +1,27 @@ # Template file for 'yelp' pkgname=yelp -version=41.2 +version=42.1 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-webkit2gtk-4-0" 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" + libxml2-devel libxslt-devel sqlite-devel webkit2gtk-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 " 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/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b00bf033f02dd79b6d3f255031c71df8d6ed38e552c870b8f391a374724c43c5 +checksum=25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41 yelp-devel_package() { depends="yelp-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/share/gtk-doc vmove "usr/lib/*.so" } } From adf083745da504350262b59140f7a1a709dbb968 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:06:44 -0700 Subject: [PATCH 21/76] gnome-settings-daemon: update to 42.1 --- .../patches/meson-0.61.patch | 38 ------------------- srcpkgs/gnome-settings-daemon/template | 5 ++- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch deleted file mode 100644 index b7c03ca2da63..000000000000 --- a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch +++ /dev/null @@ -1,38 +0,0 @@ -From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt -Date: Wed, 26 Jan 2022 23:08:58 +0100 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. ---- - plugins/power/meson.build | 1 - - plugins/wacom/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f2..014bb6da 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -76,7 +76,6 @@ if host_is_linux - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, -diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build -index d8dd0ec7..c00323d4 100644 ---- a/plugins/wacom/meson.build -+++ b/plugins/wacom/meson.build -@@ -7,7 +7,6 @@ policy_in = configure_file( - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 9f8c9857eec6..0713e47f6383 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=41.0 +version=42.1 revision=1 build_style=meson configure_args="-Dsystemd=false" @@ -18,8 +18,9 @@ short_desc="GNOME settings daemon" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" +changelog="https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884 +checksum=ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb CFLAGS="-UG_DISABLE_ASSERT" if [ "$CROSS_BUILD" ]; then From 06929aa8ff099483cd41965ea729acd2659d19eb Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:07:24 -0700 Subject: [PATCH 22/76] gnome-control-center: update to 42.0 --- srcpkgs/gnome-control-center/template | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index b0811396b6e1..8a21bc8cc8b1 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,10 +1,9 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=41.4 +version=42.0 revision=1 build_style=meson build_helper="gir" -configure_args="-Dcheese=$(vopt_if cheese true false)" hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config polkit python3" makedepends="ModemManager-devel accountsservice-devel alsa-plugins @@ -12,22 +11,19 @@ makedepends="ModemManager-devel accountsservice-devel alsa-plugins gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel - pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel - libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel - clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel - libsoup-devel gcr-devel $(vopt_if cheese cheese-devel)" + pulseaudio-devel samba-devel tzdata upower-devel vala-devel + libxml2-devel libX11-devel libadwaita-devel gtk4-devel cups-devel libgudev-devel + libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel + gsound-devel gcr-devel gnutls-devel" depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop" short_desc="GNOME control center" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" -changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-control-center/-/blob/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d6db0c4cb70857becf48ac5007f12b5f63b9d5d7e80ea7ee57d3be512669f7c9 - -build_options="cheese" -build_options_default="cheese" +checksum=0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda desc_option_cheese="Add support for adding user account images with your webcam" From 041f030cd5dfd6c9583c737c9253dc91cc0f4a07 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:08:25 -0700 Subject: [PATCH 23/76] evolution-data-server: update to 3.44.0 --- srcpkgs/evolution-data-server/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 71db33706047..8cb3253ba9d6 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,13 +1,13 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.42.3 +version=3.44.0 revision=1 build_style=cmake build_helper="gir qemu" configure_args="-DENABLE_UOA=OFF - -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc + -DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DWITH_GWEATHER4=ON $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON')" -hostmakedepends="flex glib-devel gperf intltool pkg-config libglib-devel +hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel $(vopt_if gir vala)" makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel libsecret-devel mit-krb5-devel webkit2gtk-devel libgweather-devel @@ -18,9 +18,9 @@ short_desc="Centralized access to appointments and contacts" maintainer="Enno Boland " license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d +checksum=0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e build_options="gir" build_options_default="gir" From 7c945245a6e84cf56abaab8d7387f293494cc21d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:14:01 -0700 Subject: [PATCH 24/76] gnome-desktop: update to 42.0 --- common/shlibs | 3 + .../patches/00_fix_build_gtk4.patch | 162 ++++++++++++++++++ .../patches/01_optional_introspection.patch | 93 ++++++++++ srcpkgs/gnome-desktop/patches/build.patch | 18 -- .../patches/optionalise-gir.patch | 47 ----- srcpkgs/gnome-desktop/template | 6 +- 6 files changed, 261 insertions(+), 68 deletions(-) create mode 100644 srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch create mode 100644 srcpkgs/gnome-desktop/patches/01_optional_introspection.patch delete mode 100644 srcpkgs/gnome-desktop/patches/build.patch delete mode 100644 srcpkgs/gnome-desktop/patches/optionalise-gir.patch diff --git a/common/shlibs b/common/shlibs index 7714076af15f..b521e457e1d7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1125,6 +1125,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 +libgnome-desktop-4.so.1 gnome-desktop-42.0_1 +libgnome-bg-4.so.1 gnome-desktop-42.0_1 +libgnome-rr-4.so.1 gnome-desktop-42.0_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch new file mode 100644 index 000000000000..7f2176c5a1d7 --- /dev/null +++ b/srcpkgs/gnome-desktop/patches/00_fix_build_gtk4.patch @@ -0,0 +1,162 @@ +From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sun, 20 Mar 2022 18:07:17 -0700 +Subject: [PATCH] meson: Fix build_gtk4 option + +--- + libgnome-desktop/meson.build | 134 +++++++++++++++++------------------ + 1 file changed, 67 insertions(+), 67 deletions(-) + +diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build +index e81530ed..a0fb11f8 100644 +--- a/libgnome-desktop/meson.build ++++ b/libgnome-desktop/meson.build +@@ -86,79 +86,79 @@ libgnome_desktop_base_headers = [ + 'gnome-xkb-info.h', + ] + +-install_headers(libgnome_desktop_base_headers, +- subdir: 'gnome-desktop-4.0/libgnome-desktop' +-) ++if get_option('build_gtk4') ++ install_headers(libgnome_desktop_base_headers, ++ subdir: 'gnome-desktop-4.0/libgnome-desktop' ++ ) + +-base_deps = [ +- gdk_pixbuf_dep, +- glib_dep, +- gio_dep, +- gio_unix_dep, +- libsystemd_dep, +- schemas_dep, +- xkb_config_dep, +- xkbregistry_dep, +- iso_codes_dep, +- udev_dep, +- seccomp_dep, +- m_dep, +- rt_dep, +-] ++ base_deps = [ ++ gdk_pixbuf_dep, ++ glib_dep, ++ gio_dep, ++ gio_unix_dep, ++ libsystemd_dep, ++ schemas_dep, ++ xkb_config_dep, ++ xkbregistry_dep, ++ iso_codes_dep, ++ udev_dep, ++ seccomp_dep, ++ m_dep, ++ rt_dep, ++ ] + +-libgnome_desktop_base = library('gnome-desktop-4', +- sources: [ +- libgnome_desktop_base_sources, +- libgnome_desktop_base_private_sources, +- dbus_idle_built_sources, +- ], +- dependencies: base_deps, +- soversion: soversion, +- version: libversion, +- c_args: libargs, +- link_args: base_ldflags, +- install: true, +- include_directories: [ +- include_directories('.'), +- include_directories('..'), +- ], +-) ++ libgnome_desktop_base = library('gnome-desktop-4', ++ sources: [ ++ libgnome_desktop_base_sources, ++ libgnome_desktop_base_private_sources, ++ dbus_idle_built_sources, ++ ], ++ dependencies: base_deps, ++ soversion: soversion, ++ version: libversion, ++ c_args: libargs, ++ link_args: base_ldflags, ++ install: true, ++ include_directories: [ ++ include_directories('.'), ++ include_directories('..'), ++ ], ++ ) + +-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, +-) ++ 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, ++ ) + +-pkg.generate( +- libgnome_desktop_base, +- requires: ['gsettings-desktop-schemas'], +- version: meson.project_version(), +- name: 'gnome-desktop-4', +- filebase: 'gnome-desktop-4', +- description: 'Utility library for GNOME desktop components', +- subdirs: 'gnome-desktop-4.0', +-) ++ pkg.generate( ++ libgnome_desktop_base, ++ requires: ['gsettings-desktop-schemas'], ++ version: meson.project_version(), ++ name: 'gnome-desktop-4', ++ filebase: 'gnome-desktop-4', ++ description: 'Utility library for GNOME desktop components', ++ subdirs: 'gnome-desktop-4.0', ++ ) + +-libgnome_desktop_base_dep = declare_dependency( +- sources: [ +- libgnome_desktop_base_gir, +- ], +- dependencies: base_deps, +- link_with: libgnome_desktop_base, +- include_directories: [ +- include_directories('.'), +- include_directories('..'), +- ], +-) ++ libgnome_desktop_base_dep = declare_dependency( ++ sources: [ ++ libgnome_desktop_base_gir, ++ ], ++ dependencies: base_deps, ++ link_with: libgnome_desktop_base, ++ include_directories: [ ++ include_directories('.'), ++ include_directories('..'), ++ ], ++ ) + +-if gtk4_dep.found() + subdir('gnome-bg') + subdir('gnome-rr') + endif +-- +GitLab diff --git a/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch new file mode 100644 index 000000000000..b960ef27c588 --- /dev/null +++ b/srcpkgs/gnome-desktop/patches/01_optional_introspection.patch @@ -0,0 +1,93 @@ +From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp +Date: Wed, 18 Sep 2019 22:28:21 +0300 +Subject: [PATCH] meson: Add optionality for introspection + +--- + libgnome-desktop/meson.build | 48 +++++++++++++++++++----------------- + meson_options.txt | 4 +++ + 2 files changed, 30 insertions(+), 22 deletions(-) + +diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build +index a0fb11f8..375cf57c 100644 +--- a/libgnome-desktop/meson.build ++++ b/libgnome-desktop/meson.build +@@ -125,17 +125,19 @@ if get_option('build_gtk4') + ], + ) + +- libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, +- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], +- export_packages: 'gnome-desktop-4', +- namespace: 'GnomeDesktop', +- nsversion: '4.0', +- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], +- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome', +- install: true, +- ) ++ if get_option('introspection') ++ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base, ++ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources], ++ export_packages: 'gnome-desktop-4', ++ namespace: 'GnomeDesktop', ++ nsversion: '4.0', ++ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'], ++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], ++ identifier_prefix: 'Gnome', ++ symbol_prefix: 'gnome', ++ install: true, ++ ) ++ endif + + pkg.generate( + libgnome_desktop_base, +@@ -255,17 +257,19 @@ if get_option('legacy_library') + ], + ) + +- gnome.generate_gir(libgnome_desktop, +- sources: introspection_sources + libgnome_desktop_headers, +- export_packages: 'gnome-desktop-3.0', +- namespace: 'GnomeDesktop', +- nsversion: '3.0', +- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], +- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], +- identifier_prefix: 'Gnome', +- symbol_prefix: 'gnome', +- install: true +- ) ++ if get_option('introspection') ++ gnome.generate_gir(libgnome_desktop, ++ sources: introspection_sources + libgnome_desktop_headers, ++ export_packages: 'gnome-desktop-3.0', ++ namespace: 'GnomeDesktop', ++ nsversion: '3.0', ++ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], ++ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'], ++ identifier_prefix: 'Gnome', ++ symbol_prefix: 'gnome', ++ install: true ++ ) ++ endif + + pkg.generate( + libraries: libgnome_desktop, +diff --git a/meson_options.txt b/meson_options.txt +index e17e7330..c4db6eaf 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -17,6 +17,10 @@ option('debug_tools', + type: 'boolean', value: true, description: 'Build debug tools' + ) + ++option('introspection', ++ type: 'boolean', value: true, description: 'Whether to build introspection files' ++) ++ + option('udev', + type: 'feature', description: 'Udev support' + ) +-- +GitLab diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch deleted file mode 100644 index 1f3acd965fea..000000000000 --- a/srcpkgs/gnome-desktop/patches/build.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 4f55ff078411993b782e74ea18c5c6ab35adf685 -Author: Daniel Kolesa -Date: Wed Aug 12 05:26:00 2020 +0200 - - bla - -diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h -index 111bab3..7698672 100644 ---- a/libgnome-desktop/gnome-rr.h -+++ b/libgnome-desktop/gnome-rr.h -@@ -28,6 +28,7 @@ - #error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h - #endif - -+#include - #include - #include - diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch deleted file mode 100644 index ea4da3efc085..000000000000 --- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build -index c365b44..33af6f4 100644 ---- a/libgnome-desktop/meson.build -+++ b/libgnome-desktop/meson.build -@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency( - link_with: libgnome_desktop - ) - --gnome.generate_gir(libgnome_desktop, -- sources: introspection_sources + libgnome_desktop_headers, -- export_packages: 'gnome-desktop-3.0', -- namespace: 'GnomeDesktop', -- nsversion: '3.0', -- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -- extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API', -- identifier_prefix: 'Gnome', -- symbol_prefix: 'gnome', -- install: true --) -+if get_option('introspection') -+ gnome.generate_gir(libgnome_desktop, -+ sources: introspection_sources + libgnome_desktop_headers, -+ export_packages: 'gnome-desktop-3.0', -+ namespace: 'GnomeDesktop', -+ nsversion: '3.0', -+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'], -+ extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API', -+ identifier_prefix: 'Gnome', -+ symbol_prefix: 'gnome', -+ install: true -+ ) -+endif - - desktop_pc = pkg.generate( - libraries: libgnome_desktop, -diff --git a/meson_options.txt b/meson_options.txt -index e3402a1..1dbaf5d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -28,3 +28,7 @@ option('gtk_doc', - option('installed_tests', - type: 'boolean', value: false, description: 'Enable installed tests' - ) -+ -+option('introspection', -+ type: 'boolean', value: false, description: 'Build GIR data' -+) diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index aa33c182a392..6c90cfd62663 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,13 +1,13 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=41.3 +version=42.0 revision=1 build_style=meson build_helper="gir" configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" -makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel +makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel libxkbfile-devel libXrandr-devel gdk-pixbuf-devel" depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config" @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6 +checksum=f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6 make_check=no # needs X build_options="gir" From 1e8acf62da32949284eba5a494408277a94ee64f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:16:37 -0700 Subject: [PATCH 25/76] gnome-session: update to 42.0 --- srcpkgs/gnome-session/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index ff8dde48c7c0..cce39e931eb8 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,6 +1,6 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=41.3 +version=42.0 revision=1 build_style=meson configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" @@ -14,8 +14,9 @@ short_desc="GNOME session management utilities" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" +changelog="https://gitlab.gnome.org/GNOME/gnome-session/-/blob/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39 +checksum=3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa post_install() { rm -rf ${DESTDIR}/tmp From 178f414d790cfdf87693cd7f7bdf4368062ef0ae Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:25:25 -0700 Subject: [PATCH 26/76] gnome-shell: update to 42.0 --- srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 -------------------- srcpkgs/gnome-shell/template | 6 +- 2 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch deleted file mode 100644 index ad3b7ef3923a..000000000000 --- a/srcpkgs/gnome-shell/patches/meson-0.61.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Unlike other targets that take a name, i18n.merge_file() does not. - -Part-of: ---- - data/meson.build | 2 +- - src/calendar-server/meson.build | 2 +- - subprojects/extensions-app/data/meson.build | 2 +- - subprojects/extensions-app/data/metainfo/meson.build | 2 +- - subprojects/extensions-tool/src/templates/meson.build | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index f924fdf806..76ae45c93a 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') - - foreach desktop_file : desktop_files -- i18n.merge_file('desktop', -+ i18n.merge_file( - input: configure_file( - input: desktop_file + '.in.in', - output: desktop_file + '.in', -diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build -index 7363282a59..8b4ef411c8 100644 ---- a/src/calendar-server/meson.build -+++ b/src/calendar-server/meson.build -@@ -27,7 +27,7 @@ configure_file( - install_dir: servicedir - ) - --i18n.merge_file('evolution-calendar.desktop', -+i18n.merge_file( - input: 'evolution-calendar.desktop.in', - output: 'evolution-calendar.desktop', - po_dir: po_dir, -diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build -index d7e7d4001c..4b601e8bd1 100644 ---- a/subprojects/extensions-app/data/meson.build -+++ b/subprojects/extensions-app/data/meson.build -@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('app_id', app_id) - desktopconf.set('prgname', prgname) - --i18n.merge_file('desktop', -+i18n.merge_file( - input: configure_file( - input: base_id + '.desktop.in.in', - output: desktop_file + '.in', -diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build -index c4962c0576..a19bfa80a4 100644 ---- a/subprojects/extensions-app/data/metainfo/meson.build -+++ b/subprojects/extensions-app/data/metainfo/meson.build -@@ -1,5 +1,5 @@ - metainfo = app_id + '.metainfo.xml' --i18n.merge_file(metainfo, -+i18n.merge_file( - input: base_id + '.metainfo.xml.in', - output: metainfo, - po_dir: po_dir, -diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build -index 670e2bf448..d693bfaddb 100644 ---- a/subprojects/extensions-tool/src/templates/meson.build -+++ b/subprojects/extensions-tool/src/templates/meson.build -@@ -4,7 +4,7 @@ template_metas = [ - ] - template_deps = [] - foreach template : template_metas -- template_deps += i18n.merge_file(template, -+ template_deps += i18n.merge_file( - input: template + '.in', - output: template, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index ff60caafa4ec..bc5399c689c5 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell' pkgname=gnome-shell -version=41.5 +version=42.0 revision=1 build_style=meson build_helper=gir @@ -18,9 +18,9 @@ short_desc="GNOME core user interface" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/main/NEWS" distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz" -checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5 +checksum=33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094 do_check() { mkdir /tmp/gnome-shell-xdg From 0a01f64799fe03b9bac214014f66b07e39598e24 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:19:45 -0700 Subject: [PATCH 27/76] gnome-shell-extensions: update to 42.0 --- srcpkgs/gnome-shell-extensions/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index 3f4be3c068de..56b24962987d 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -1,6 +1,6 @@ # Template file for 'gnome-shell-extensions' pkgname=gnome-shell-extensions -version=41.2 +version=42.0 revision=1 build_style=meson configure_args="-Dextension_set=all" @@ -10,6 +10,6 @@ short_desc="Extensions for GNOME shell, including classic mode" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions" -changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19 +checksum=3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f From 01d408a0362d03ef3f0425e2e56e510b27aa856d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 14:26:25 -0700 Subject: [PATCH 28/76] mutter: update to 42.0 --- common/shlibs | 8 ++++---- srcpkgs/mutter/template | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/shlibs b/common/shlibs index b521e457e1d7..5ede08f75301 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2982,10 +2982,10 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-9.so.0 mutter-41.0_1 -libmutter-clutter-9.so.0 mutter-41.0_1 -libmutter-cogl-9.so.0 mutter-41.0_1 -libmutter-cogl-pango-9.so.0 mutter-41.0_1 +libmutter-10.so.0 mutter-42.0_1 +libmutter-clutter-10.so.0 mutter-42.0_1 +libmutter-cogl-10.so.0 mutter-42.0_1 +libmutter-cogl-pango-10.so.0 mutter-42.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.6 slop-7.6_1 diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index e3f7f7bf1ca8..5982791963c4 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,6 @@ # Template file for 'mutter' pkgname=mutter -version=41.5 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -18,11 +18,11 @@ short_desc="Wayland display server, X11 window manager and compositor library" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" -changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7 -shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so - libmutter-cogl-pango-9.so" +checksum=d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5 +shlib_provides="libmutter-clutter-10.so libmutter-cogl-10.so + libmutter-cogl-pango-10.so" make_check=no # needs a full graphical session # Upstream keeps pulling generated headers even though it can cause race @@ -34,9 +34,9 @@ pre_build() { post_install() { # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are # meant to be called with 'pkg-config --variable' - vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \ - -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-9|g' \ - -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-9.pc + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ + -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc } mutter-devel_package() { @@ -46,7 +46,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-9/*.gir" + vmove "usr/lib/mutter-10/*.gir" vmove "usr/lib/*.so" } } From 835ec84dcd0d807f91eed30270543e34e9fc0c1b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:39:20 -0700 Subject: [PATCH 29/76] gdm: update to 42.0 --- srcpkgs/gdm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index ee14eb631908..d302b7e0f1f5 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,6 @@ # Template file for 'gdm' pkgname=gdm -version=41.3 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ configure_args=" hostmakedepends="dconf gettext itstool pkg-config" makedepends="accountsservice-devel elogind-devel gettext-devel glib-devel iso-codes libSM-devel libcanberra-devel nss-devel pam-devel upower-devel - plymouth-devel" + plymouth-devel libgudev-devel" depends="gnome-settings-daemon gnome-shell gnome-session gnome-themes-extra gsettings-desktop-schemas xorg-server xorg-server-xwayland xrdb" checkdepends="check-devel" @@ -23,7 +23,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4 +checksum=a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855 conf_files=" /etc/gdm/custom.conf From 6ada6cf160f27efdc4534c8ee7f48ec643f552a6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:40:26 -0700 Subject: [PATCH 30/76] libportal: update to 0.6 --- common/shlibs | 4 +- srcpkgs/libportal-gtk3 | 1 + srcpkgs/libportal-gtk3-devel | 1 + srcpkgs/libportal-gtk4 | 1 + srcpkgs/libportal-gtk4-devel | 1 + srcpkgs/libportal/template | 80 +++++++++++++++++++++++++++++------- 6 files changed, 73 insertions(+), 15 deletions(-) create mode 120000 srcpkgs/libportal-gtk3 create mode 120000 srcpkgs/libportal-gtk3-devel create mode 120000 srcpkgs/libportal-gtk4 create mode 120000 srcpkgs/libportal-gtk4-devel diff --git a/common/shlibs b/common/shlibs index 5ede08f75301..3f00506a398c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3932,7 +3932,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1 libhidrd_fmt.so.0 hidrd-0.2.0_1 libjcat.so.1 libjcat-0.1.2_1 libmatio.so.9 matio-1.5.17_2 -libportal.so.0 libportal-0.3_1 +libportal.so.1 libportal-0.6_1 +libportal-gtk3.so.1 libportal-gtk3-0.6_1 +libportal-gtk4.so.1 libportal-gtk4-0.6_1 libvips.so.42 libvips-8.9.2_1 libvips-cpp.so.42 libvips-8.9.2_1 libselinux.so.1 libselinux-3.0_1 diff --git a/srcpkgs/libportal-gtk3 b/srcpkgs/libportal-gtk3 new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk3 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk3-devel b/srcpkgs/libportal-gtk3-devel new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk3-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4 b/srcpkgs/libportal-gtk4 new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk4 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4-devel b/srcpkgs/libportal-gtk4-devel new file mode 120000 index 000000000000..2e15139a5d95 --- /dev/null +++ b/srcpkgs/libportal-gtk4-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index 2e8cd79422b2..bc644374edc4 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -1,33 +1,85 @@ # Template file for 'libportal' pkgname=libportal -version=0.4 +version=0.6 revision=1 build_style=meson -configure_args="$(vopt_bool gtk_doc gtk_doc)" -hostmakedepends="pkg-config gtk-doc glib-devel" -makedepends="glib-devel" +configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi) -Dbackends=gtk3,gtk4" +hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala) + $(vopt_if gtk_doc gi-docgen)" +makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel" short_desc="Flatpak portal library" maintainer="q66 " license="LGPL-2.0-or-later" homepage="https://github.com/flatpak/libportal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28 +checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566 -build_options="gtk_doc" - -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gtk_doc" -fi +build_options="gir gtk_doc" +build_options_default="gir gtk_doc" libportal-devel_package() { depends="libportal>=${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig + vmove usr/include/libportal + vmove "usr/lib/libportal.so" + vmove usr/lib/pkgconfig/libportal.pc if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc + fi + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/Xdp-1.0.gir + vmove "usr/share/vala/vapi/libportal.*" + fi + } +} + +libportal-gtk3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK3" + pkg_install() { + vmove "usr/lib/libportal-gtk3.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk3*" + fi + } +} + +libportal-gtk3-devel_package() { + depends="libportal-gtk3>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk+3-devel" + short_desc+=" - GTK3 - development files" + pkg_install() { + vmove usr/include/libportal-gtk3 + vmove "usr/lib/libportal-gtk3.so" + vmove usr/lib/pkgconfig/libportal-gtk3.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk3* + vmove "usr/share/vala/vapi/libportal-gtk3*" + fi + } +} + +libportal-gtk4_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK4" + pkg_install() { + vmove "usr/lib/libportal-gtk4.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk4*" + fi + } +} + +libportal-gtk4-devel_package() { + depends="libportal-gtk4>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk4-devel" + short_desc+=" - GTK4 - development files" + pkg_install() { + vmove usr/include/libportal-gtk4 + vmove "usr/lib/libportal-gtk4.so" + vmove usr/lib/pkgconfig/libportal-gtk4.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk4* + vmove "usr/share/vala/vapi/libportal-gtk4*" fi } } From e4bb0f645a247ea9fd73e7bfb18a4a8237589a9a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:40:43 -0700 Subject: [PATCH 31/76] gcolor3: rebuild against libportal 0.6 --- srcpkgs/gcolor3/patches/libportal5.patch | 53 ++++++++++++++++++++++++ srcpkgs/gcolor3/template | 4 +- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gcolor3/patches/libportal5.patch diff --git a/srcpkgs/gcolor3/patches/libportal5.patch b/srcpkgs/gcolor3/patches/libportal5.patch new file mode 100644 index 000000000000..7db2bb94ba1b --- /dev/null +++ b/srcpkgs/gcolor3/patches/libportal5.patch @@ -0,0 +1,53 @@ +From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Mon, 27 Dec 2021 13:47:14 +0100 +Subject: [PATCH] Update to libportal 0.5 + +--- + meson.build | 2 ++ + src/gcolor3-color-selection.c | 2 +- + src/meson.build | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6453679..7d6dc50 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true) + dep_libportal = dependency( + 'libportal', + required: true, ++ version: '>= 0.5', + fallback: ['libportal', 'libportal_dep'], + default_options: ['gtk_doc=false'], + ) ++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true) + cc = meson.get_compiler('c') + dep_lm = cc.find_library('m', required: true) + +diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c +index 7413850..5df9d54 100644 +--- a/src/gcolor3-color-selection.c ++++ b/src/gcolor3-color-selection.c +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + + #ifdef ENABLE_NLS + #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String) +diff --git a/src/meson.build b/src/meson.build +index 3998f68..d488e51 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ executable( + dependencies: [ + dep_gtk, + dep_libportal, ++ dep_libportal_gtk3, + dep_lm + ], + install: true, +-- diff --git a/srcpkgs/gcolor3/template b/srcpkgs/gcolor3/template index b07d99472705..fd95c684a674 100644 --- a/srcpkgs/gcolor3/template +++ b/srcpkgs/gcolor3/template @@ -1,11 +1,11 @@ # Template file for 'gcolor3' pkgname=gcolor3 version=2.4.0 -revision=1 +revision=2 wrksrc="gcolor3-v${version}" build_style=meson hostmakedepends="pkg-config gettext glib-devel" -makedepends="gtk+3-devel libportal-devel" +makedepends="gtk+3-devel libportal-gtk3-devel" short_desc="Color selection dialog written in GTK+3" maintainer="Duncaen " license="GPL-2.0-or-later" From 30f4acf2d8bd10f831b896a3995c38f6f16a713d Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:26:08 -0700 Subject: [PATCH 32/76] nautilus: update to 42.0 --- srcpkgs/nautilus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index b2594ca3d8d9..a9b9e2f1817f 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=41.2 +version=42.0 revision=1 build_style=meson build_helper="gir" @@ -9,7 +9,7 @@ hostmakedepends="gettext glib-devel libxslt pkg-config tracker3" makedepends="exempi-devel gnome-autoar-devel gnome-desktop-devel gtk+3-devel libexif-devel libgexiv2-devel libglib-devel libnotify-devel libseccomp-devel libxml2-devel tracker3-devel gst-plugins-base1-devel harfbuzz-devel - libhandy1-devel libportal-devel" + libhandy1-devel libportal-gtk3-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme tracker3-miners tracker3" checkdepends="tracker3 tracker3-miners python3-gobject dbus" @@ -18,7 +18,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b +checksum=3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5 # tests timeout: # 11/11 test-nautilus-search-engine-tracker TIMEOUT 480.00s make_check=extended From b3006775ccbe27afb48d58c47877d450347bc0a5 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:26:44 -0700 Subject: [PATCH 33/76] tracker3: update to 3.3.0 --- srcpkgs/tracker3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template index 3ae12716faa5..d1e383150f6d 100644 --- a/srcpkgs/tracker3/template +++ b/srcpkgs/tracker3/template @@ -1,6 +1,6 @@ # Template file for 'tracker3' pkgname=tracker3 -version=3.2.1 +version=3.3.0 revision=1 wrksrc=tracker-${version} build_style=meson @@ -17,7 +17,7 @@ maintainer="q66 " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://live.gnome.org/Tracker" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" -checksum=1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a +checksum=0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dbus" From cd7a60df7dd04e687877d22e621af9a4a0c77ae3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:27:10 -0700 Subject: [PATCH 34/76] tracker3-miners: update to 3.3.0 --- srcpkgs/tracker3-miners/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template index adc11e7970c1..f0971e73e067 100644 --- a/srcpkgs/tracker3-miners/template +++ b/srcpkgs/tracker3-miners/template @@ -1,6 +1,6 @@ # Template file for 'tracker3-miners' pkgname=tracker3-miners -version=3.2.1 +version=3.3.0 revision=1 wrksrc=tracker-miners-${version} build_style=meson @@ -13,7 +13,7 @@ configure_args="-Dtracker_core=system -Dextract=true -Dminer_rss=false -Dbattery_detection=upower -Dcharset_detection=icu -Dgeneric_media_extractor=gstreamer -Dgstreamer_backend=discoverer -Dsystemd_user_services=false -Dnetwork_manager=enabled" -hostmakedepends="pkg-config glib-devel intltool asciidoc" +hostmakedepends="pkg-config glib-devel gettext asciidoc" makedepends="tracker3-devel ffmpeg-devel dbus-devel exempi-devel libglib-devel libgexiv2-devel gstreamer1-devel icu-devel libcue-devel libexif-devel libgsf-devel libgxps-devel libiptcdata-devel libjpeg-turbo-devel @@ -26,7 +26,7 @@ maintainer="q66 " license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" -checksum=44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47 +checksum=8b387debb774061c06adfb267a0e0e0f3d21799371bf01d056495ab9b8dd9417 # relies on unsupported ops in chroot do_check() { From 08553a1d24ce55413cd48029b2889d0607cb7bbc Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:29:46 -0700 Subject: [PATCH 35/76] epiphany: update to 42.0 --- srcpkgs/epiphany/patches/meson-0.61.patch | 33 ----------------------- srcpkgs/epiphany/template | 8 +++--- 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch deleted file mode 100644 index 1584627ca2d9..000000000000 --- a/srcpkgs/epiphany/patches/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Wed, 24 Nov 2021 04:52:42 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -Part-of: ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 46df3fd80..eac6b8224 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Epiphany.desktop.in.in'), - output: 'org.gnome.Epiphany.desktop.in', -@@ -32,7 +31,6 @@ desktop = i18n.merge_file( - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Epiphany.appdata.xml.in.in'), - output: 'org.gnome.Epiphany.appdata.xml.in', --- -GitLab - diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 37b59d23b90c..19ab22ac8cff 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,6 +1,6 @@ # Template file for 'epiphany' pkgname=epiphany -version=41.3 +version=42.0 revision=1 build_helper="gir" build_style=meson @@ -9,13 +9,13 @@ hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel gnome-desktop-devel json-glib-devel libdazzle-devel libhandy1-devel libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel - nettle-devel nss-devel webkit2gtk-devel libportal-devel libsoup-devel + nettle-devel nss-devel webkit2gtk-devel libportal-gtk3-devel libsoup-devel libarchive-devel" depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk" short_desc="Intuitive GNOME web browser" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" -changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-40/NEWS" +changelog="https://gitlab.gnome.org/GNOME/epiphany/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad +checksum=3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3 From 135631e8d081ec22a70a5270cb5f599d4760ec67 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:30:44 -0700 Subject: [PATCH 36/76] gnome-initial-setup: update to 42.0 --- srcpkgs/gnome-initial-setup/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 6e7931930878..5a69ac088a2a 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -1,6 +1,6 @@ # Template file for 'gnome-initial-setup' pkgname=gnome-initial-setup -version=41.4 +version=42.0.1 revision=1 build_style=meson configure_args="-Dparental_controls=disabled -Dsystemd=false" @@ -10,12 +10,12 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel gnome-online-accounts-devel gdm-devel libpwquality-devel mit-krb5-devel vala-devel libnma-devel polkit-devel rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel - pango-devel" + pango-devel libhandy1-devel" depends="iso-codes" short_desc="GNOME initial setup" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/OS/InitialSetup" -changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/gnome-41/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=96ecd2db6e76c513b18c606dc262bb523228c4aaedbed6a07811e568fd5db642 +changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=fcf43f2fbe4dc04c3ac2ae505633feb1ef30da70ca95eabc61e2006b192e5e55 From 21c0ebf3cd7fba8fbd9ff7289c440ba2c9619f86 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:31:30 -0700 Subject: [PATCH 37/76] gnome-clocks: update to 42.0 --- srcpkgs/gnome-clocks/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index e511f2f27e49..2afb26fe0735 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,18 +1,18 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson hostmakedepends="pkg-config intltool itstool glib-devel vala" makedepends="glib-devel vala-devel gnome-desktop-devel - libgweather-devel libhandy1-devel libnotify-devel gsound-devel - geocode-glib-devel desktop-file-utils hicolor-icon-theme - geoclue2-devel" + gtk4-devel libadwaita-devel libnotify-devel gsound-devel + libgweather-devel geocode-glib-devel geoclue2-devel + desktop-file-utils hicolor-icon-theme" depends="desktop-file-utils hicolor-icon-theme" short_desc="Clock application for the GNOME Desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Clocks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=df8c8b04ab92fa618f5dee5118571ef9fc9e8a5b795ea00a35c6dc677cb02dac +checksum=0e7118db4a032e3cea3212d98cbb828d6b7cf22fe05e0c5fc8b391c6a3dd6fe0 From 1cceed6ad8138479c51cb0c274da95508dd1654c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:32:04 -0700 Subject: [PATCH 38/76] gnome-calendar: update to 42.0 --- srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ---------- srcpkgs/gnome-calendar/template | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch deleted file mode 100644 index e2df31e0760e..000000000000 --- a/srcpkgs/gnome-calendar/patches/meson-0.61.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Calendar.appdata.xml.in.in'), - output: 'org.gnome.Calendar.appdata.xml.in', diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template index ab83007ec7c5..15d466f885a6 100644 --- a/srcpkgs/gnome-calendar/template +++ b/srcpkgs/gnome-calendar/template @@ -1,19 +1,19 @@ # Template file for 'gnome-calendar' pkgname=gnome-calendar -version=41.2 +version=42.0 revision=1 build_style=meson hostmakedepends="gettext glib-devel pkg-config $(vopt_if gir 'gobject-introspection')" makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel - gsettings-desktop-schemas-devel gtk+3-devel libdazzle-devel libhandy1-devel - libgweather-devel libical-devel libpeas-devel libsoup-devel" + gsettings-desktop-schemas-devel gtk+3-devel gtk4-devel libadwaita-devel + libdazzle-devel libgweather-devel libical-devel libpeas-devel libsoup-devel" short_desc="Calendar application designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calendar" changelog="https://gitlab.gnome.org/GNOME/gnome-calendar/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a +checksum=b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa build_options="gir" build_options_default="gir" From 21f6ed568787b1ad7e2f62e7ec6e344ab8ae3fd2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:32:58 -0700 Subject: [PATCH 39/76] gnome-builder: update to 42.0 --- srcpkgs/gnome-builder/patches/format-bug.diff | 11 ----------- srcpkgs/gnome-builder/template | 10 +++++----- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/gnome-builder/patches/format-bug.diff diff --git a/srcpkgs/gnome-builder/patches/format-bug.diff b/srcpkgs/gnome-builder/patches/format-bug.diff deleted file mode 100644 index cc86932a9155..000000000000 --- a/srcpkgs/gnome-builder/patches/format-bug.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c.orig 2022-01-21 08:41:29.263933575 +0100 -+++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c 2022-01-21 08:42:52.177180207 +0100 -@@ -597,7 +597,7 @@ is_known_worker (GTask *task, - } - - finish: -- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size); -+ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size); - ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task), - g_steal_pointer (&state->invocation), - found, diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 93559b21774f..d84f16b1ddb8 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,6 +1,6 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=41.3 +version=42.0 revision=1 build_style=meson build_helper=qemu @@ -10,17 +10,17 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro 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 - python3-gobject-devel sysprof-devel glade3-devel libportal-devel cmark-devel" + libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel libhandy1-devel + python3-gobject-devel sysprof-devel glade3-devel libportal-gtk3-devel cmark-devel" depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject" checkdepends="xvfb-run" 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-3-40/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/${version}/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e2250fc8e9e9f2002c452e5950d82685734d3c4480b35167ab508ac8702509e1 +checksum=52efd296d68b2ff182341c0481dcfd70654c408bdb679fceb76db9703c22428f case "$XBPS_TARGET_MACHINE" in *-musl) From 18789b5a7590fc85d40daf09c4f582e5ba9902fc Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:42:41 -0700 Subject: [PATCH 40/76] gnome-todo: rebuild against libportal 0.6 --- srcpkgs/gnome-todo/patches/libportal5.patch | 54 +++++++++++++++++++++ srcpkgs/gnome-todo/template | 4 +- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch new file mode 100644 index 000000000000..380c6285922e --- /dev/null +++ b/srcpkgs/gnome-todo/patches/libportal5.patch @@ -0,0 +1,54 @@ +From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001 +From: Georges Basile Stavracas Neto +Date: Thu, 18 Nov 2021 19:46:13 -0300 +Subject: [PATCH] flatpak: Adjust to libportal changes + +--- + build-aux/flatpak/org.gnome.Todo.json | 3 +++ + src/plugins/background/gtd-plugin-background.c | 2 +- + src/plugins/background/meson.build | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json +index 034e200c..44b83d66 100644 +--- a/build-aux/flatpak/org.gnome.Todo.json ++++ b/build-aux/flatpak/org.gnome.Todo.json +@@ -143,6 +143,9 @@ + { + "name" : "libportal", + "buildsystem" : "meson", ++ "config-opts" : [ ++ "-Dbackends=gtk4" ++ ], + "sources" : [ + { + "type" : "git", +diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c +index cf48786c..f64d07aa 100644 +--- a/src/plugins/background/gtd-plugin-background.c ++++ b/src/plugins/background/gtd-plugin-background.c +@@ -28,7 +28,7 @@ + #include + + #include +-#include ++#include + + #define AUTOSTART_NOTIFICATION_ID "Gtd::BackgroundPlugin::autostart_notification" + #define AUTOSTART_NOTIFICATION_TIMEOUT 3 /* seconds */ +diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build +index a671a4f3..59d3635f 100644 +--- a/src/plugins/background/meson.build ++++ b/src/plugins/background/meson.build +@@ -1,7 +1,7 @@ + plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types'] + + plugins_deps += [ +- dependency('libportal'), ++ dependency('libportal-gtk4'), + ] + + plugins_sources += files( +-- +GitLab + diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/gnome-todo/template index fe2e78bab912..dc3031156c79 100644 --- a/srcpkgs/gnome-todo/template +++ b/srcpkgs/gnome-todo/template @@ -1,14 +1,14 @@ # Template file for 'gnome-todo' pkgname=gnome-todo version=41.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config glib-devel gettext itstool $(vopt_if gir 'gobject-introspection')" makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel - libpeas-devel libportal-devel evolution-data-server-devel" + libpeas-devel libportal-gtk4-devel evolution-data-server-devel" short_desc="Task manager designed to perfectly fit the GNOME desktop" maintainer="Enno Boland " license="GPL-2.0-or-later" From 91e8d3fa7b5191660ad05162e34b5c701a765f99 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:34:06 -0700 Subject: [PATCH 41/76] gnome-weather: update to 42.0 --- srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ---------- srcpkgs/gnome-weather/template | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch deleted file mode 100644 index a305b8c54dc4..000000000000 --- a/srcpkgs/gnome-weather/patches/meson-0.61.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -59,7 +59,6 @@ endif - appdata_conf = configuration_data() - appdata_conf.set('app_id', weather_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: '@0@.appdata.xml.in.in'.format(default_id), - output: '@0@.appdata.xml.in'.format(default_id), diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index 052cae430e6d..568f10e39391 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -1,16 +1,16 @@ # Template file for 'gnome-weather' pkgname=gnome-weather -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext pkg-config itstool glib-devel gjs" -makedepends="gtk+3-devel gjs-devel libgweather-devel geoclue2-devel libhandy1-devel" -depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop libhandy1" +makedepends="gtk4-devel libadwaita-devel gjs-devel libgweather-devel geoclue2-devel" +depends="desktop-file-utils gjs geoclue2 libgweather gnome-desktop" short_desc="Access current weather conditions and forecasts for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Weather" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e5614eb74297e072960d6447557fa9fbfccf24bfcb314944b6d976640ee62dee +checksum=579ee691d853e5bb3ff50e8c7b43f85ae9dd7e5b3a649e02c254a2d9b807b465 lib32disabled=yes From 1d86426fff8f548f9a6e2ec54fbac3d937164635 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:40:21 -0700 Subject: [PATCH 42/76] gnome-user-docs: update to 42.0 --- srcpkgs/gnome-user-docs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 579bb4f407f0..773c9913d74f 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=41.2 +version=42.0 revision=1 build_style=gnu-configure hostmakedepends="gettext pkg-config itstool" @@ -12,4 +12,4 @@ license="CC-BY-3.0" homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs" changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d3170895dd3a8bb117c9f148a0bb3fb490d1af7131c4416877b1bbfec591395a +checksum=b2b27da04100bbdd2f4f0e5bc38f2d056d95fa3656720163f6436a3167d5e905 From 321ee92bcf7fde7f1a429ed6efd475e14aa0b2aa Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:41:54 -0700 Subject: [PATCH 43/76] gnome-core: update to 42.0 --- srcpkgs/gnome-core/template | 52 +++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template index bdd854c47ac9..2db1b93608fe 100644 --- a/srcpkgs/gnome-core/template +++ b/srcpkgs/gnome-core/template @@ -1,6 +1,6 @@ # Template file for 'gnome-core' pkgname=gnome-core -version=41.0 +version=42.0 revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux - core components" @@ -9,44 +9,46 @@ license="GPL-2.0-only, LGPL-2.0-only" homepage="https://www.gnome.org" depends=" - adwaita-icon-theme>=41.0 - at-spi2-core>=2.42.0 + adwaita-icon-theme>=${version} + at-spi2-core>=2.44.0 at-spi2-atk>=2.38.0 cantarell-fonts>=0.301 dconf>=0.40.0 evolution-data-server>=3.42.0 - folks>=0.14.0 + folks>=0.15.4 font-adobe-source-code-pro>=2.030R - gcr>=3.40.0 - gdm>=41.0 + gcr>=3.41.0 + gdm>=${version} geocode-glib>=3.26.2 gfbgraph>=0.2.4 - gjs>=1.70.0 - glib>=2.70.0 - glib-networking>=2.70.0 + gjs>=1.72.0 + glib>=2.72.0 + glib-networking>=2.72.0 gmime3>=3.2.7 - gnome-backgrounds>=41.0 - gnome-bluetooth>=3.34.5 + gnome-backgrounds>=${version} + gnome-bluetooth>=${version} gnome-color-manager>=3.36.0 - gnome-control-center>=41.0 - gnome-desktop>=41.0 - gnome-initial-setup>=41.0 + gnome-control-center>=${version} + gnome-console>=42.beta + gnome-desktop>=${version} + gnome-initial-setup>=${version} gnome-keyring>=40.0 gnome-online-accounts>=3.40.0 gnome-online-miners>=3.34.0 - gnome-session>=40.1.1 - gnome-settings-daemon>=41.0 - gnome-shell>=41.0 - gnome-shell-extensions>=41.0 + gnome-session>=${version} + gnome-settings-daemon>=${version} + gnome-shell>=${version} + gnome-shell-extensions>=${version} gnome-themes-standard>=3.28 - gnome-user-docs>=41.0 + gnome-user-docs>=${version} gnome-video-effects>=0.5.0 - gsettings-desktop-schemas>=41.0 + gsettings-desktop-schemas>=${version} gvfs>=1.48.1 - mutter>=41.0 - nautilus>=41.0 + mutter>=${version} + nautilus>=${version} sushi>=41.0 - tracker3>=3.2.1 - yelp>=41.1 - xdg-desktop-portal-gtk>=1.8.0 + tracker3>=3.3.0 + yelp>=${version} + xdg-desktop-portal-gtk>=1.14.0 + xdg-desktop-portal-gnome>=${version} zenity>=3.41.0" From 512b49b269138bf1a8965a168616e87fd7cfb7d3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:18:01 -0700 Subject: [PATCH 44/76] gnome-terminal: update to 3.44.0 --- .../gnome-terminal/patches/meson-0.61.patch | 47 ------------------- srcpkgs/gnome-terminal/template | 4 +- 2 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch deleted file mode 100644 index 8b6edbb923a2..000000000000 --- a/srcpkgs/gnome-terminal/patches/meson-0.61.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Fri, 14 Jan 2022 11:33:32 +0100 -Subject: [PATCH] build: Fix for newer meson - ---- - data/meson.build | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 79d97e5b..e0bcbb91 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -18,7 +18,6 @@ - metainfodir = gt_datadir / 'metainfo' - - i18n.merge_file( -- gt_dns_name + '.metainfo.xml', - input: gt_dns_name + '.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -27,7 +26,6 @@ i18n.merge_file( - ) - - i18n.merge_file( -- gt_dns_name + '.Nautilus.metainfo.xml', - input: gt_dns_name + '.Nautilus.metainfo.xml.in', - output: '@BASENAME@', - po_dir: po_dir, -@@ -40,7 +38,6 @@ i18n.merge_file( - desktopdatadir = gt_datadir / 'applications' - - i18n.merge_file( -- gt_dns_name + '.desktop', - input: gt_dns_name + '.desktop.in', - output: '@BASENAME@', - type: 'desktop', -@@ -57,4 +54,4 @@ meson.add_install_script( - - # Subdirs - --subdir('icons') -\ No newline at end of file -+subdir('icons') --- -GitLab - diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 4853fb46511a..a7d700701774 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.42.2 +version=3.44.0 revision=1 build_style=meson configure_args="-Dnautilus_extension=true -Db_ndebug=false" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.3-only" homepage="https://wiki.gnome.org/Apps/Terminal" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0 +checksum=aa967189eeb609459e6c0a468a01ea70cb8c4530da1d500b2d3f4fc438b8fe2a lib32disabled=yes if [ "$CROSS_BUILD" ]; then From a0a180fa34c15ecd36c39378c002d296cac2c087 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:29:34 -0700 Subject: [PATCH 45/76] yelp-xsl: update to 42.0 --- srcpkgs/yelp-xsl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template index 1858aeba250c..8a44b352bfe1 100644 --- a/srcpkgs/yelp-xsl/template +++ b/srcpkgs/yelp-xsl/template @@ -1,10 +1,10 @@ # Template file for 'yelp-xsl' # keep up to date with yelp pkgname=yelp-xsl -version=41.1 +version=42.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool itstool libxslt" +hostmakedepends="pkg-config gettext itstool libxslt" makedepends="libxslt-devel" short_desc="Help browser for GNOME desktop - XSL and misc files" maintainer="Érico Nogueira " @@ -12,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Yelp/Xsl" changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-41/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0d6db37ac2ef812483e0104703f1fa9cf032e9e0956a5f1c3afbcc23791f8a54 +checksum=29b273cc0bd16efb6e983443803f1e9fdc03511e5c4ff6348fd30a604d4dc846 From d1594b478a2b67ce2d33051c8bbf0635b6f85baa Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:29:52 -0700 Subject: [PATCH 46/76] yelp-tools: update to 42.0 --- srcpkgs/yelp-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template index ac7dd742357f..8ce722e9b5f2 100644 --- a/srcpkgs/yelp-tools/template +++ b/srcpkgs/yelp-tools/template @@ -1,6 +1,6 @@ # Template file for 'yelp-tools' pkgname=yelp-tools -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="pkg-config itstool libxslt python3-lxml" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=37f1acc02bcbe68a31b86e07c129a839bd3276e656dc89eb7fc0a92746eff272 +checksum=2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4 From f98e3c34b6c46a165710e7d50b5ef52523cf25b2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:37:11 -0700 Subject: [PATCH 47/76] libdazzle: update to 3.44.0 --- srcpkgs/libdazzle/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template index 2abd4da3cfbd..80f398610ecb 100644 --- a/srcpkgs/libdazzle/template +++ b/srcpkgs/libdazzle/template @@ -1,6 +1,6 @@ # Template file for 'libdazzle' pkgname=libdazzle -version=3.42.0 +version=3.44.0 revision=1 build_style=meson build_helper="gir" @@ -16,7 +16,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libdazzle" changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS" distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz" -checksum=eae67a3b3d9cce408ee9ec0ab6adecb83e52eb53f9bc93713f4df1e84da16925 +checksum=3cd3e45eb6e2680cb05d52e1e80dd8f9d59d4765212f0e28f78e6c1783d18eae do_check() { xvfb-run ninja -C build test From b84c447b5b78e8d0016121d1a03ceeedac85f5da Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:47:38 -0700 Subject: [PATCH 48/76] evolution: update to 3.44.0 --- srcpkgs/evolution/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 226c884f3c53..6d3b351c2e5b 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,25 +1,26 @@ # Template file for 'evolution' pkgname=evolution -version=3.42.3 +version=3.44.0 revision=1 build_style=cmake build_helper="qemu" configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF - -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON" + -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF + -DENABLE_WEATHER=ON -DWITH_GWEATHER4=ON -DWITH_ENCHANT_VERSION=2" hostmakedepends="intltool itstool pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel evolution-data-server-devel gspell-devel libcanberra-devel libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel - gnome-desktop-devel libsoup-devel" + gnome-desktop-devel libsoup-devel cmark-devel" depends="gnome-keyring" short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=44629e6a02288ec100a66fd59413a068b6b9cd624bed3255aa29a166ea26d0b6 +checksum=df21d3df5224dfa842ea290effcd902afd4b1418608a4dfb6907a3b7d4d994f9 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so" From 1c3f9fa914926ebe9581b07a17cddbb4f37532bd Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:52:15 -0700 Subject: [PATCH 49/76] evolution-ews: update to 3.44.0 --- srcpkgs/evolution-ews/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 01b358864598..3983a147a8e9 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.42.1 +version=3.44.0 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -11,6 +11,6 @@ short_desc="MS Exchange integration through Exchange Web Services" maintainer="Peter Kuchar " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" -changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9c2bc63127c34b419441f17cce8995abe80a7fd1fbd97f3deb3a6d472f7f5f2d +checksum=ab80a0e9e2ce767fb9e84aee065d0eb5ef502cd79b2e2ca451eca84292297a80 From 74396d7e4cc5e9c39e461d8dda341f236c5a02f5 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:05:14 -0700 Subject: [PATCH 50/76] gnome-calculator: update to 42.0 --- srcpkgs/gnome-calculator/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index b496cf715cc4..31eaacc42b64 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -1,17 +1,17 @@ # Template file for 'gnome-calculator' pkgname=gnome-calculator -version=41.1 +version=42.0 revision=1 build_style=meson build_helper="gir" hostmakedepends="cmake gettext glib-devel itstool pkg-config vala" -makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel - libmpc-devel libsoup-devel libhandy1-devel" +makedepends="gsettings-desktop-schemas-devel gtksourceview5-devel libgee08-devel + libmpc-devel libsoup-devel gtk4-devel libadwaita-devel" depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme" short_desc="GNOME calculator" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Calculator" -changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-calculator/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0267614afdb25d38b78411b42ebab7bc50c1b6340cc49bb68c0e432d7ddf8a34 +checksum=a535a14ebea58e691a4b5a085256aed060a2c3f07384ac3a3d01832332a27e4a From fc89fb184e51a5254711a8af51d44879c942e82a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:16:40 -0700 Subject: [PATCH 51/76] gnome-boxes: update to 42.0.1 --- srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 -------------------- srcpkgs/gnome-boxes/template | 10 +++--- 2 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch deleted file mode 100644 index 3d9c56f5841c..000000000000 --- a/srcpkgs/gnome-boxes/patches/meson-0.61.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001 -From: Michal Vasilek -Date: Sat, 15 Jan 2022 00:07:31 +0100 -Subject: [PATCH] build: remove positional i18n.merge_file arguments - -otherwise building with meson 0.61+ fails: - - ERROR: Function does not take positional arguments. ---- - data/meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index d32638a8..2dc1798b 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes', - desktop_conf = configuration_data () - desktop_conf.set ('icon', application_id) - desktop = i18n.merge_file ( -- 'desktop', - input: configure_file ( - input: files ('org.gnome.Boxes.desktop.in'), - output: 'org.gnome.Boxes.desktop.in', -@@ -65,7 +64,7 @@ configure_file ( - - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) --appdata_file = i18n.merge_file ('appdata-file', -+appdata_file = i18n.merge_file ( - input: configure_file ( - input: files ('org.gnome.Boxes.appdata.xml.in'), - output: 'org.gnome.Boxes.appdata.xml.in', --- -2.34.1 - diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index ca7bd0ca61a2..16cf7756e3eb 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=41.3 +version=42.0.1 revision=1 build_helper="gir" build_style=meson @@ -11,10 +11,10 @@ makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel tracker3-devel libgcrypt-devel" depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker3" -short_desc="GNOME 3 application to access remote or virtual systems" +short_desc="GNOME application to access remote or virtual systems" maintainer="Enno Boland " license="LGPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Boxes" -changelog="https://raw.githubusercontent.com/GNOME/gnome-boxes/gnome-3-36/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9b840680d1e7386fddfd6a15ad4dd0f2cda58efe818cf547837b46ae8bf0e189 +changelog="https://gitlab.gnome.org/GNOME/gnome-boxes/-/raw/gnome-42/NEWS" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" +checksum=1ae212ff899915542ec53b54d95b68cdf271d958cf512cdc3fedc7822c6ee123 From ee1573a77f8c5ba2fc35f479b411bef521079c37 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:42:50 -0700 Subject: [PATCH 52/76] New package: libgweather3-40.0 --- common/shlibs | 1 + srcpkgs/libgweather3-devel | 1 + srcpkgs/libgweather3/template | 40 +++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 120000 srcpkgs/libgweather3-devel create mode 100644 srcpkgs/libgweather3/template diff --git a/common/shlibs b/common/shlibs index 3f00506a398c..0fc3e1e1297d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1129,6 +1129,7 @@ libgnome-desktop-4.so.1 gnome-desktop-42.0_1 libgnome-bg-4.so.1 gnome-desktop-42.0_1 libgnome-rr-4.so.1 gnome-desktop-42.0_1 libsecret-1.so.0 libsecret-0.10_1 +libgweather-3.so.16 libgweather3-40.0_1 libgweather-4.so.0 libgweather-4.0.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 libgnomekbdui.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/libgweather3-devel b/srcpkgs/libgweather3-devel new file mode 120000 index 000000000000..836e9de2a60d --- /dev/null +++ b/srcpkgs/libgweather3-devel @@ -0,0 +1 @@ +libgweather3 \ No newline at end of file diff --git a/srcpkgs/libgweather3/template b/srcpkgs/libgweather3/template new file mode 100644 index 000000000000..5782f00c89e8 --- /dev/null +++ b/srcpkgs/libgweather3/template @@ -0,0 +1,40 @@ +# Template file for 'libgweather3' +pkgname=libgweather3 +version=40.0 +revision=1 +wrksrc="libgweather-${version}" +build_style=meson +build_helper="gir" +configure_args="$(vopt_bool gir enable_vala) -Dzoneinfo_dir=/usr/share/zoneinfo" +hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)" +makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel" +depends="tzdata" +short_desc="GNOME Weather information access library" +maintainer="Enno Boland " +license="LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/LibGWeather" +distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz" +checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6 + +build_options="gir" +build_options_default="gir" + +post_patch() { + # This test requires LC_IDENTIFICATION, which is a GLIBC's extension + # And looks like we didn't ship it. + vsed -i -e '/setlocale.*fr_FR/i return;' libgweather/test_libgweather.c +} + +libgweather3-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision} gtk+3-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + vmove usr/share/vala + fi + } +} From b3931ee9987be2ddd73469140fcb2fecec315b39 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:43:16 -0700 Subject: [PATCH 53/76] gnome-maps: update to 42.0 --- srcpkgs/gnome-maps/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 414735d1ed3f..eb92c585741b 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,17 +1,17 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=41.4 +version=42.0 revision=1 build_style=meson build_helper="gir" hostmakedepends="glib-devel gettext pkg-config AppStream gjs" makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel" -depends="geoclue2 gfbgraph gjs libhandy1" +depends="geoclue2 gfbgraph gjs libhandy1 libgweather3" short_desc="GNOME maps application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" -changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e340b13f46fe0b7d5b0f8f01413291ddcd870c74a5c38fa24cac1f585e70393e +checksum=054486d3774073706a76a981417978d151be3b7224d723775bbe316efa2479df From cc58f702afae302ee4268534ac19e1e9f7fcd959 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:47:06 -0700 Subject: [PATCH 54/76] gnome-disk-utility: update to 42.0 --- .../patches/meson-0.61.patch | 34 ------------------- srcpkgs/gnome-disk-utility/template | 4 +-- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch deleted file mode 100644 index 09e0c33d0798..000000000000 --- a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Fri, 17 Dec 2021 12:29:30 +0000 -Subject: [PATCH] build: fix arguments of i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index e38a1d8e..38fb5207 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -11,7 +11,6 @@ desktops = [ - - foreach desktop: desktops - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, -@@ -38,7 +37,6 @@ install_data( - info = 'org.gnome.DiskUtility.appdata.xml' - - i18n.merge_file( -- info, - input: info + '.in', - output: info, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 6b3d1aa4aba7..6164ffb20058 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,6 +1,6 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=41.0 +version=42.0 revision=1 build_style=meson configure_args="-Dlogind=none" @@ -14,5 +14,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Disks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df +checksum=1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b lib32disabled=yes From 587e9c4e499d20fae62b19df77b332e5808583cd Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:52:06 -0700 Subject: [PATCH 55/76] gnome-system-monitor: update to 42.0 --- srcpkgs/gnome-system-monitor/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index 85e4c9b5e66e..fb0cabd00668 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -1,14 +1,15 @@ # Template file for 'gnome-system-monitor' pkgname=gnome-system-monitor -version=41.0 +version=42.0 revision=1 build_style=meson configure_args="-Dsystemd=false" -hostmakedepends="pkg-config intltool itstool glib-devel polkit" +hostmakedepends="pkg-config gettext itstool glib-devel polkit" makedepends="gtkmm-devel librsvg-devel libgtop-devel libhandy1-devel" short_desc="Process viewer and system resource monitor for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/SystemMonitor" +changelog="https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f +checksum=13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc From dd38d1aecb7f4830588fe8aa1fe3a5611fb4777f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 19:54:55 -0700 Subject: [PATCH 56/76] gnome-text-editor: update to 42.0 --- srcpkgs/gnome-text-editor/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template index f1e474fca5ff..d89b80e33819 100644 --- a/srcpkgs/gnome-text-editor/template +++ b/srcpkgs/gnome-text-editor/template @@ -1,16 +1,16 @@ # Template file for 'gnome-text-editor' pkgname=gnome-text-editor -version=41.1 +version=42.0 revision=1 build_style=meson -hostmakedepends="pkg-config gettext itstool glib-devel" +hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils" makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel icu-devel libadwaita-devel pcre2-devel" short_desc="Simple text editor" maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor" -changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-42/NEWS" distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz" -checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861 +checksum=0e32140ee1c13428563bcd5f784e61ee22ffd1ad27d8c02283b4358a81dfab50 make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting. From 5969a496f1ee999de2066afc4a40f29e99b78ef7 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:00:31 -0700 Subject: [PATCH 57/76] gnome-music: update to 42.0 --- srcpkgs/gnome-music/patches/meson-0.61.patch | 30 -------------------- srcpkgs/gnome-music/template | 8 +++--- 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch deleted file mode 100644 index aca43b5608a2..000000000000 --- a/srcpkgs/gnome-music/patches/meson-0.61.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001 -From: Jean Felder -Date: Thu, 18 Nov 2021 12:09:26 +0100 -Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 -where it returns a deprecation message: -"DEPRECATION: i18n.merge_file does not take any positional -arguments. This will become a hard error in the next Meson release." - -See: https://github.com/mesonbuild/meson/issues/9441 ---- - data/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 25ff1e102..145ee5221 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID) - appdata_conf.set('package_url', PACKAGE_URL) - appdata_conf.set('package_url_bug', PACKAGE_URL_BUG) - i18n.merge_file( -- 'appdata', - input: configure_file( - output: PROJECT_RDNN_NAME + '.appdata.xml.in', - input: PROJECT_RDNN_NAME + '.appdata.xml.in.in', --- -GitLab - diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index fa38578939d3..7c65af712e1f 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,20 +1,20 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=41.0 +version=42.0 revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="gnome-desktop-devel grilo-devel libmediaart-devel python3-gobject-devel python3-dbus tracker3-devel gnome-online-accounts-devel - libdazzle-devel grilo-plugins python3-cairo-devel libhandy1-devel" + libdazzle-devel grilo-plugins python3-cairo-devel gtk4-devel libadwaita-devel" depends="desktop-file-utils python3-dbus python3-gobject python3-requests tracker3 tracker3-miners gst-plugins-good1 grilo-plugins libdazzle - libmediaart" + libmediaart libadwaita" short_desc="GNOME music playing application" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Music" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=69b13567a87dc77dcf0c926d71d0fa2ebfa5a97f37817828df71d8a1b0129fd2 +checksum=9d68198f9852bde0f834584b96a812897d310cb71728b6a4f098bcb29b19c5d0 lib32disabled=yes From a492fdcd20e49438d27ce722b719476611a73207 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:04:46 -0700 Subject: [PATCH 58/76] gnome-font-viewer: update to 42.0 --- .../patches/meson-0.61.patch | 40 ------------------- srcpkgs/gnome-font-viewer/template | 8 ++-- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch deleted file mode 100644 index 072ce27fd0d2..000000000000 --- a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Thu, 30 Dec 2021 17:14:47 +0800 -Subject: [PATCH] Fix meson build with meson 0.60.0+ - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 ---- - data/meson.build | 2 +- - src/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bfc9caa..8e42134 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,6 +1,6 @@ - appdatadir = join_paths(datadir, 'metainfo') - appdata_file = 'org.gnome.font-viewer.appdata.xml' --merged_appdata = i18n.merge_file(appdata_file, -+merged_appdata = i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -diff --git a/src/meson.build b/src/meson.build -index f863d45..826c59b 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' - desktop_conf = configuration_data() - desktop_conf.set('VERSION', meson.project_version()) - desktop_conf.set('APPLICATION_ID', application_id) --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: configure_file(input: desktop_file + '.in.in', - output: desktop_file + '.in', - configuration: desktop_conf), --- -GitLab - diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index f4d7f69436ee..bdc99f9a8d8c 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,15 +1,15 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="pkg-config glib-devel gettext" -makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel - gnome-desktop-devel harfbuzz-devel libhandy1-devel" +makedepends="fontconfig-devel freetype-devel glib-devel gtk4-devel + gnome-desktop-devel harfbuzz-devel libadwaita-devel" depends="desktop-file-utils" short_desc="Font viewer for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-font-viewer" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876 +checksum=cfa2b8dfff21a105a1a021dadfa213f13627e6a179a77c7b59fdcedaca848dcc From 6bb5466a8c4020c2f5f4927f0619a0fd2d2c25a9 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:08:28 -0700 Subject: [PATCH 59/76] gnome-characters: update to 42.0 --- .../gnome-characters/patches/meson-0.61.patch | 18 ------------------ srcpkgs/gnome-characters/template | 8 ++++---- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch deleted file mode 100644 index 248f8d5dced7..000000000000 --- a/srcpkgs/gnome-characters/patches/meson-0.61.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id) - desktop_conf.set('bindir', characters_bindir) - - i18n.merge_file( -- 'desktop-file', - type: 'desktop', - input: configure_file ( - input: characters_name + '.desktop.in', -@@ -61,7 +60,6 @@ i18n.merge_file( - ) - - appdata_file = i18n.merge_file( -- 'appdata-file', - input: characters_name + '.appdata.xml.in', - output: characters_application_id + '.appdata.xml', - po_dir: po_dir, diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template index 24607f718b15..3814889e1d76 100644 --- a/srcpkgs/gnome-characters/template +++ b/srcpkgs/gnome-characters/template @@ -1,16 +1,16 @@ # Template file for 'gnome-characters' pkgname=gnome-characters -version=41.0 +version=42.0 revision=1 build_style=meson build_helper="gir" hostmakedepends="gettext gjs glib-devel itstool pkg-config" -makedepends="gjs-devel libglib-devel gtk+3-devel libunistring-devel libhandy1-devel" -depends="gnome-desktop gjs libhandy1" +makedepends="gjs-devel libglib-devel gtk4-devel libadwaita-devel libunistring-devel" +depends="gnome-desktop gjs" short_desc="Utility to find and insert unusual characters for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Design/Apps/CharacterMap" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e129eca93d0099490bc2bfe6437e685fd9855e264b32fb918c0e58ee6aac867b +checksum=5da0ffb816f8a6b44f303744ca827a34080118c1c938d8d79af17b7fe67980f8 lib32disabled=yes From 2b1fd878545bc50b0eae79facf03fa00e4bb8246 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:24:55 -0700 Subject: [PATCH 60/76] gnome-contacts: update to 42.0 --- srcpkgs/gnome-contacts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 7805fa837c78..ac49f9c98db4 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,15 +1,15 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=41.0 +version=42.0 revision=1 build_style=meson hostmakedepends="docbook-xsl folks-devel gettext glib-devel libxslt pkg-config vala" makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel - libchamplain-devel libnotify-devel vala-devel libhandy1-devel" + libchamplain-devel libnotify-devel vala-devel gtk4-devel libadwaita-devel libportal-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=63e3149b5d1475b7a2698005bb5f750f3c80a735717160e39df8cfdfebfccdf0 +checksum=8802c38fdc23f528dac128f53bdcf1f6ca30e0e1c6848c42cd6c84a5e22c5216 From ee609c42e421e9c2320d0eaf7402648f70197942 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:27:46 -0700 Subject: [PATCH 61/76] orca: update to 42.0 --- srcpkgs/orca/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 298009255942..5ae23dcfa958 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,9 +1,9 @@ # Template file for 'orca' pkgname=orca -version=41.1 +version=42.0 revision=1 build_style=gnu-configure -hostmakedepends="intltool itstool pkg-config" +hostmakedepends="gettext itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel" depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme liblouis python3-atspi python3-brlapi python3-dbus python3-xdg speech-dispatcher @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1fd02b99094f09f6e72df779e1a72dce41427ec82e245a4ea83233a97eeda271 +checksum=2c25179ab41b260b18f1ff899bebafe689438b49dffd211defc976a25093f73a if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel" From 0b7b877502d9e375339d49592a112ecc1552d40c Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:00:40 -0700 Subject: [PATCH 62/76] bubblewrap: update to 0.6.1 --- srcpkgs/bubblewrap/patches/realpath-workaround.patch | 11 ++++------- srcpkgs/bubblewrap/template | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/bubblewrap/patches/realpath-workaround.patch b/srcpkgs/bubblewrap/patches/realpath-workaround.patch index 45d1fd6231b6..a4ba530e2199 100644 --- a/srcpkgs/bubblewrap/patches/realpath-workaround.patch +++ b/srcpkgs/bubblewrap/patches/realpath-workaround.patch @@ -231,19 +231,16 @@ static char * skip_token (char *line, bool eat_whitespace) -@@ -395,9 +587,14 @@ +@@ -400,7 +400,11 @@ /* The mount operation will resolve any symlinks in the destination path, so to find it in the mount table we need to do that too. */ +#ifdef __GLIBC__ resolved_dest = realpath (dest, NULL); -- if (resolved_dest == NULL) +#else + resolved_dest = realpath_int (dest, NULL); +#endif -+ if (resolved_dest == NULL) { - return 2; -+ } + if (resolved_dest == NULL) + return BIND_MOUNT_ERROR_REALPATH_DEST; - mount_tab = parse_mountinfo (proc_fd, resolved_dest); - if (mount_tab[0].mountpoint == NULL) + diff --git a/srcpkgs/bubblewrap/template b/srcpkgs/bubblewrap/template index 4df1dac59395..2b5b7da82dd3 100644 --- a/srcpkgs/bubblewrap/template +++ b/srcpkgs/bubblewrap/template @@ -1,7 +1,7 @@ # Template file for 'bubblewrap' pkgname=bubblewrap -version=0.4.1 -revision=2 +version=0.6.1 +revision=1 build_style=gnu-configure hostmakedepends="libxslt docbook-xsl pkg-config" makedepends="libcap-devel" @@ -10,7 +10,7 @@ maintainer="Duncaen " license="LGPL-2.0-or-later" homepage="https://github.com/containers/bubblewrap" distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03 +checksum=9609c7dc162bc68abc29abfab566934fdca37520a15ed01b675adcf3a4303282 post_install() { if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From e36940606ea69261bdeb9bb55bcb4866c48ad5f0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:02:53 -0700 Subject: [PATCH 63/76] evince: update to 42.1 --- srcpkgs/evince/patches/meson-0.61.patch | 52 ------------------------- srcpkgs/evince/template | 14 +++---- 2 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 srcpkgs/evince/patches/meson-0.61.patch diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch deleted file mode 100644 index baed9dc1af8f..000000000000 --- a/srcpkgs/evince/patches/meson-0.61.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Wed, 17 Nov 2021 18:22:45 +0800 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for -a time and explicitly rejects with error since meson 0.60.0 ---- - backend/meson.build | 1 - - data/meson.build | 1 - - meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/backend/meson.build b/backend/meson.build -index e44c1d6d7..ab3df9acf 100644 ---- a/backend/meson.build -+++ b/backend/meson.build -@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends - ) - - i18n.merge_file( -- appstream, - input: appstream_in, - output: appstream, - po_dir: po_dir, -diff --git a/data/meson.build b/data/meson.build -index 8a308b853..afc302098 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -15,7 +15,6 @@ foreach desktop: desktops - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/meson.build b/meson.build -index 34c86661f..f74efb3c4 100644 ---- a/meson.build -+++ b/meson.build -@@ -492,7 +492,6 @@ install_headers( - appdata = ev_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, --- -GitLab - diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index 1fbba2b8c8bc..22d44831774a 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,14 +1,14 @@ # Template file for 'evince' pkgname=evince -version=41.3 +version=42.1 revision=1 build_helper="gir" build_style=meson configure_args="$(vopt_bool gir introspection) $(vopt_bool gtk_doc gtk_doc) - -Dcomics=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled - -Dt1lib=disabled" -hostmakedepends="adwaita-icon-theme gettext gtk-doc glib-devel - itstool pkg-config perl-XML-Parser appstream-glib" + -Dcomics=enabled -Ddjvu=enabled -Dps=enabled -Dxps=enabled -Ddvi=disabled -Dpdf=enabled + -Dsystemduserunitdir=no" +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 @@ -19,7 +19,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evince" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0 +checksum=b24767bb3d5103b4e35b0e15cf033dbe2488f88700cdd882d22a43adeec2e80a build_options="gir gtk_doc" build_options_default="gir" @@ -46,7 +46,7 @@ evince-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.so" if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 From 1d785f7a80b40bee84db1cc431648629e73e3d76 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:03:11 -0700 Subject: [PATCH 64/76] gnome-remote-desktop: update to 42.0 --- srcpkgs/gnome-remote-desktop/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-remote-desktop/template b/srcpkgs/gnome-remote-desktop/template index 30e9b3b2c21f..b15107f3f253 100644 --- a/srcpkgs/gnome-remote-desktop/template +++ b/srcpkgs/gnome-remote-desktop/template @@ -1,17 +1,18 @@ # Template file for 'gnome-remote-desktop' pkgname=gnome-remote-desktop -version=41.2 +version=42.0 revision=1 build_style=meson -configure_args="-Drdp=true -Dvnc=true -Dnvenc=false +configure_args="-Drdp=true -Dvnc=true -Dsystemd_user_unit_dir=/var/lib/systemd/user" hostmakedepends="pkg-config glib-devel" makedepends="glib-devel pipewire-devel libsecret-devel libnotify-devel - freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel" + freerdp-devel freerdp-server-devel fuse3-devel libvncserver-devel + libgudev-devel nv-codec-headers" short_desc="GNOME remote desktop server" maintainer="Michal Vasilek " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/RemoteDesktop" distfiles="${GNOME_SITE}/gnome-remote-desktop/${version%%.*}/gnome-remote-desktop-${version}.tar.xz" -checksum=10151e69b648c2247c5e33d9a2ef419f4e037ee5b2bae49e6ed6aca77eb1ba58 +checksum=b3dc2bb75c783dedaab96a8dbbac16dd9aa139e6d3a28a3db3ea40c60465b98f make_check=no # xvfb failed to start From ce8a0a93ff5bff5ecf1f37e8db6d4a360050a737 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:03:43 -0700 Subject: [PATCH 65/76] gnome: update to 42.0 --- srcpkgs/gnome/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 0984bf8205a6..ad054ea33b2f 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,6 +1,6 @@ # Template file for 'gnome' pkgname=gnome -version=41.0 +version=42.0 revision=1 build_style=meta short_desc="GNOME meta-package for Void Linux" @@ -11,11 +11,11 @@ homepage="https://www.gnome.org" depends=" gnome-core>=${version} baobab>=${version} - cheese>=${version} + cheese>=41.1 eog>=${version} evince>=${version} file-roller>=3.40.0 - gedit>=40.1 + gnome-text-editor>=${version} gnome-calculator>=${version} gnome-calendar>=${version} gnome-characters>=${version} @@ -28,7 +28,6 @@ depends=" gnome-remote-desktop>=${version} gnome-screenshot>=40.0 gnome-system-monitor>=${version} - gnome-terminal>=3.${version} gnome-tweaks>=40.0 gnome-weather>=${version} gsound>=1.0.3 @@ -48,17 +47,15 @@ _apps_depends=" evolution>=3.42.0 ghex>=3.18.4 gitg>=3.32.1 - gedit-plugins>=40.1 gnome-books>=40.0 gnome-boxes>=${version} gnome-builder>=${version} gnome-calculator>=${version} gnome-calendar>=${version} gnome-characters>=${version} - gnome-clocks>=40.0 + gnome-clocks>=${version} gnome-dictionary>=40.0 gnome-disk-utility>=${version} - gnome-documents>=3.34.0 gnome-font-viewer>=${version} gnome-maps>=${version} gnome-music>=${version} @@ -68,7 +65,7 @@ _apps_depends=" gnome-screenshot>=40.0 gnome-sound-recorder>=40.0 gnome-system-monitor>=${version} - gnome-terminal>=3.41.0 + gnome-terminal>=3.${version} gnome-todo>=3.28.1 gnote>=40.2 nemiver>=0.9.6 From 8690e26ddcba6d6202c1dbf507f6149d294836b6 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:23:03 -0700 Subject: [PATCH 66/76] nv-codec-headers: update to 11.1.5.1 --- srcpkgs/nv-codec-headers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nv-codec-headers/template b/srcpkgs/nv-codec-headers/template index 0e4ba1c87c84..db3eaef84a8e 100644 --- a/srcpkgs/nv-codec-headers/template +++ b/srcpkgs/nv-codec-headers/template @@ -1,6 +1,6 @@ # Template file for 'nv-codec-headers' pkgname=nv-codec-headers -version=9.1.23.1 +version=11.1.5.1 revision=1 archs="i686* x86_64*" wrksrc="nv-codec-headers-n${version}" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="MIT" homepage="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git" distfiles="https://github.com/FFmpeg/nv-codec-headers/archive/n${version}.tar.gz" -checksum=063f49838113c90504fd430377a6025478e2a454f812ce8a4da033e474727dc8 +checksum=d095fbd56aa93772471a323be0ebe65504a0f43f06c76a30b6d25da77b06ae9c post_install() { sed -n '4,25p' include/ffnvcodec/nvEncodeAPI.h > LICENSE From 6487a8a3a457117bdd7be6e74d648b4193d1b99f Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:31:15 -0700 Subject: [PATCH 67/76] New package: gnome-bluetooth1-3.34.5 --- common/shlibs | 1 + srcpkgs/gnome-bluetooth1-devel | 1 + .../gnome-bluetooth1/patches/meson-0.61.patch | 25 +++++++++++++ srcpkgs/gnome-bluetooth1/template | 35 +++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 120000 srcpkgs/gnome-bluetooth1-devel create mode 100644 srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch create mode 100644 srcpkgs/gnome-bluetooth1/template diff --git a/common/shlibs b/common/shlibs index 0fc3e1e1297d..36753745ed69 100644 --- a/common/shlibs +++ b/common/shlibs @@ -683,6 +683,7 @@ libatkmm-1.6.so.1 atkmm-2.22.1_1 libgtkmm-3.0.so.1 gtkmm-2.99.5_1 libgdkmm-3.0.so.1 gtkmm-2.99.5_1 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1 +libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1 libgnome-bluetooth-ui-3.0.so.13 gnome-bluetooth-42.0_1 libsasl2.so.3 libsasl-2.1.26_1 liblber-2.4.so.2 libldap-2.4.21_1 diff --git a/srcpkgs/gnome-bluetooth1-devel b/srcpkgs/gnome-bluetooth1-devel new file mode 120000 index 000000000000..61c3fca4c52b --- /dev/null +++ b/srcpkgs/gnome-bluetooth1-devel @@ -0,0 +1 @@ +gnome-bluetooth1 \ No newline at end of file diff --git a/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch new file mode 100644 index 000000000000..c6962edd4f05 --- /dev/null +++ b/srcpkgs/gnome-bluetooth1/patches/meson-0.61.patch @@ -0,0 +1,25 @@ +From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 7 Jan 2022 12:51:22 +0100 +Subject: [PATCH] build: Fix build for newer versions of meson + +sendto/meson.build:24:5: ERROR: Function does not take positional arguments. +--- + sendto/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sendto/meson.build b/sendto/meson.build +index 24a4e394..3e233a03 100644 +--- a/sendto/meson.build ++++ b/sendto/meson.build +@@ -22,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + diff --git a/srcpkgs/gnome-bluetooth1/template b/srcpkgs/gnome-bluetooth1/template new file mode 100644 index 000000000000..50e637601752 --- /dev/null +++ b/srcpkgs/gnome-bluetooth1/template @@ -0,0 +1,35 @@ +# Template file for 'gnome-bluetooth1' +pkgname=gnome-bluetooth1 +version=3.34.5 +revision=1 +wrksrc="gnome-bluetooth-${version}" +build_helper="gir" +build_style=meson +configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)" +hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel" +makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel + gvfs-devel bluez eudev-libudev-devel libcanberra-devel" +depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils" +checkdepends="python3-dbus" +short_desc="GNOME Bluetooth Subsystem" +maintainer="Enno Boland " +license="GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/GnomeBluetooth" +distfiles="${GNOME_SITE}/gnome-bluetooth/${version%.*}/gnome-bluetooth-${version}.tar.xz" +checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9 + +build_options="gir" +build_options_default="gir" + +gnome-bluetooth1-devel_package() { + depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi + } +} From 2a8b4e5eb273db66ea557f515660086396e61c2a Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 21:43:48 -0700 Subject: [PATCH 68/76] shotwell: fix build with vala 0.56.0 --- .../patches/shotwell-0.54.1-vapi_fixes.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch new file mode 100644 index 000000000000..f39f988f9645 --- /dev/null +++ b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch @@ -0,0 +1,67 @@ +From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 30 Nov 2021 15:09:17 +0100 +Subject: [PATCH] Fix accessibility issues with initializer of constants + +--- + src/International.vala | 2 -- + src/Resources.vala | 7 ------- + vapi/version.vapi | 17 ++++++++++++++--- + 3 files changed, 14 insertions(+), 12 deletions(-) + +diff --git a/src/International.vala b/src/International.vala +index 555a91f8..73f07639 100644 +--- a/src/International.vala ++++ b/src/International.vala +@@ -4,8 +4,6 @@ + * See the COPYING file in this distribution. + */ + +-extern const string _LANG_SUPPORT_DIR; +- + public const string TRANSLATABLE = "translatable"; + + namespace InternationalSupport { +diff --git a/src/Resources.vala b/src/Resources.vala +index 6d2b8851..86f0eb65 100644 +--- a/src/Resources.vala ++++ b/src/Resources.vala +@@ -4,13 +4,6 @@ + * See the COPYING file in this distribution. + */ + +-// defined by ./configure or Makefile and included by gcc -D +-extern const string _PREFIX; +-extern const string _VERSION; +-extern const string GETTEXT_PACKAGE; +-extern const string _LIB; +-extern const string _LIBEXECDIR; +- + namespace Resources { + public const string APP_TITLE = "Shotwell"; + public const string APP_LIBRARY_ROLE = _("Photo Manager"); +diff --git a/vapi/version.vapi b/vapi/version.vapi +index 06974c84..e191f2f7 100644 +--- a/vapi/version.vapi ++++ b/vapi/version.vapi +@@ -1,3 +1,14 @@ +-[CCode (cheader_filename="version.h")] +-extern const string? _GIT_VERSION; +- ++[CCode (cheader_filename = "version.h")] ++public const string? _GIT_VERSION; ++[CCode (cheader_filename = "config.h")] ++public const string _PREFIX; ++[CCode (cheader_filename = "config.h")] ++public const string _VERSION; ++[CCode (cheader_filename = "config.h")] ++public const string GETTEXT_PACKAGE; ++[CCode (cheader_filename = "config.h")] ++public const string _LIB; ++[CCode (cheader_filename = "config.h")] ++public const string _LIBEXECDIR; ++[CCode (cheader_filename = "config.h")] ++public const string _LANG_SUPPORT_DIR; +-- +GitLab + From c4713732189829a8a8c83f69288d022db7f39799 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 14:21:34 -0700 Subject: [PATCH 69/76] gnome-tweaks: update to 42.beta --- srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 ------------------- srcpkgs/gnome-tweaks/template | 9 +++--- 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch deleted file mode 100644 index 80efde38735e..000000000000 --- a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 -From: Mae Dartmann -Date: Wed, 16 Feb 2022 06:08:41 +0000 -Subject: [PATCH] meson: fix invalid positional argument - ---- - data/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index fd6d5da..74f7e82 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,5 +1,5 @@ - appdata_file = 'org.gnome.tweaks.appdata.xml' --i18n.merge_file(appdata_file, -+i18n.merge_file( - input: appdata_file + '.in', - output: appdata_file, - po_dir: '../po', -@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, - ) - - desktop_file = 'org.gnome.tweaks.desktop' --i18n.merge_file(desktop_file, -+i18n.merge_file( - input: desktop_file + '.in', - output: desktop_file, - po_dir: '../po', --- -GitLab - diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template index e2ef4e83d274..34f1a56b9084 100644 --- a/srcpkgs/gnome-tweaks/template +++ b/srcpkgs/gnome-tweaks/template @@ -1,16 +1,17 @@ # Template file for 'gnome-tweaks' pkgname=gnome-tweaks -version=40.0 -revision=3 +version=42.beta +revision=1 build_style=meson -hostmakedepends="gettext" +hostmakedepends="pkg-config gettext" +makedepends="libhandy1-devel" depends="gtk+3 dconf gnome-settings-daemon mutter libnotify python3-gobject libhandy1" short_desc="GNOME tool to customize advanced options" maintainer="Enno Boland " license="GPL-3.0-or-later, CC0-1.0" homepage="https://wiki.gnome.org/Apps/Tweaks" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a +checksum=83f44cc1dc8adc770cdad717b403cb9a6cc3c0de50e38e6f1e678b43401ad868 replaces="gnome-tweak-tool>=0" gnome-tweak-tool_package() { From 10565fa556794814a6bbd60d64aba655adffe9d2 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 21:11:42 -0700 Subject: [PATCH 70/76] budgie-desktop: rebuild against mutter 42.0 --- srcpkgs/budgie-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index a65c395c994b..4bf30a41cfc7 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -1,7 +1,7 @@ # Template file for 'budgie-desktop' pkgname=budgie-desktop version=10.6 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dwith-gtk-doc=false" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc budgie-screensaver" makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel - upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel + upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala libuuid-devel libupower-glib3" depends="gnome-session gnome-settings-daemon budgie-control-center elogind gnome-themes-extra budgie-screensaver budgie-desktop-view" From 7e69b1106276c5f40dd821c4c24fa3fd3e1182e8 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:34:01 -0700 Subject: [PATCH 71/76] budgie-control-center: use gnome-bluetooth1 --- srcpkgs/budgie-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template index 15d7ee0dca87..416cbf8d584b 100644 --- a/srcpkgs/budgie-control-center/template +++ b/srcpkgs/budgie-control-center/template @@ -1,12 +1,12 @@ # Template file for 'budgie-control-center' pkgname=budgie-control-center version=1.0.1 -revision=1 +revision=2 build_style=meson hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config polkit python3 libxml2" makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel - colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel + colord-devel colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel From d5729cc9778efeb06fe7d045bcb85a4554aefb79 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:45:30 -0700 Subject: [PATCH 72/76] gnome-panel: update to 3.44.0 --- srcpkgs/gnome-panel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 14bb5a03db84..2484b7e4525d 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,6 +1,6 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.42.0 +version=3.44.0 revision=1 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomePanel" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=aea8c0efc2edba20e97ad4695179cd0a2538e64c2904702cc8c594e8e0898703 +checksum=99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa gnome-panel-devel_package() { depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}" From e92b8762d051c95fbfefe8ea7d25026ad749a039 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:45:44 -0700 Subject: [PATCH 73/76] gnome-flashback: update to 3.44.0 --- srcpkgs/gnome-flashback/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template index fce623766e1c..9fc5c992a7db 100644 --- a/srcpkgs/gnome-flashback/template +++ b/srcpkgs/gnome-flashback/template @@ -1,6 +1,6 @@ # Template file for 'gnome-flashback' pkgname=gnome-flashback -version=3.42.1 +version=3.44.0 revision=1 build_helper=gir build_style=gnu-configure @@ -9,16 +9,16 @@ hostmakedepends="pkg-config gettext gettext-devel automake libtool glib-devel" makedepends="pam-devel elogind-devel upower-devel ibus-devel polkit-devel pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel libxkbfile-devel libcompizconfig-devel libglib-devel pango-devel gtk+3-devel gdk-pixbuf-devel - gdm-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel + gdm-devel gnome-bluetooth1-devel gnome-desktop-devel gnome-panel-devel gsettings-desktop-schemas-devel libXxf86vm-devel" -depends="gnome-bluetooth gnome-session gnome-settings-daemon +depends="gnome-bluetooth1 gnome-session gnome-settings-daemon gnome-panel gnome-themes-extra metacity" short_desc="GNOME session with similar user experience to the GNOME 2.x series" maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeFlashback" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e +checksum=1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a post_extract() { vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \ From 4331e9971f672b17966456c7dc6954387f14c239 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:53:36 -0700 Subject: [PATCH 74/76] vala-language-server: rebuild against vala 0.56.0 --- srcpkgs/vala-language-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template index 1693c8fc0b7f..037fa94852da 100644 --- a/srcpkgs/vala-language-server/template +++ b/srcpkgs/vala-language-server/template @@ -1,7 +1,7 @@ # Template file for 'vala-language-server' pkgname=vala-language-server version=0.48.4 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext pkg-config vala" makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel" From d09743fd3b92e495ea15096259269443ef4ab6ad Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 25 Mar 2022 23:54:54 -0700 Subject: [PATCH 75/76] valabind: rebuild against vala 0.56.0 --- srcpkgs/valabind/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template index c7b8bf305d27..a9a7765a9bd6 100644 --- a/srcpkgs/valabind/template +++ b/srcpkgs/valabind/template @@ -1,7 +1,7 @@ # Template file for 'valabind' pkgname=valabind version=1.8.0 -revision=2 +revision=3 build_style=meson hostmakedepends="pkg-config vala-devel git" makedepends="vala-devel glib-devel" From ad47085262aa3708426f80656e0d8a2ff0a86ea8 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sat, 2 Apr 2022 10:47:24 -0700 Subject: [PATCH 76/76] New package: gnome-console-42.beta --- srcpkgs/gnome-console/template | 25 ++++++++++++++++++++++++ srcpkgs/nautilus-gnome-console-extension | 1 + 2 files changed, 26 insertions(+) create mode 100644 srcpkgs/gnome-console/template create mode 120000 srcpkgs/nautilus-gnome-console-extension diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template new file mode 100644 index 000000000000..8bebd62378d1 --- /dev/null +++ b/srcpkgs/gnome-console/template @@ -0,0 +1,25 @@ +# Template file for 'gnome-console' +pkgname=gnome-console +version=42.beta +revision=1 +build_style=meson +configure_args="-Dnautilus=enabled" +hostmakedepends="pkg-config desktop-file-utils gettext + gobject-introspection sassc glib-devel" +makedepends="gtk+3-devel libhandy1-devel vte3-devel libgtop-devel + nautilus-devel gsettings-desktop-schemas-devel" +depends="gsettings-desktop-schemas" +short_desc="Simple user-friendly terminal emulator for the GNOME desktop" +maintainer="oreo639 " +license="GPL-3.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/console" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=2eafec8720210dcc01e47aa98a1bc6c76fb1c155365dac7bfcd7ab170477e834 + +nautilus-gnome-console-extension_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - integration for nautilus" + pkg_install() { + vmove usr/lib/nautilus/extensions-3.0 + } +} diff --git a/srcpkgs/nautilus-gnome-console-extension b/srcpkgs/nautilus-gnome-console-extension new file mode 120000 index 000000000000..4107e3ff7e4c --- /dev/null +++ b/srcpkgs/nautilus-gnome-console-extension @@ -0,0 +1 @@ +gnome-console \ No newline at end of file