[SM-Commit] GIT changes to master grimoire by George Sherwood (739b89059ad89fcfb80daed11f1a3ecd6bc5c4dc)

George Sherwood scm at sourcemage.org
Mon Feb 23 14:59:50 EST 2009


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 gnome2-libs/libsoup/BUILD     |    4 ++++
 gnome2-libs/libsoup/CONFIGURE |    1 +
 gnome2-libs/libsoup/DEPENDS   |   11 +++++------
 gnome2-libs/libsoup/HISTORY   |    5 ++++-
 4 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 739b89059ad89fcfb80daed11f1a3ecd6bc5c4dc
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    libsoup: If gnome support is requested, depends gonf2 and for devel
    version libproxy.

diff --git a/gnome2-libs/libsoup/BUILD b/gnome2-libs/libsoup/BUILD
new file mode 100755
index 0000000..a667d34
--- /dev/null
+++ b/gnome2-libs/libsoup/BUILD
@@ -0,0 +1,4 @@
+if [[ $LIBSOUP_GNOME == "n" ]]; then
+   OPTS="--without-gnome $OPTS"
+fi &&
+default_build
diff --git a/gnome2-libs/libsoup/CONFIGURE b/gnome2-libs/libsoup/CONFIGURE
new file mode 100755
index 0000000..518205d
--- /dev/null
+++ b/gnome2-libs/libsoup/CONFIGURE
@@ -0,0 +1 @@
+config_query LIBSOUP_GNOME "Build with gnome support?" y
diff --git a/gnome2-libs/libsoup/DEPENDS b/gnome2-libs/libsoup/DEPENDS
index 7ee8b3f..6f198bf 100755
--- a/gnome2-libs/libsoup/DEPENDS
+++ b/gnome2-libs/libsoup/DEPENDS
@@ -5,20 +5,19 @@ depends  libxml2       &&
 depends  glib2         &&
 depends  libgpg-error  &&
 
-if [[ ${LIBSOUP_DEVEL} == "y" ]]; then
+if [[ $LIBSOUP_DEVEL == "y" && $LIBSOUP_GNOME == "y" ]]; then
   depends libproxy
 fi &&
 
+if [[ $LIBSOUP_GNOME == "y" ]]; then
+  depends gconf2
+fi &&
+
 optional_depends gnutls \
                  "--enable-ssl" \
                  "--disable-ssl" \
                  "for GNUTLS' SSL support" &&
 
-optional_depends gconf2 \
-                 "" \
-                 "--without-gnome" \
-                 "for GNOME proxy support." &&
-
 optional_depends gtk-doc \
                  "--enable-gtk-doc" \
                  "--disable-gtk-doc" \
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index f5a6e6b..59f4e80 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,6 +1,9 @@
 2009-02-23 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to 2.25.91
-	* DEPENDS: devel version depends libproxy
+	* DEPENDS: devel with gnome depends libproxy
+	  All versions with gnome depend gconf2
+	* CONFIGURE: Added query for gnome support
+	* BUILD: Added to add option for no gnome support
 
 2009-02-21 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: Added optional_depends gconf2



More information about the SM-Commit mailing list