Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (ee142d67e340d847c73248d250fd56fcae676f6c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (ee142d67e340d847c73248d250fd56fcae676f6c)
  • Date: Sat, 10 Mar 2012 22:55:35 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

net/libproxy/CONFIGURE | 1 +
net/libproxy/DEPENDS | 12 +++++++++---
net/libproxy/HISTORY | 4 ++++
3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit ee142d67e340d847c73248d250fd56fcae676f6c
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

libproxy: added option to choose which webkitgtk

diff --git a/net/libproxy/CONFIGURE b/net/libproxy/CONFIGURE
new file mode 100755
index 0000000..f3f472c
--- /dev/null
+++ b/net/libproxy/CONFIGURE
@@ -0,0 +1 @@
+config_query_list LIBPROXY_WEBKIT "Use which webkitgtk?" none gtk+2 gtk+3
diff --git a/net/libproxy/DEPENDS b/net/libproxy/DEPENDS
index 81ed597..d403840 100755
--- a/net/libproxy/DEPENDS
+++ b/net/libproxy/DEPENDS
@@ -1,10 +1,16 @@
depends -sub CXX gcc &&
depends cmake &&
depends libxmu &&
+
+if [ "$LIBPROXY_WEBKIT" == "gtk+2" ]; then
+ depends webkitgtk '-DWITH_WEBKIT3=0' ''
+
+elif [ "$LIBPROXY_WEBKIT" == "gtk+3" ]; then
+ depends webkitgtk3 '-DWITH_WEBKIT3=1' ''
+fi &&
+
optional_depends kdelibs4 '-DWITH_KDE4=1' '-DWITH_KDE4=0' 'KDE integration'
&&
optional_depends glib2 '-DWITH_GNOME3=1' '-DWITH_GNOME3=0' 'Gnome
support' &&
optional_depends xulrunner '' '' 'Mozilla support' &&
+optional_depends python '' '' "for Python bindings"

-optional_depends python '' '' "for Python bindings" &&
-
-optional_depends webkitgtk '' '' "Build WebKit JavaScriptCore PAC plugin"
diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index d76c22e..2016cfd 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,7 @@
+2012-03-10 Robin Cook <rcook AT wyrms.net>
+ * CONFIGURE: added option for which webkitgtk to use
+ * DEPENDS: changed to use configure option
+
2012-02-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.7
* DEPENDS: add cmake, adjust options



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (ee142d67e340d847c73248d250fd56fcae676f6c), Robin Cook, 03/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page