From 322941dd3eeeaf8e91791cf3beb2de494067600c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 11 Jan 2023 03:27:23 -0800 Subject: [PATCH 1/3] libostree: use curl instead of libsoup2 Fixes support for applications using libsoup3. --- srcpkgs/libostree/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template index ee694029ad35..4e907d2785ca 100644 --- a/srcpkgs/libostree/template +++ b/srcpkgs/libostree/template @@ -1,17 +1,18 @@ # Template file for 'libostree' pkgname=libostree version=2022.7 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args=" --with-builtin-grub2-mkconfig --with-ed25519-libsodium --with-openssl + --with-curl $(vopt_enable gir introspection)" hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config" makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel - libsoup-devel libsodium-devel $(vopt_if gir 'gobject-introspection')" + libcurl-devel libsoup-devel libsodium-devel $(vopt_if gir 'gobject-introspection')" checkdepends="attr-progs cpio elfutils gnupg python3-yaml tar which xz" short_desc="Operating system and container binary deployment and upgrades" maintainer="Duncaen " From e6e4dd0cd812d997f7df8304c34e86ca39268246 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 11 Jan 2023 03:29:20 -0800 Subject: [PATCH 2/3] flatpak: use libcurl instead of libsoup2 --- srcpkgs/flatpak/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index abca0551eb59..8b460d3d05e7 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,10 +1,11 @@ # Template file for 'flatpak' pkgname=flatpak version=1.15.1 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args=" + --with-curl --with-system-bubblewrap --with-system-dbus-proxy --with-system-helper-user=_flatpak @@ -15,7 +16,7 @@ hostmakedepends="bubblewrap gettext glib-devel libxslt pkg-config bison python3-parsing xmlto docbook-xml docbook-xsl xdg-dbus-proxy" makedepends="AppStream-devel libarchive-devel gpgme-devel json-glib-devel libcap-devel libostree-devel libseccomp-devel polkit-devel dconf-devel - fuse3-devel libsoup-devel libcurl-devel gdk-pixbuf-devel" + fuse3-devel libcurl-devel libxml2-devel gdk-pixbuf-devel" depends="bubblewrap gnupg>=2 xdg-dbus-proxy" checkdepends="attr-progs bubblewrap dbus gnupg socat which xdg-dbus-proxy" short_desc="Application sandboxing and distribution framework" From 6bfb5a10c3e3ea4559e175c09d0c5f215561eb1d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 11 Jan 2023 03:34:49 -0800 Subject: [PATCH 3/3] gnome-software: update to 43.3. --- srcpkgs/gnome-software/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-software/template b/srcpkgs/gnome-software/template index be718acb046e..357bc1e8ffae 100644 --- a/srcpkgs/gnome-software/template +++ b/srcpkgs/gnome-software/template @@ -1,6 +1,6 @@ # Template file for 'gnome-software' pkgname=gnome-software -version=43.2 +version=43.3 revision=1 build_style=meson configure_args="-Dpackagekit=false -Dfwupd=false @@ -8,7 +8,7 @@ configure_args="-Dpackagekit=false -Dfwupd=false -Dhardcoded_foss_webapps=false -Dhardcoded_proprietary_webapps=false" hostmakedepends="pkg-config tar glib-devel gettext libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc) AppStream" -makedepends="AppStream-devel libxmlb-devel gnome-online-accounts-devel +makedepends="AppStream-devel libxmlb-devel json-glib-devel gtk4-devel libadwaita-devel gsettings-desktop-schemas-devel gspell-devel polkit-devel flatpak-devel libgudev-devel libsoup3-devel" checkdepends="dbus" @@ -17,7 +17,7 @@ maintainer="Michal Vasilek " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-software" distfiles="https://gitlab.gnome.org/GNOME/gnome-software/-/archive/${version}/gnome-software-${version}.tar.gz" -checksum=5d93c568d5106a1183ee80fab573961cb0617af10e685314822aca5bedfd789d +checksum=9fbdf888ec61cd6f261dbf9e94939a5ff95ba43993ef58946b02b4f92866819c make_check=no # FIXME build_options="gtk_doc"