* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2020-01-02 16:47 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2020-01-02 16:47 UTC (permalink / raw
To: gentoo-commits
commit: ed9a34fe8a9d45e8e9d5e3ca832b5ff67a58cfaf
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 07:13:56 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 16:46:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9a34fe
gnome-base/gvfs: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gvfs/Manifest | 1 -
.../gvfs/files/1.38.3-gvfsdaemon-rpath.patch | 35 ------
gnome-base/gvfs/gvfs-1.38.3.ebuild | 137 ---------------------
3 files changed, 173 deletions(-)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 564a0ea6549..f57bd2ca2bb 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,4 +1,3 @@
DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45
DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
-DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175
DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
diff --git a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch
deleted file mode 100644
index f3fe513d06e..00000000000
--- a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 57010ebb148b9b14e40140c7a8ce133a72128cf6 Mon Sep 17 00:00:00 2001
-From: Robby Workman <rworkman@slackware.com>
-Date: Thu, 18 Jul 2019 03:38:41 -0500
-Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so
-
-On Slackware development branch with gvfs-1.40.2, I just noticed this:
- # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found"
- libgvfscommon.so => not found
-
-After some backtracking, it seems that this first occurred in the
-switchover from autotools to meson in the 1.36.x --> 1.38.x bump.
-
-Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and
-assistance with troubleshooting this.
-
-Signed-off-by: Robby Workman <rworkman@slackware.com>
----
- daemon/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index 7f2608bd..0006f35e 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library(
- dependencies: deps,
- c_args: cflags,
- install: true,
-+ install_rpath: gvfs_rpath,
- install_dir: gvfs_pkglibdir
- )
-
---
-2.20.1
-
diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild
deleted file mode 100644
index 5cd798af734..00000000000
--- a/gnome-base/gvfs/gvfs-1.38.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Virtual filesystem implementation for GIO"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-RESTRICT="!test? ( test )"
-# elogind/systemd only relevant to udisks (in v1.38.1)
-REQUIRED_USE="
- ?? ( elogind systemd )
- cdda? ( udev )
- google? ( gnome-online-accounts )
- gphoto2? ( udev )
- mtp? ( udev )
- udisks? ( udev )
-"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.57.2:2
- afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
- sys-apps/dbus
- app-crypt/gcr:=
- policykit? (
- >=sys-auth/polkit-0.114
- sys-libs/libcap )
- http? (
- dev-libs/libxml2:2
- >=net-libs/libsoup-2.42.0:2.4 )
- zeroconf? ( >=net-dns/avahi-0.6[dbus] )
- udev? ( >=dev-libs/libgudev-147:= )
- fuse? ( >=sys-fs/fuse-2.8.0:0 )
- udisks? ( >=sys-fs/udisks-1.97:2 )
- systemd? ( >=sys-apps/systemd-206:0= )
- elogind? ( >=sys-auth/elogind-229:0= )
- ios? (
- >=app-pda/libimobiledevice-1.2:=
- >=app-pda/libplist-1:= )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
- gnome-keyring? ( app-crypt/libsecret )
- bluray? ( media-libs/libbluray:= )
- mtp? (
- >=dev-libs/libusb-1.0.21
- >=media-libs/libmtp-1.1.15 )
- samba? ( >=net-fs/samba-4[client] )
- archive? ( app-arch/libarchive:= )
- cdda? (
- dev-libs/libcdio:0=
- >=dev-libs/libcdio-paranoia-0.78.2 )
- google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] )
- gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
- nfs? ( >=net-fs/libnfs-1.9.8 )
- net-misc/openssh
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.4
- virtual/pkgconfig
- dev-util/gdbus-codegen
-"
-
-PATCHES=(
- # from gnome-3-30 branch, fixes RPATH of libgvfsdaemon.so
- "${FILESDIR}"/${PV}-gvfsdaemon-rpath.patch
-)
-
-src_configure() {
- local enable_logind="false"
- if use systemd || use elogind; then
- enable_logind="true"
- fi
-
- local enable_gcrypt="false"
- if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
- enable_gcrypt="true"
- fi
-
- local enable_libusb="false"
- if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
- enable_libusb="true"
- fi
-
- local emesonargs=(
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
- $(meson_use policykit admin)
- $(meson_use ios afc)
- $(meson_use afp)
- $(meson_use archive)
- $(meson_use cdda)
- $(meson_use zeroconf dnssd)
- $(meson_use gnome-online-accounts goa)
- $(meson_use google)
- $(meson_use gphoto2)
- $(meson_use http)
- $(meson_use mtp)
- $(meson_use nfs)
- -Dsftp=true
- $(meson_use samba smb)
- $(meson_use udisks udisks2)
- $(meson_use bluray)
- $(meson_use fuse)
- -Dgcr=true
- -Dgcrypt=${enable_gcrypt}
- $(meson_use udev gudev)
- $(meson_use gnome-keyring keyring)
- -Dlogind=${enable_logind}
- -Dlibusb=${enable_libusb}
- -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
- -Dinstalled_tests=false
- -Dman=true
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
- gnome2_giomodule_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
- gnome2_giomodule_cache_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2022-01-22 18:40 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2022-01-22 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 4f2e9e58208431cbcca93aafba1784618ef970e9
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 18:40:09 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 18:40:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f2e9e58
gnome-base/gvfs: backport fix for meson-0.61
Closes: https://bugs.gentoo.org/831840
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
gnome-base/gvfs/files/meson-0.61.patch | 33 +++++++++++++++++++++++++++++++++
gnome-base/gvfs/gvfs-1.48.1-r1.ebuild | 6 +++++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch
new file mode 100644
index 000000000000..20e03388d7c6
--- /dev/null
+++ b/gnome-base/gvfs/files/meson-0.61.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831840
+https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133
+
+From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 21 Jan 2022 08:32:31 +0100
+Subject: [PATCH] build: Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+
+Related: https://github.com/mesonbuild/meson/issues/9441
+Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599
+(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0)
+---
+ daemon/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index dffeef3e..bdc506fe 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+ )
+
+ i18n.merge_file(
+- policy,
+ input: policy_in,
+ output: '@BASENAME@',
+ po_dir: po_dir,
+--
+2.34.1
+
diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
index f4b50cffc64b..38deee759bc2 100644
--- a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -82,6 +82,10 @@ BDEPEND="
test? ( dev-libs/libgdata )
"
+PATCHES=(
+ "${FILESDIR}/meson-0.61.patch"
+)
+
src_configure() {
local enable_logind="false"
if use systemd || use elogind; then
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2020-06-17 20:45 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2020-06-17 20:45 UTC (permalink / raw
To: gentoo-commits
commit: 69cc14d928c088034c51116b9204cdc6c8ad3a98
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 20:37:10 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 20:44:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69cc14d9
gnome-base/gvfs: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gvfs/Manifest | 1 -
.../gvfs/files/1.40.2-gvfsdaemon-rpath.patch | 35 ------
gnome-base/gvfs/gvfs-1.40.2.ebuild | 139 ---------------------
3 files changed, 175 deletions(-)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 42f74b2acca..91eb0efcb51 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,2 @@
-DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
DIST gvfs-1.42.2-patchset.tar.xz 23932 BLAKE2B 6957c5a8a200ecff9c3294a7fb7304ae1be147e45dae1838121690a3a20b1d2557681b4efe5f722811d5302b8270d0058eedac7f8a95029cd872df3db14cc541 SHA512 0494fb36e093d06bb278a75ecbf3bc17460d5d20302a9c1d2c5b74a0b65c2a259141b515b3e80c57c3e1125df74b3cf6d2a91ae70c8e2e0af3bbca285417b9f0
DIST gvfs-1.42.2.tar.xz 1204972 BLAKE2B ebc1c4a4ae69a809ee7c556e65f87f968806ef057cfb7f7a7d2f18614443197c1feaad79099fd5b04640035e7ab306683018676ce109a7d718e3c8d35676be7c SHA512 b786ae2e493099a0a1ab2756efba3690f0e241a53995013e2632b2d7e01628d52d72b47298c7a2b913c8d50f135c191b2963a7ffc0e768fc5c96a89f93401e3c
diff --git a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
deleted file mode 100644
index e5d57941893..00000000000
--- a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4fd68eb29aaf010468e154c737a03e04465aabb5 Mon Sep 17 00:00:00 2001
-From: Robby Workman <rworkman@slackware.com>
-Date: Thu, 18 Jul 2019 03:38:41 -0500
-Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so
-
-On Slackware development branch with gvfs-1.40.2, I just noticed this:
- # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found"
- libgvfscommon.so => not found
-
-After some backtracking, it seems that this first occurred in the
-switchover from autotools to meson in the 1.36.x --> 1.38.x bump.
-
-Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and
-assistance with troubleshooting this.
-
-Signed-off-by: Robby Workman <rworkman@slackware.com>
----
- daemon/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index 0ce0c204..f3ed404a 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library(
- dependencies: deps,
- c_args: cflags,
- install: true,
-+ install_rpath: gvfs_rpath,
- install_dir: gvfs_pkglibdir,
- )
-
---
-2.20.1
-
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
deleted file mode 100644
index faf79aa4527..00000000000
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Virtual filesystem implementation for GIO"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-RESTRICT="!test? ( test )"
-# elogind/systemd only relevant to udisks (in v1.38.1)
-REQUIRED_USE="
- ?? ( elogind systemd )
- cdda? ( udev )
- google? ( gnome-online-accounts )
- gphoto2? ( udev )
- mtp? ( udev )
- udisks? ( udev )
-"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.57.2:2
- afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
- sys-apps/dbus
- app-crypt/gcr:=
- policykit? (
- >=sys-auth/polkit-0.114
- sys-libs/libcap )
- http? (
- dev-libs/libxml2:2
- >=net-libs/libsoup-2.58.0:2.4 )
- zeroconf? ( >=net-dns/avahi-0.6[dbus] )
- udev? ( >=dev-libs/libgudev-147:= )
- fuse? ( >=sys-fs/fuse-2.8.0:0 )
- udisks? ( >=sys-fs/udisks-1.97:2 )
- systemd? ( >=sys-apps/systemd-206:0= )
- elogind? ( >=sys-auth/elogind-229:0= )
- ios? (
- >=app-pda/libimobiledevice-1.2:=
- >=app-pda/libplist-1:= )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
- gnome-keyring? ( app-crypt/libsecret )
- bluray? ( media-libs/libbluray:= )
- mtp? (
- >=dev-libs/libusb-1.0.21
- >=media-libs/libmtp-1.1.15 )
- samba? ( >=net-fs/samba-4[client] )
- archive? ( app-arch/libarchive:= )
- cdda? (
- dev-libs/libcdio:0=
- >=dev-libs/libcdio-paranoia-0.78.2 )
- google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] )
- gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
- nfs? ( >=net-fs/libnfs-1.9.8 )
- net-misc/openssh
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/meson-0.49
- dev-util/glib-utils
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- dev-util/gdbus-codegen
-"
-
-PATCHES=(
- # from gnome-3-32 branch, fixes RPATH of libgvfsdaemon.so
- "${FILESDIR}"/${PV}-gvfsdaemon-rpath.patch
-)
-
-src_configure() {
- local enable_logind="false"
- if use systemd || use elogind; then
- enable_logind="true"
- fi
-
- local enable_gcrypt="false"
- if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
- enable_gcrypt="true"
- fi
-
- local enable_libusb="false"
- if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
- enable_libusb="true"
- fi
-
- local emesonargs=(
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
- $(meson_use policykit admin)
- $(meson_use ios afc)
- $(meson_use afp)
- $(meson_use archive)
- $(meson_use cdda)
- $(meson_use zeroconf dnssd)
- $(meson_use gnome-online-accounts goa)
- $(meson_use google)
- $(meson_use gphoto2)
- $(meson_use http)
- $(meson_use mtp)
- $(meson_use nfs)
- -Dsftp=true
- $(meson_use samba smb)
- $(meson_use udisks udisks2)
- $(meson_use bluray)
- $(meson_use fuse)
- -Dgcr=true
- -Dgcrypt=${enable_gcrypt}
- $(meson_use udev gudev)
- $(meson_use gnome-keyring keyring)
- -Dlogind=${enable_logind}
- -Dlibusb=${enable_libusb}
- -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
- -Dinstalled_tests=false
- -Dman=true
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
- gnome2_giomodule_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
- gnome2_giomodule_cache_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2019-08-03 17:54 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-08-03 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 1f76a59e7526df8676db8330b2046cb7bde24e31
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 17:53:23 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 17:53:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f76a59e
gnome-base/gvfs: bump to 1.40.2
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gvfs/Manifest | 1 +
.../gvfs/files/1.40.2-gvfsdaemon-rpath.patch | 35 ++++++
gnome-base/gvfs/gvfs-1.40.2.ebuild | 138 +++++++++++++++++++++
3 files changed, 174 insertions(+)
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 54e8010399d..7870697d8c3 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -2,3 +2,4 @@ DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa
DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
DIST gvfs-1.38.2.tar.xz 1202808 BLAKE2B 31150c10e042b262a55f4a072496138f47532ec55c2cae564d7c1a7a06b043bf131a91a633757fc02a0a31fc052a6ae64bd25d357cf60efa10b9490c6d1a9d84 SHA512 b6982f2c23cae057aebd00dab52b4f21f8bcef79fc5e97c098d54a9ebf997913f53146bd1760065454198c94a66f1bc1fc5325b08fea10e63a755fad87321488
DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175
+DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
diff --git a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
new file mode 100644
index 00000000000..e5d57941893
--- /dev/null
+++ b/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
@@ -0,0 +1,35 @@
+From 4fd68eb29aaf010468e154c737a03e04465aabb5 Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Thu, 18 Jul 2019 03:38:41 -0500
+Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so
+
+On Slackware development branch with gvfs-1.40.2, I just noticed this:
+ # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found"
+ libgvfscommon.so => not found
+
+After some backtracking, it seems that this first occurred in the
+switchover from autotools to meson in the 1.36.x --> 1.38.x bump.
+
+Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and
+assistance with troubleshooting this.
+
+Signed-off-by: Robby Workman <rworkman@slackware.com>
+---
+ daemon/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index 0ce0c204..f3ed404a 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library(
+ dependencies: deps,
+ c_args: cflags,
+ install: true,
++ install_rpath: gvfs_rpath,
+ install_dir: gvfs_pkglibdir,
+ )
+
+--
+2.20.1
+
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
new file mode 100644
index 00000000000..fab749fb5a6
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+ ?? ( elogind systemd )
+ cdda? ( udev )
+ google? ( gnome-online-accounts )
+ gphoto2? ( udev )
+ mtp? ( udev )
+ udisks? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.57.2:2
+ afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+ sys-apps/dbus
+ app-crypt/gcr:=
+ policykit? (
+ >=sys-auth/polkit-0.114
+ sys-libs/libcap )
+ http? (
+ dev-libs/libxml2:2
+ >=net-libs/libsoup-2.58.0:2.4 )
+ zeroconf? ( >=net-dns/avahi-0.6 )
+ udev? ( >=virtual/libgudev-147:= )
+ fuse? ( >=sys-fs/fuse-2.8.0:0 )
+ udisks? ( >=sys-fs/udisks-1.97:2 )
+ systemd? ( >=sys-apps/systemd-206:0= )
+ elogind? ( >=sys-auth/elogind-229:0= )
+ ios? (
+ >=app-pda/libimobiledevice-1.2:=
+ >=app-pda/libplist-1:= )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
+ gnome-keyring? ( app-crypt/libsecret )
+ bluray? ( media-libs/libbluray:= )
+ mtp? (
+ >=dev-libs/libusb-1.0.21
+ >=media-libs/libmtp-1.1.15 )
+ samba? ( >=net-fs/samba-4[client] )
+ archive? ( app-arch/libarchive:= )
+ cdda? (
+ dev-libs/libcdio:0=
+ >=dev-libs/libcdio-paranoia-0.78.2 )
+ google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] )
+ gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+ nfs? ( >=net-fs/libnfs-1.9.8 )
+ net-misc/openssh
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-util/meson-0.49
+ dev-util/glib-utils
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ dev-util/gdbus-codegen
+"
+
+PATCHES=(
+ # from gnome-3-32 branch, fixes RPATH of libgvfsdaemon.so
+ "${FILESDIR}"/${PV}-gvfsdaemon-rpath.patch
+)
+
+src_configure() {
+ local enable_logind="false"
+ if use systemd || use elogind; then
+ enable_logind="true"
+ fi
+
+ local enable_gcrypt="false"
+ if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+ enable_gcrypt="true"
+ fi
+
+ local enable_libusb="false"
+ if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+ enable_libusb="true"
+ fi
+
+ local emesonargs=(
+ -Dsystemduserunitdir="$(systemd_get_userunitdir)"
+ -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+ $(meson_use policykit admin)
+ $(meson_use ios afc)
+ $(meson_use afp)
+ $(meson_use archive)
+ $(meson_use cdda)
+ $(meson_use zeroconf dnssd)
+ $(meson_use gnome-online-accounts goa)
+ $(meson_use google)
+ $(meson_use gphoto2)
+ $(meson_use http)
+ $(meson_use mtp)
+ $(meson_use nfs)
+ -Dsftp=true
+ $(meson_use samba smb)
+ $(meson_use udisks udisks2)
+ $(meson_use bluray)
+ $(meson_use fuse)
+ -Dgcr=true
+ -Dgcrypt=${enable_gcrypt}
+ $(meson_use udev gudev)
+ $(meson_use gnome-keyring keyring)
+ -Dlogind=${enable_logind}
+ -Dlibusb=${enable_libusb}
+ -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+ -Dinstalled_tests=false
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+ gnome2_giomodule_cache_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2016-12-28 0:21 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-12-28 0:21 UTC (permalink / raw
To: gentoo-commits
commit: f9dae5d9bcf5eb2ac7e1c5ced41505588ac0a9ef
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 23:50:34 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 00:21:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9dae5d9
gnome-base/gvfs: fix build w/newer glibc #580234
gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch | 21 +++++++++++++++++++++
gnome-base/gvfs/gvfs-1.30.2.ebuild | 4 ++++
2 files changed, 25 insertions(+)
diff --git a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
new file mode 100644
index 00000000..b2d2a91
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
@@ -0,0 +1,21 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=776532
+https://bugs.gentoo.org/580234
+
+--- a/metadata/meta-daemon.c
++++ b/metadata/meta-daemon.c
+@@ -27,6 +27,7 @@
+ #include <glib/gstdio.h>
+ #include <locale.h>
+ #include <stdlib.h>
++#include <sys/sysmacros.h>
+ #include "metatree.h"
+ #include "gvfsdaemonprotocol.h"
+ #include "metadata-dbus.h"
+--- a/metadata/metatree.c
++++ b/metadata/metatree.c
+@@ -1,4 +1,5 @@
+ #include "config.h"
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
diff --git a/gnome-base/gvfs/gvfs-1.30.2.ebuild b/gnome-base/gvfs/gvfs-1.30.2.ebuild
index e9821e2..d417818 100644
--- a/gnome-base/gvfs/gvfs-1.30.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.30.2.ebuild
@@ -81,6 +81,10 @@ DEPEND="${RDEPEND}
# https://bugzilla.gnome.org/700162
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
+)
+
src_prepare() {
if ! use udev; then
sed -e 's/gvfsd-burn/ /' \
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-22 18:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-02 16:47 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2022-01-22 18:40 Mike Gilbert
2020-06-17 20:45 Mart Raudsepp
2019-08-03 17:54 Mart Raudsepp
2016-12-28 0:21 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox