Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cdbe2447b9fda2ab5febec4bd181ee0bb9200312)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (cdbe2447b9fda2ab5febec4bd181ee0bb9200312)
  • Date: Tue, 22 May 2012 19:19:05 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnome2-libs/glib-networking/DEPENDS | 11 ++++++++---
gnome2-libs/glib-networking/HISTORY | 4 ++++
gnome2-libs/glib-networking/PRE_SUB_DEPENDS | 5 +++++
gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS | 5 +++++
gnome2-libs/glib-networking/SUB_DEPENDS | 6 ++++++
gnome2-libs/libsoup/DEPENDS | 7 +++----
gnome2-libs/libsoup/HISTORY | 3 +++
7 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit cdbe2447b9fda2ab5febec4bd181ee0bb9200312
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libsoup: requires glib-networking built with TLS support

commit 6477def14ee16e7855ba89595b6295ff636db8bd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

glib-networking: added TLS subdependency

diff --git a/gnome2-libs/glib-networking/DEPENDS
b/gnome2-libs/glib-networking/DEPENDS
index 8ac8121..1d643d5 100755
--- a/gnome2-libs/glib-networking/DEPENDS
+++ b/gnome2-libs/glib-networking/DEPENDS
@@ -1,4 +1,11 @@
-depends glib2 &&
+. "$GRIMOIRE/FUNCTIONS" &&
+
+depends glib2 &&
+
+if spell_ok glib2 && is_version_less $(installed_version glib2) 2.32; then
+ force_depends glib2
+fi &&
+
depends libgcrypt &&

optional_depends gnutls \
@@ -10,5 +17,3 @@ optional_depends ca-certificates \
"" \
"--without-ca-file" \
"for SSL root certificates"
-
-
diff --git a/gnome2-libs/glib-networking/HISTORY
b/gnome2-libs/glib-networking/HISTORY
index de921a0..df4351c 100644
--- a/gnome2-libs/glib-networking/HISTORY
+++ b/gnome2-libs/glib-networking/HISTORY
@@ -1,3 +1,7 @@
+2012-05-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: check glib2 version
+ * {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added, for TLS subdependency
+
2012-05-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.3

diff --git a/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
b/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0285932
--- /dev/null
+++ b/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ TLS) is_depends_enabled $SPELL gnutls;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS
b/gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..0285932
--- /dev/null
+++ b/gnome2-libs/glib-networking/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ TLS) is_depends_enabled $SPELL gnutls;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/gnome2-libs/glib-networking/SUB_DEPENDS
b/gnome2-libs/glib-networking/SUB_DEPENDS
new file mode 100755
index 0000000..6d80b74
--- /dev/null
+++ b/gnome2-libs/glib-networking/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ TLS) message "TLS support requested, forcing gnutls dependency" &&
+ depends gnutls "--with-gnutls";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/gnome2-libs/libsoup/DEPENDS b/gnome2-libs/libsoup/DEPENDS
index b7cf9bb..4635cdb 100755
--- a/gnome2-libs/libsoup/DEPENDS
+++ b/gnome2-libs/libsoup/DEPENDS
@@ -2,9 +2,10 @@ depends autoconf &&
depends automake &&
depends libtool &&
depends libxml2 &&
-depends glib2 &&
+depends glib2 &&
depends libgpg-error &&
depends sqlite &&
+depends -sub TLS glib-networking &&

if [[ $LIBSOUP_GNOME == "y" ]]; then
depends libproxy
@@ -16,9 +17,7 @@ if [[ $LIBSOUP_DEVEL == "y" ]]; then
sub_depends glib2 'GLIB_DEVEL'
fi &&

-depends glib-networking &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Build documenation with gtk-doc"
+ "Build documenation with gtk-doc"
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index aa5a00f..3804d4e 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,6 @@
+2012-05-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: requires glib-networking built with TLS support
+
2012-04-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.38.1




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cdbe2447b9fda2ab5febec4bd181ee0bb9200312), Vlad Glagolev, 05/22/2012

Archive powered by MHonArc 2.6.24.

Top of Page