sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (afe189f7f6e1c7fe201a40f0470fdaed22724725)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (afe189f7f6e1c7fe201a40f0470fdaed22724725)
- Date: Mon, 16 Mar 2015 13:17:29 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
gnome2-libs/gnome-vfs2/CONFIGURE | 2 +-
gnome2-libs/gnome-vfs2/DEPENDS | 15 +++++----------
gnome2-libs/gnome-vfs2/HISTORY | 6 ++++--
3 files changed, 10 insertions(+), 13 deletions(-)
New commits:
commit afe189f7f6e1c7fe201a40f0470fdaed22724725
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnome-vfs2: fixed dependencies
commit b54e85b3bd00b4ea958a10824df7e469b6c61b49
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "gnome-vfs2: depends SSL"
This reverts commit 62a4eb831e56e3cf1b68d63c339cfcda251d39d6.
Reason: broken/scripted change
diff --git a/gnome2-libs/gnome-vfs2/CONFIGURE
b/gnome2-libs/gnome-vfs2/CONFIGURE
index 85c1846..a63ea54 100755
--- a/gnome2-libs/gnome-vfs2/CONFIGURE
+++ b/gnome2-libs/gnome-vfs2/CONFIGURE
@@ -1,6 +1,6 @@
config_query IPV6 "Enable IPV6 support?" n &&
-if spell_ok openssl; then
+if spell_ok openssl || spell_ok libressl; then
config_query_list GNOME_VFS_CRYPTO 'Use which encryption scheme?' \
openssl gnutls none
elif spell_ok gnutls; then
diff --git a/gnome2-libs/gnome-vfs2/DEPENDS b/gnome2-libs/gnome-vfs2/DEPENDS
index 0eb467f..a36aa42 100755
--- a/gnome2-libs/gnome-vfs2/DEPENDS
+++ b/gnome2-libs/gnome-vfs2/DEPENDS
@@ -1,14 +1,16 @@
+depends glib2 &&
depends libxml2 &&
depends gconf2 &&
depends gnome-mime-data2 &&
depends shared-mime-info &&
depends desktop-file-utils &&
+depends dbus &&
depends dbus-glib &&
-if [ "$GNOME_VFS_CRYPTO" == "SSL" ]; then
+if [ "$GNOME_VFS_CRYPTO" == "openssl" ]; then
depends SSL '--enable-openssl --disable-gnutls'
elif [ "$GNOME_VFS_CRYPTO" == "gnutls" ]; then
- depends gnutls '--disable-SSL --enable-gnutls'
+ depends gnutls '--disable-openssl --enable-gnutls'
fi &&
optional_depends neon \
@@ -78,11 +80,4 @@ fi &&
optional_depends libselinux \
'--enable-selinux' \
'--disable-selinux' \
- 'for SELinux support' &&
-
-depends bzip2 &&
-depends dbus &&
-depends FAM &&
-depends glib2 &&
-depends libxml2 &&
-depends LZMA
+ 'for SELinux support'
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index c073d27..0c0791f 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,5 +1,7 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added libressl check
+ * DEPENDS: use SSL provider; re-made FAM optional; removed duplicate
+ dependencies; removed non-direct dependencies
2013-06-11 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Fix compilation with newer glib2
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (afe189f7f6e1c7fe201a40f0470fdaed22724725), Vlad Glagolev, 03/16/2015
Archive powered by MHonArc 2.6.24.