Source Mage code commit list

[Robin Cook <scm AT sourcemage.org>]

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

 http/eflwebkit/BUILD                             |   20 +++++++++++++++++---
 http/eflwebkit/CONFIGURE                         |   16 ++++++++++++++++
 http/eflwebkit/DEPENDS                           |   22 
++++++++++++++++++----
 http/eflwebkit/DETAILS                           |   17 +++++++++++++----
 http/eflwebkit/HISTORY                           |    9 +++++++++
 http/eflwebkit/INSTALL                           |    1 +
 http/eflwebkit/PREPARE                           |    5 ++---
 http/eflwebkit/PRE_BUILD                         |    6 ++++--
 http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig |binary
 9 files changed, 80 insertions(+), 16 deletions(-)

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

    eflwebkit: added option to build snapshot since scm is broken currently.

diff --git a/http/eflwebkit/BUILD b/http/eflwebkit/BUILD
index def58e1..82cbdc4 100755
--- a/http/eflwebkit/BUILD
+++ b/http/eflwebkit/BUILD
@@ -1,6 +1,20 @@
-cd  "$SOURCE_DIRECTORY"  &&
-mkdir  build             &&
+if [ "$EFLWEBKIT_NETWORK" == "libsoup" ]; then
+   OPTS="-DNETWORK_BACKEND=soup $OPTS"
+else
+   OPTS="-DNETWORK_BACKEND=curl $OPTS"
+fi
 
-cmake $SOURCE_DIRECTORY/Source -DPORT=Efl -DSHARED_CORE=OFF 
-DCMAKE_BUILD_TYPE=Release  &&
+OPTS="$EFLWEBKIT_GLIB $EFLWEBKIT_VIDEO $EFLWEBKIT_GEO $OPTS"  &&
+#OPTS="$EFLWEBKIT_NPAPI $OPTS"  &&
+
+OPTS="-DENABLE_ORIENTATION_EVENTS=ON -DCMAKE_BUILD_TYPE=Release $OPTS" &&
+OPTS="-DENABLE_FULLSCREEN_API=ON -DENABLE_NOTIFICATIONS=ON $OPTS"      &&
+OPTS="-DENABLE_BLOB=ON -DENABLE_DATAGRID=ON $OPTS"                     &&
+OPTS="-DPORT=Efl -DCMAKE_INSTALL_PREFIX=/usr $OPTS"                    &&
+
+mkdir  build  &&
+cd build      &&
+
+cmake $OPTS ../Source  &&
 
 make
diff --git a/http/eflwebkit/CONFIGURE b/http/eflwebkit/CONFIGURE
new file mode 100755
index 0000000..3a5defe
--- /dev/null
+++ b/http/eflwebkit/CONFIGURE
@@ -0,0 +1,16 @@
+config_query_option EFLWEBKIT_GLIB "Enable building with glib2?" y           
\
+                    "-DENABLE_GLIB_SUPPORT=ON" "-DENABLE_GLIB_SUPPORT=OFF"   
&&
+
+config_query_list EFLWEBKIT_NETWORK                                          
\
+          "Build with which network backend? (libsoup will turn on glib2)"   
\
+                  libsoup curl                                               
&&
+
+config_query_option EFLWEBKIT_VIDEO                                          
\
+                    "Enable gstreamer video support (will turn on glib2)?" y 
\
+                    "-DVIDEO=gstreamer" "-DVIDEO=OFF"                        
&&
+
+config_query_option EFLWEBKIT_GEO "Enable geolocation?" y                    
\
+                    "-DENABLE_GEOLOCATION=ON" "-DENABLE_GEOLOCATION=OFF"     
+
+#config_query_option EFLWEBKIT_NPAPI "Enable Netscape Plugin API?" n         
 \
+#          "ENABLE_NETSCAPE_PLUGIN_API=ON" "ENABLE_NETSCAPE_PLUGIN_API=OFF"  
diff --git a/http/eflwebkit/DEPENDS b/http/eflwebkit/DEPENDS
index f0ad26f..fc90423 100755
--- a/http/eflwebkit/DEPENDS
+++ b/http/eflwebkit/DEPENDS
@@ -10,10 +10,7 @@ depends libxt       &&
 depends fontconfig  &&
 depends cairo       &&
 depends freetype2   &&
-depends glib2       &&
-depends libsoup     &&
-depends gtk+2       &&
-depends gstreamer   &&
+depends mesalib     &&
 depends cmake       &&
 depends eina        &&
 depends eet         &&
@@ -21,3 +18,20 @@ depends evas        &&
 depends ecore       &&
 depends edje        &&
 depends embryo      
+
+
+if [ "$EFLWEBKIT_NETWORK" == "curl" ]; then
+   depends curl
+else
+   depends libsoup
+fi  &&
+
+if [ "$EFLWEBKIT_VIDEO" == "-DVIDEO=gstreamer" ]; then
+   depends gstreamer
+fi  &&
+
+if [ "$EFLWEBKIT_GLIB" == "-DENABLE_GLIB_SUPPORT=ON" ] || \
+   [ "$EFLWEBKIT_NETWORK" == "libsoup" ] ||  \
+   [ "EFLWEBKIT_VIDEO" == "-DVIDEO=gstreamer" ]; then
+   depends glib2
+fi 
diff --git a/http/eflwebkit/DETAILS b/http/eflwebkit/DETAILS
index d2b1407..098b50b 100755
--- a/http/eflwebkit/DETAILS
+++ b/http/eflwebkit/DETAILS
@@ -1,17 +1,26 @@
            SPELL=eflwebkit
-if [ "$EFLWEBKIT_AUTOUPDATE" == "y" ]; then
+if [ "$EFLWEBKIT_BRANCH" == "scm" ]; then
+  if [ "$EFLWEBKIT_AUTOUPDATE" == "y" ]; then
          VERSION=$(date +%Y%m%d)
-else
+  else
          VERSION=svn
-fi
+  fi
           SOURCE=$SPELL-svn.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_URL[0]=svn_http://svn.webkit.org/repository/webkit/trunk:$SPELL-svn
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=1
+else
+        SRC_FILE=webkit-efl-svn
+         VERSION=r98964
+          SOURCE=$SRC_FILE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$SRC_FILE-$VERSION
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+   SOURCE_URL[0]=http://packages.profusion.mobi/webkit-efl/$SOURCE
+fi
+      LICENSE[0]=GPL
         WEB_SITE=http://trac.webkit.org/wiki/EFLWebKit
          ENTERED=20111113
-      LICENSE[0]=GPL
         KEYWORDS="engine http"
            SHORT="A EFL backport of the WebKit web browser engine"
 cat << EOF
diff --git a/http/eflwebkit/HISTORY b/http/eflwebkit/HISTORY
index a4725f8..7039131 100644
--- a/http/eflwebkit/HISTORY
+++ b/http/eflwebkit/HISTORY
@@ -1,2 +1,11 @@
+2011-12-27 Robin Cook <rcook AT wyms.net>
+       * PREPARE: changed to query branch
+       * DETAILS: modified for branch query
+       * CONFIGURE: added for build options
+       * DEPENDS: changed to set for build options
+       * PRE_BUILD: modifed for branch query
+       * BUILD: modified for build options
+       * INSTALL: added to make sure install correctly
+
 2011-11-13 Robin Cook <rcook AT wyrms.net>
        * New Spell: DETAILS, DEPENDS, PRE_BUILD, BUILD
diff --git a/http/eflwebkit/INSTALL b/http/eflwebkit/INSTALL
new file mode 100644
index 0000000..fc36c95
--- /dev/null
+++ b/http/eflwebkit/INSTALL
@@ -0,0 +1 @@
+make install DESTDIR=/
diff --git a/http/eflwebkit/PREPARE b/http/eflwebkit/PREPARE
index 12f9b93..282c296 100755
--- a/http/eflwebkit/PREPARE
+++ b/http/eflwebkit/PREPARE
@@ -1,3 +1,2 @@
-config_query  EFLWEBKIT_AUTOUPDATE  \
-              "Automatically update on every system update?"  n
-
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch snaptshot scm
diff --git a/http/eflwebkit/PRE_BUILD b/http/eflwebkit/PRE_BUILD
index b674359..3e07b9a 100755
--- a/http/eflwebkit/PRE_BUILD
+++ b/http/eflwebkit/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
 
-patch -p1 < $SCRIPT_DIRECTORY/eflwebkit-local.patch
+if [ "$EFLWEBKIT_BRANCH" == "scm" ]; then
+   cd $SOURCE_DIRECTORY  &&
+   patch -p1 < $SCRIPT_DIRECTORY/eflwebkit-local.patch
+fi
diff --git a/http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig 
b/http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig
new file mode 100644
index 0000000..0de8280
Binary files /dev/null and b/http/eflwebkit/webkit-efl-svn-r98964.tar.bz2.sig 
differ