Re: [PR PATCH] [Updated] gvfs: update to 1.54.0, recursive cleanup

[cinerea0 <cinerea0@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages gvfs
https://github.com/void-linux/void-packages/pull/49482

gvfs: update to 1.54.0, recursive cleanup
#### Testing the changes
- I tested the changes in this PR: **YES**

---

I tested that gvfs works properly. However, I don't use OneDrive, so I can't verify that part works correctly.



A patch file from https://github.com/void-linux/void-packages/pull/49482.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gvfs-49482.patch --]
[-- Type: text/x-diff, Size: 9174 bytes --]

From e167d54086db5bd25c8301d296871ba08cb6e3cb Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 23 Mar 2024 17:36:41 -0400
Subject: [PATCH 1/4] uhttpmock: update to 0.10.0

---
 srcpkgs/uhttpmock/template | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/uhttpmock/template b/srcpkgs/uhttpmock/template
index 0b405980cecc17..bf76f818b3216f 100644
--- a/srcpkgs/uhttpmock/template
+++ b/srcpkgs/uhttpmock/template
@@ -1,34 +1,36 @@
 # Template file for 'uhttpmock'
 pkgname=uhttpmock
-version=0.5.3
+version=0.10.0
 revision=1
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-hostmakedepends="automake pkg-config vala"
-makedepends="glib-devel libsoup-devel vala"
+configure_args="$(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="pkg-config vala $(vopt_if gtk_doc gtk-doc)"
+makedepends="glib-devel libsoup3-devel"
 short_desc="HTTP web service mocking project for projects which use libsoup"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="https://gitlab.com/uhttpmock/uhttpmock"
-distfiles="http://tecnocode.co.uk/downloads/uhttpmock/$pkgname-$version.tar.xz"
-checksum=90843223c3a30bdb7f1eb3442373a03fee425af85a9df289cd687698ccff112f
+homepage="https://gitlab.freedesktop.org/pwithnall/uhttpmock/"
+changelog="https://gitlab.freedesktop.org/pwithnall/uhttpmock/-/raw/main/NEWS"
+distfiles="https://gitlab.freedesktop.org/pwithnall/uhttpmock/-/archive/${version}/uhttpmock-${version}.tar.gz"
+checksum=a4294a9e0f0c619957cefc34e55561990519c25468f07cb7c4e5aa7368ef840b
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# Make g-ir-scanner-qemuwrapper append this path
-		export GIR_EXTRA_LIBS_PATH="${wrksrc}/libuhttpmock/.libs"
-	fi
-}
+build_options="gtk_doc"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gtk_doc"
+fi
 
 uhttpmock-devel_package() {
 	short_desc+=" - development files"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
 	}

From 6add355eafacb4d11bbfeac50612e8fcfba46519 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 23 Mar 2024 17:37:38 -0400
Subject: [PATCH 2/4] libgdata: disable tests

Tests require uhttpmock-0.
---
 srcpkgs/libgdata/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libgdata/template b/srcpkgs/libgdata/template
index 835f82f7fa987f..f493ff80578eea 100644
--- a/srcpkgs/libgdata/template
+++ b/srcpkgs/libgdata/template
@@ -1,19 +1,20 @@
 # Template file for 'libgdata'
 pkgname=libgdata
 version=0.18.1
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false) -Dgtk_doc=false"
+ -Dvapi=$(vopt_if vala true false) -Dgtk_doc=false -Dalways_build_tests=false"
 hostmakedepends="pkg-config flex intltool glib-devel $(vopt_if vala vala)"
-makedepends="json-glib-devel gtk+3-devel uhttpmock-devel liboauth-devel
- gcr-devel gnome-online-accounts-devel"
+makedepends="json-glib-devel gtk+3-devel gcr-devel gnome-online-accounts-devel
+ libsoup-devel"
 short_desc="Library for accessing GData webservices"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/libgdata"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+changelog="https://gitlab.gnome.org/GNOME/libgdata/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/libgdata/${version%.*}/libgdata-${version}.tar.xz"
 checksum=dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7
 
 build_options="gir vala"

From 692753050e8c739458e3c0a252e4a173646c293f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 23 Mar 2024 17:38:15 -0400
Subject: [PATCH 3/4] New package: msgraph-0.2.1

---
 common/shlibs            |  1 +
 srcpkgs/msgraph-devel    |  1 +
 srcpkgs/msgraph/template | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 120000 srcpkgs/msgraph-devel
 create mode 100644 srcpkgs/msgraph/template

diff --git a/common/shlibs b/common/shlibs
index a60c03a1473078..94bdf576b3fc29 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4302,3 +4302,4 @@ libunicode_loader.so.0.4 libunicode-0.4.0_1
 force-stage.so.0.1 void-force-stage-0.1_1
 libliftoff.so.0 libliftoff-0.4.1_1
 libscfg.so libscfg-0.1.1_1
+libmsgraph-0.so.1 msgraph-0.2.1_1
diff --git a/srcpkgs/msgraph-devel b/srcpkgs/msgraph-devel
new file mode 120000
index 00000000000000..19dfc8750ad133
--- /dev/null
+++ b/srcpkgs/msgraph-devel
@@ -0,0 +1 @@
+msgraph
\ No newline at end of file
diff --git a/srcpkgs/msgraph/template b/srcpkgs/msgraph/template
new file mode 100644
index 00000000000000..1c4fac3bdc8760
--- /dev/null
+++ b/srcpkgs/msgraph/template
@@ -0,0 +1,38 @@
+# Template file for 'msgraph'
+pkgname=msgraph
+version=0.2.1
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="$(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel gnome-online-accounts-devel json-glib-devel rest-devel
+ uhttpmock-devel"
+short_desc="Library to access MS Graph API for Office 365"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/msgraph"
+changelog="https://gitlab.gnome.org/GNOME/msgraph/-/raw/main/NEWS"
+distfiles="https://gitlab.gnome.org/GNOME/msgraph/-/archive/${version}/msgraph-${version}.tar.gz"
+checksum=5e127407b6a6c7a9d89dac6ee075873ef47475bb9a14a8e8d23791167d2415f3
+
+build_options="gtk_doc"
+
+if [ -z "${CROSS_BUILD}" ]; then
+	build_options_default="gtk_doc"
+fi
+
+msgraph-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}-${version}_${revision} glib-devel
+	 gnome-online-accounts-devel json-glib-devel libsoup3-devel rest-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+		if [ "${build_option_gtk_doc}" ]; then
+			vmove usr/share/doc
+		fi
+	}
+}

From a7080646ebcba7dc4cfd61838f810015a052fb8b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 23 Mar 2024 17:39:09 -0400
Subject: [PATCH 4/4] gvfs: update to 1.54.0, add OneDrive support

---
 srcpkgs/gvfs-onedrive |  1 +
 srcpkgs/gvfs/template | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/gvfs-onedrive

diff --git a/srcpkgs/gvfs-onedrive b/srcpkgs/gvfs-onedrive
new file mode 120000
index 00000000000000..fcee85889f6875
--- /dev/null
+++ b/srcpkgs/gvfs-onedrive
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index c441ecb3c5a406..3aead18e96fbc1 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,30 +1,31 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.52.2
+version=1.54.0
 revision=1
 build_style=meson
 configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false
  -Dman=true"
 hostmakedepends="docbook-xsl glib-devel gettext libxslt openssh pkg-config
  polkit-devel"
-makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr-devel
+makedepends="avahi-glib-libs-devel dbus-glib-devel fuse3-devel gcr4-devel
  libarchive-devel libbluetooth-devel libbluray-devel libcap-devel
  libcdio-paranoia-devel libgcrypt-devel libgdata-devel libglib-devel
  libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel
  libnfs-devel libsecret-devel libsoup3-devel libxml2-devel polkit-devel
  samba-devel udisks2-devel gsettings-desktop-schemas-devel
- gnome-online-accounts-devel"
+ gnome-online-accounts-devel msgraph-devel"
 short_desc="Userspace virtual filesystem"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/gvfs"
 changelog="https://gitlab.gnome.org/GNOME/gvfs/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gvfs/${version%.*}/gvfs-${version}.tar.xz"
-checksum=a643aceaa053caac0d8eff9a015f636e4bd1bb09cfe27864e347db67460e7b91
+checksum=f53d81df86c2e86cdd25182c2d8a669a22371e83623ded1b9d5416dcfc6de366
 
 # Manually declare shlibs used by the subpkgs.
 shlib_provides="libgvfscommon.so libgvfsdaemon.so"
-subpackages="gvfs-afc gvfs-afp gvfs-cdda gvfs-gphoto2 gvfs-mtp gvfs-smb gvfs-goa gvfs-devel"
+subpackages="gvfs-afc gvfs-afp gvfs-cdda gvfs-gphoto2 gvfs-mtp gvfs-smb
+ gvfs-goa gvfs-onedrive gvfs-devel"
 
 gvfs-devel_package() {
 	short_desc+=" - development files"
@@ -97,6 +98,15 @@ gvfs-mtp_package() {
 	}
 }
 
+gvfs-onedrive_package() {
+	short_desc+=" - OneDrive backend"
+	depends="${sourcepkg}-${version}_${revision}"
+	pkg_install() {
+		vmove usr/libexec/gvfsd-onedrive
+		vmove usr/share/gvfs/mounts/onedrive.mount
+	}
+}
+
 gvfs-smb_package() {
 	short_desc+=" - SMB/CIFS (Windows client) backend"
 	depends="${sourcepkg}-${version}_${revision}"