[arch-commits] Commit in gvfs/trunk (PKGBUILD fix-build.diff)
Jan Steffens
heftig at gemini.archlinux.org
Fri Mar 18 13:18:25 UTC 2022
Date: Friday, March 18, 2022 @ 13:18:25
Author: heftig
Revision: 439924
1.50.0-1
Modified:
gvfs/trunk/PKGBUILD
Deleted:
gvfs/trunk/fix-build.diff
----------------+
PKGBUILD | 124 ++++++++++++++++++++++++++-----------------------------
fix-build.diff | 12 -----
2 files changed, 60 insertions(+), 76 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-18 13:16:54 UTC (rev 439923)
+++ PKGBUILD 2022-03-18 13:18:25 UTC (rev 439924)
@@ -3,24 +3,23 @@
pkgbase=gvfs
pkgname=(gvfs gvfs-{smb,afc,gphoto2,goa,mtp,nfs,google})
-pkgver=1.48.1
-pkgrel=3
+pkgver=1.50.0
+pkgrel=1
pkgdesc="Virtual filesystem implementation for GIO"
url="https://wiki.gnome.org/Projects/gvfs"
arch=(x86_64)
license=(LGPL)
-depends=(avahi dconf fuse3 libarchive libcdio-paranoia libsoup udisks2 libsecret
- libbluray libgudev gcr psmisc 'gsettings-desktop-schemas>=3.34.0')
+depends=(avahi dconf fuse3 libarchive libcdio-paranoia libsoup3 udisks2
+ libsecret libbluray libgudev gcr psmisc gsettings-desktop-schemas)
makedepends=(dbus libgphoto2 libimobiledevice smbclient docbook-xsl gtk3 libmtp
gnome-online-accounts libnfs libgdata git gtk-doc python meson
openssh)
groups=(gnome)
-_commit=a971ec4b5c1ff016e7273f2d390248f8c2d65106 # tags/1.48.1^0
+options=(debug)
+_commit=9f34e9278e9fe850bb5a313778aa04936222c97f # tags/1.50.0^0
source=("git+https://gitlab.gnome.org/GNOME/gvfs.git#commit=$_commit"
- fix-build.diff
gvfsd.hook)
sha256sums=('SKIP'
- 'f0a8731fb843e7a952a8b4d66076fdc646e18c22f218ae7da3738a790478fcca'
'd3b714db35b2ce75d7f6d528044554decbb9149a98425aff119a071ca0a25282')
pkgver() {
@@ -30,9 +29,6 @@
prepare() {
cd gvfs
-
- # Fix build with Meson 0.61
- git apply -3 ../fix-build.diff
}
build() {
@@ -44,14 +40,13 @@
meson test -C build --print-errorlogs
}
-_split() {
- local name="$1" src dest; shift
- for src; do
- echo "$name: /usr/$src"
- dest="$srcdir/$name/$src"
- mkdir -p "${dest%/*}"
- mv -T "$src" "$dest"
- rmdir -p --ignore-fail-on-non-empty "${src%/*}"
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
done
}
@@ -65,55 +60,56 @@
'gvfs-nfs: NFS support'
'gvfs-google: Google Drive support'
'gtk3: Recent files support')
- options=(!emptydirs)
- DESTDIR="$pkgdir" meson install -C build
+ meson install -C build --destdir "$pkgdir"
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
- install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+ ( cd "$pkgdir"
- cd "$pkgdir/usr"
+ _pick smb \
+ usr/lib/gvfsd-smb{,-browse} \
+ usr/share/GConf/gsettings/gvfs-smb.convert \
+ usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml \
+ usr/share/gvfs/mounts/smb{,-browse}.mount
- _split smb \
- lib/gvfsd-smb{,-browse} \
- share/GConf/gsettings/gvfs-smb.convert \
- share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml \
- share/gvfs/mounts/smb{,-browse}.mount
+ _pick afc \
+ usr/lib/gvfs{-afc-volume-monitor,d-afc} \
+ usr/lib/systemd/user/gvfs-afc-volume-monitor.service \
+ usr/share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service \
+ usr/share/gvfs/mounts/afc.mount \
+ usr/share/gvfs/remote-volume-monitors/afc.monitor
- _split afc \
- lib/gvfs{-afc-volume-monitor,d-afc} \
- lib/systemd/user/gvfs-afc-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service \
- share/gvfs/mounts/afc.mount \
- share/gvfs/remote-volume-monitors/afc.monitor
+ _pick gphoto2 \
+ usr/lib/gvfs{-gphoto2-volume-monitor,d-gphoto2} \
+ usr/lib/systemd/user/gvfs-gphoto2-volume-monitor.service \
+ usr/share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service \
+ usr/share/gvfs/mounts/gphoto2.mount \
+ usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
- _split gphoto2 \
- lib/gvfs{-gphoto2-volume-monitor,d-gphoto2} \
- lib/systemd/user/gvfs-gphoto2-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service \
- share/gvfs/mounts/gphoto2.mount \
- share/gvfs/remote-volume-monitors/gphoto2.monitor
+ _pick mtp \
+ usr/lib/gvfs{-mtp-volume-monitor,d-mtp} \
+ usr/lib/systemd/user/gvfs-mtp-volume-monitor.service \
+ usr/share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service \
+ usr/share/gvfs/mounts/mtp.mount \
+ usr/share/gvfs/remote-volume-monitors/mtp.monitor
- _split mtp \
- lib/gvfs{-mtp-volume-monitor,d-mtp} \
- lib/systemd/user/gvfs-mtp-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service \
- share/gvfs/mounts/mtp.mount \
- share/gvfs/remote-volume-monitors/mtp.monitor
+ _pick goa \
+ usr/lib/gvfs-goa-volume-monitor \
+ usr/lib/systemd/user/gvfs-goa-volume-monitor.service \
+ usr/share/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service \
+ usr/share/gvfs/remote-volume-monitors/goa.monitor
- _split goa \
- lib/gvfs-goa-volume-monitor \
- lib/systemd/user/gvfs-goa-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service \
- share/gvfs/remote-volume-monitors/goa.monitor
+ _pick nfs \
+ usr/lib/gvfsd-nfs \
+ usr/share/gvfs/mounts/nfs.mount
- _split nfs \
- lib/gvfsd-nfs \
- share/gvfs/mounts/nfs.mount
+ _pick google \
+ usr/lib/gvfsd-google \
+ usr/share/gvfs/mounts/google.mount
- _split google \
- lib/gvfsd-google \
- share/gvfs/mounts/google.mount
+ install -d -o root -g 102 -m 750 usr/share/polkit-1/rules.d
+ )
+
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
}
package_gvfs-smb() {
@@ -120,7 +116,7 @@
pkgdesc+=" (SMB/CIFS backend; Windows client)"
depends=("gvfs=$pkgver" 'smbclient>=4.12.0')
- mv "$srcdir/smb" "$pkgdir/usr"
+ mv smb/* "$pkgdir"
}
package_gvfs-afc() {
@@ -127,7 +123,7 @@
pkgdesc+=" (AFC backend; Apple mobile devices)"
depends=("gvfs=$pkgver" libimobiledevice usbmuxd)
- mv "$srcdir/afc" "$pkgdir/usr"
+ mv afc/* "$pkgdir"
}
package_gvfs-gphoto2() {
@@ -134,7 +130,7 @@
pkgdesc+=" (gphoto2 backend; PTP camera, MTP media player)"
depends=("gvfs=$pkgver" libgphoto2)
- mv "$srcdir/gphoto2" "$pkgdir/usr"
+ mv gphoto2/* "$pkgdir"
}
package_gvfs-mtp() {
@@ -141,7 +137,7 @@
pkgdesc+=" (MTP backend; Android, media player)"
depends=("gvfs=$pkgver" libmtp)
- mv "$srcdir/mtp" "$pkgdir/usr"
+ mv mtp/* "$pkgdir"
}
package_gvfs-goa() {
@@ -148,7 +144,7 @@
pkgdesc+=" (Gnome Online Accounts backend; cloud storage)"
depends=("gvfs=$pkgver" gnome-online-accounts)
- mv "$srcdir/goa" "$pkgdir/usr"
+ mv goa/* "$pkgdir"
}
package_gvfs-nfs() {
@@ -156,7 +152,7 @@
depends=("gvfs=$pkgver" libnfs)
install=gvfs-nfs.install
- mv "$srcdir/nfs" "$pkgdir/usr"
+ mv nfs/* "$pkgdir"
}
package_gvfs-google() {
@@ -163,7 +159,7 @@
pkgdesc+=" (Google Drive backend)"
depends=("gvfs-goa=$pkgver" libgdata)
- mv "$srcdir/google" "$pkgdir/usr"
+ mv google/* "$pkgdir"
}
# vim:set sw=2 et:
Deleted: fix-build.diff
===================================================================
--- fix-build.diff 2022-03-18 13:16:54 UTC (rev 439923)
+++ fix-build.diff 2022-03-18 13:18:25 UTC (rev 439924)
@@ -1,12 +0,0 @@
-diff --git i/daemon/meson.build w/daemon/meson.build
-index c89ef407..620391cd 100644
---- i/daemon/meson.build
-+++ w/daemon/meson.build
-@@ -366,7 +366,6 @@ if enable_admin
- )
-
- i18n.merge_file(
-- policy,
- input: policy_in,
- output: '@BASENAME@',
- po_dir: po_dir,
More information about the arch-commits
mailing list