From 32c13a74f799a81da6544ec6053a4793fc4a7df0 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 17:30:18 +0200 Subject: [PATCH 1/7] tracker: also build libsoup3 version --- srcpkgs/tracker/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index ed0f7bc04040..770ade715ca6 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -1,7 +1,7 @@ # Template file for 'tracker' pkgname=tracker version=3.4.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled @@ -9,7 +9,7 @@ configure_args="-Ddocs=false -Dman=true -Dstemmer=disabled hostmakedepends="gettext pkg-config glib-devel vala asciidoc python3-gobject" makedepends="dbus-devel libglib-devel icu-devel json-glib-devel - libsoup-devel libxml2-devel sqlite-devel bash-completion" + libsoup-devel libsoup3-devel libxml2-devel sqlite-devel bash-completion" checkdepends="dbus tar python3-gobject" short_desc="Personal search tool and storage system" maintainer="Orphaned " @@ -33,7 +33,7 @@ post_patch() { tracker-devel_package() { depends="libtracker>=${version}_${revision} libglib-devel json-glib-devel - libsoup-devel" + libsoup-devel libsoup3-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 1f86f5eecca8d3454f2df8400f19c6793f7f5eda Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 17:30:19 +0200 Subject: [PATCH 2/7] libosinfo: use libsoup3 --- common/shlibs | 2 +- srcpkgs/libosinfo/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 9712cbc1262f..ef07deec5737 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1158,7 +1158,7 @@ libharfbuzz.so.0 libharfbuzz-5.1.0_1 libharfbuzz-icu.so.0 libharfbuzz-5.1.0_1 libharfbuzz-subset.so.0 libharfbuzz-5.1.0_1 libharfbuzz-gobject.so.0 libharfbuzz-5.1.0_1 -libosinfo-1.0.so.0 libosinfo-0.2.0_1 +libosinfo-1.0.so.0 libosinfo-0.10.0_2 libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6 libspice-client-glib-2.0.so.8 spice-gtk-0.37_6 libspice-controller.so.0 spice-gtk-0.37_6 diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template index 5e8fe246c2b1..3396ea1cd003 100644 --- a/srcpkgs/libosinfo/template +++ b/srcpkgs/libosinfo/template @@ -1,7 +1,7 @@ # Template file for 'libosinfo' pkgname=libosinfo version=1.10.0 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=meson build_helper="gir" @@ -11,13 +11,13 @@ configure_args="-Denable-introspection=$(vopt_if gir enabled disabled) hostmakedepends="glib-devel intltool pkg-config wget hwids $(vopt_if gtk_doc gtk-doc) $(vopt_if vala vala)" -makedepends="libxslt-devel libglib-devel libsoup-devel" +makedepends="libxslt-devel libglib-devel libsoup3-devel" depends="osinfo-db hwids" short_desc="GObject based library API for managing info about operating systems" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://libosinfo.org/" -changelog="https://gitlab.com/libosinfo/libosinfo/raw/master/NEWS" +changelog="https://gitlab.com/libosinfo/libosinfo/raw/main/NEWS" distfiles="https://gitlab.com/libosinfo/libosinfo/-/archive/v${version}/libosinfo-v${version}.tar.gz" checksum=e709c5f7d006527caea9b128cdae0ee3404217f2edb9a673ad9574b5eec257fc @@ -36,7 +36,7 @@ libosinfo-devel_package() { vmove "usr/lib/*.so" vmove usr/include vmove usr/lib/pkgconfig - if [ "$build_option_docs" ]; then + if [ "$build_option_gtk_doc" ]; then vmove usr/share/gtk-doc fi if [ "$build_option_gir" ]; then From a24d535f27fb2aa3bf405209e6eae2e6cb8fd6df Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 17:30:20 +0200 Subject: [PATCH 3/7] osinfo-db-tools: update to 1.10.0. --- srcpkgs/osinfo-db-tools/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template index c164a2327430..89edbf989ac1 100644 --- a/srcpkgs/osinfo-db-tools/template +++ b/srcpkgs/osinfo-db-tools/template @@ -1,16 +1,16 @@ # Template file for 'osinfo-db-tools' pkgname=osinfo-db-tools -version=1.8.0 +version=1.10.0 revision=1 build_style=meson hostmakedepends="pkg-config perl" makedepends="libglib-devel libarchive-devel libxslt-devel - json-glib-devel libsoup-devel" + json-glib-devel libsoup3-devel" checkdepends="python3-pytest python3-requests" short_desc="Tools for managing osinfo database" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://libosinfo.org" -changelog="https://gitlab.com/libosinfo/osinfo-db-tools/raw/master/NEWS" +changelog="https://gitlab.com/libosinfo/osinfo-db-tools/raw/main/NEWS" distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz" -checksum=e9811a936e74dc262ce297ea7b8addeb111c782de500c9e285d3cdd5fe1b180d +checksum=802cdd53b416706ea5844f046ddcfb658c1b4906b9f940c79ac7abc50981ca68 From 0a80fc149de0b710203f71954f4a61f58303687e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 17:30:21 +0200 Subject: [PATCH 4/7] phodav: update to 3.0. --- common/shlibs | 2 +- srcpkgs/phodav/template | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index ef07deec5737..d68de4f37649 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3109,7 +3109,7 @@ libsysprof-ui-4.so sysprof-3.37.90_1 libvala-0.56.so.0 libvala-0.56.0_1 libvaladoc-0.56.so.0 libvaladoc-0.56.0_1 libvalaccodegen.so libvala-0.44.0_1 -libphodav-2.0.so.0 phodav-2.2_1 +libphodav-3.0.so.0 phodav-3.0_1 libgfshare.so.2 libgfshare-2.0.0_1 libtacacs.so.1 tacacs-4.0.4.28_1 libffms2.so.4 libffms2-2.23.1_1 diff --git a/srcpkgs/phodav/template b/srcpkgs/phodav/template index 13092896899e..eac226f7b8e6 100644 --- a/srcpkgs/phodav/template +++ b/srcpkgs/phodav/template @@ -1,22 +1,21 @@ # Template file for 'phodav' pkgname=phodav -version=2.5 +version=3.0 revision=1 build_style=meson -configure_args="-Dsystemd=disabled -Davahi=enabled -Dgtk_doc=disabled - -Dudev=enabled" +configure_args="-Davahi=enabled -Dgtk_doc=disabled" hostmakedepends="pkg-config" -makedepends="libglib-devel libsoup-devel libxml2-devel avahi-glib-libs-devel +makedepends="libglib-devel libsoup3-devel libxml2-devel avahi-glib-libs-devel eudev-libudev-devel" short_desc="GNOME Web Dav implementation" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/phodav" -distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=71f0a9cd70afd4dd1412a0298331dbb8ac71c0377f52117afc15eb88dc6fb910 +distfiles="${GNOME_SITE}/phodav/${version}/phodav-${version}.tar.xz" +checksum=392ec2d06d50300dcff1ef269a2a985304e29bce3520002fca29f2edc1d138d1 phodav-devel_package() { - depends="libglib-devel libsoup-devel libxml2-devel + depends="libglib-devel libsoup3-devel libxml2-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" pkg_install() { From 13f8e14163b6bf3bed92f51649feaf4dc554161f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 17:30:22 +0200 Subject: [PATCH 5/7] spice-gtk: use libsoup3 --- common/shlibs | 6 +++--- srcpkgs/spice-gtk/template | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index d68de4f37649..f68ffbb1e7fa 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1159,9 +1159,9 @@ libharfbuzz-icu.so.0 libharfbuzz-5.1.0_1 libharfbuzz-subset.so.0 libharfbuzz-5.1.0_1 libharfbuzz-gobject.so.0 libharfbuzz-5.1.0_1 libosinfo-1.0.so.0 libosinfo-0.10.0_2 -libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6 -libspice-client-glib-2.0.so.8 spice-gtk-0.37_6 -libspice-controller.so.0 spice-gtk-0.37_6 +libspice-client-gtk-3.0.so.5 spice-gtk-0.41_2 +libspice-client-glib-2.0.so.8 spice-gtk-0.41_2 +libspice-controller.so.0 spice-gtk-0.41_2 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1 libgsasl.so.7 libgsasl-1.8.0_1 diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index da01de9ca11a..344f91ce2de8 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -1,7 +1,7 @@ # Template file for 'spice-gtk' pkgname=spice-gtk version=0.41 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir enabled disabled) @@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled) hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel spice-protocol python3-six python3-parsing perl" makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel - libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel + libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup3-devel usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel" depends="hwids gst-plugins-good1" From 219f3d4d6599faa207d99af8a27550469f263afe Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 17:30:23 +0200 Subject: [PATCH 6/7] remmina: disable spice plugin The spice plugin needs spice-gtk which now uses libsoup3, but remmina is not able to use libsoup3 yet. --- srcpkgs/remmina/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index cae838c694ca..c1fd4e750052 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,7 +1,7 @@ # Template file for 'remmina' pkgname=remmina version=1.4.27 -revision=1 +revision=2 wrksrc="Remmina-v${version}" build_style=cmake configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON" @@ -10,8 +10,8 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel gobject-introspection gstreamermm-devel json-glib-devel libgcrypt-devel libgnome-keyring-devel liblz4-devel libsasl-devel libsecret-devel libsodium-devel libsoup-devel libssh-devel libva-devel - libvncserver-devel libxkbfile-devel opus-devel phodav-devel - spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel + libvncserver-devel libxkbfile-devel opus-devel + telepathy-glib-devel usbredir-devel vte3-devel libappindicator-devel webkit2gtk-devel python3-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Remote desktop client written in GTK+" From 9637547918483fe97fb8bb94029cea067873f6ae Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 29 Sep 2022 17:30:23 +0200 Subject: [PATCH 7/7] gnome-boxes: update to 43.0. --- srcpkgs/gnome-boxes/template | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index 5e8aac1c3e8a..d964e2162c13 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -1,20 +1,21 @@ # Template file for 'gnome-boxes' pkgname=gnome-boxes -version=42.3 +version=43.0 revision=1 build_helper="gir" build_style=meson -hostmakedepends="gettext itstool pkg-config vala glib-devel gtk-vnc-devel" -makedepends="clutter-gtk-devel freerdp-devel gtk-vnc-devel libarchive-devel - libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup-devel +hostmakedepends="gettext itstool pkg-config vala glib-devel desktop-file-utils" +makedepends="clutter-gtk-devel freerdp-devel libarchive-devel + libglib-devel libgudev-devel libosinfo-devel libsecret-devel libsoup3-devel libusb-devel libvirt-glib-devel libxml2-devel spice-gtk-devel spice-protocol - vala-devel webkit2gtk-devel vte3-devel gtksourceview4-devel libhandy1-devel + vala-devel libwebkit2gtk41-devel vte3-devel gtksourceview4-devel libhandy1-devel tracker-devel libgcrypt-devel" -depends="desktop-file-utils hicolor-icon-theme libosinfo libvirt-glib qemu tracker" +depends="desktop-file-utils hicolor-icon-theme qemu" 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://gitlab.gnome.org/GNOME/gnome-boxes/-/raw/gnome-42/NEWS" -distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz" -checksum=56eff7faf8300faa1ce14f809f8ebc2a7bb4d915afc7b12737129791605b60d3 +#changelog="https://gitlab.gnome.org/GNOME/gnome-boxes/-/raw/gnome-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gnome-boxes/-/raw/main/NEWS" +distfiles="${GNOME_SITE}/gnome-boxes/${version%%.*}/gnome-boxes-${version}.tar.xz" +checksum=574505096414c820b808ecd0f71e2d19a9332351e12a3dd826f762e432bf6b26