diff options
| author | rm <rm@FreeBSD.org> | 2016-03-22 01:26:06 +0800 |
|---|---|---|
| committer | rm <rm@FreeBSD.org> | 2016-03-22 01:26:06 +0800 |
| commit | 37736a001cbb9d5f80f465e59b029588f35a2e45 (patch) | |
| tree | 429c37e117fd474adb16cfda736e59b3891fbb4d /devel/gvfs/files | |
| parent | 2b4f3053d436a6fe7e7ca30af02b58c434673d39 (diff) | |
| download | freebsd-ports-gnome-37736a001cbb9d5f80f465e59b029588f35a2e45.tar.gz freebsd-ports-gnome-37736a001cbb9d5f80f465e59b029588f35a2e45.tar.zst freebsd-ports-gnome-37736a001cbb9d5f80f465e59b029588f35a2e45.zip | |
devel/gvfs: drop dependency upon libgnome-keyring
1. gvfs switched from libgnome-keyring to libsecret since 1.13.7, so update our
port accordingly. Also enable build with keyring support (it was unconditionally
disabled with --disable-keyring)
2. HAL tweaks were released upstream since version 1.25.x or earlier, so remove
it from our port too. See bug [1] and commit [2] for the reference.
[1] https://bugzilla.gnome.org/show_bug.cgi?id=722411
[2] https://git.gnome.org/browse/gvfs/commit/?id=32377d1
Differential Revision: https://reviews.freebsd.org/D5694
Reviewed by: kwm
With hat: gnome
Diffstat (limited to 'devel/gvfs/files')
| -rw-r--r-- | devel/gvfs/files/common_Makefile.am | 18 | ||||
| -rw-r--r-- | devel/gvfs/files/monitor_hal_Makefile.am | 10 |
2 files changed, 0 insertions, 28 deletions
diff --git a/devel/gvfs/files/common_Makefile.am b/devel/gvfs/files/common_Makefile.am deleted file mode 100644 index 5cd673a4c1dc..000000000000 --- a/devel/gvfs/files/common_Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ ---- common/Makefile.am.orig 2015-02-13 07:19:44 UTC -+++ common/Makefile.am -@@ -43,6 +43,15 @@ libgvfscommon_la_LIBADD = \ - $(GLIB_LIBS) \ - $(BLURAY_LIBS) - -+if USE_HAL -+libgvfscommon_la_SOURCES += \ -+ gvfsdbusutils.c gvfsdbusutils.h -+libgvfscommon_la_CFLAGS += \ -+ $(DBUS_CFLAGS) -+libgvfscommon_la_LIBADD = \ -+ $(DBUS_LIBS) -+endif -+ - libgvfscommon_monitor_la_SOURCES = \ - gvfsmountinfo.h gvfsmountinfo.c \ - $(NULL) diff --git a/devel/gvfs/files/monitor_hal_Makefile.am b/devel/gvfs/files/monitor_hal_Makefile.am deleted file mode 100644 index f6f626b4bc83..000000000000 --- a/devel/gvfs/files/monitor_hal_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- monitor/hal/Makefile.am.orig 2015-02-03 15:52:20 UTC -+++ monitor/hal/Makefile.am -@@ -23,7 +23,6 @@ gvfs_hal_volume_monitor_SOURCES = \ - ghalvolume.c ghalvolume.h \ - ghalmount.c ghalmount.h \ - ghalvolumemonitor.c ghalvolumemonitor.h \ -- gvfsdbusutils.c gvfsdbusutils.h \ - $(NULL) - - gvfs_hal_volume_monitor_CFLAGS = \ |