[SM-Commit] GIT changes to master grimoire by George Sherwood (240b58811ee78537ad185a305cfbc0bf67d8f972)

George Sherwood scm at sourcemage.org
Thu May 7 11:05:34 EDT 2009


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

 http/arora/BUILD   |    2 +-
 http/arora/DEPENDS |   12 +-----------
 http/arora/DETAILS |   15 ++++++++++++---
 http/arora/HISTORY |    6 ++++++
 4 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit 240b58811ee78537ad185a305cfbc0bf67d8f972
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    arora: Added release version 0.6.1. Seems to only depend now on
    qt4 with webkit.

diff --git a/http/arora/BUILD b/http/arora/BUILD
index 7665a6e..8e70f9d 100755
--- a/http/arora/BUILD
+++ b/http/arora/BUILD
@@ -3,5 +3,5 @@ PATH="$QTDIR/bin/qt4:$PATH"          &&
 
 cd  "$SOURCE_DIRECTORY"              &&
 
-QT_WEBKIT=webkit_trunk  qmake        &&
+qmake &&
 make
diff --git a/http/arora/DEPENDS b/http/arora/DEPENDS
index 44360c3..c294d28 100755
--- a/http/arora/DEPENDS
+++ b/http/arora/DEPENDS
@@ -1,11 +1 @@
-depends  qt4  &&
-
-optional_depends  qtwebkit                              \
-                  ''                                    \
-                  ''                                    \
-                  'to use the devel version of WebKit'  &&
-
-if  ! is_depends_enabled  $SPELL  qtwebkit
-then
-  sub_depends  qt4  WEBKIT
-fi
+depends  -sub WEBKIT qt4
diff --git a/http/arora/DETAILS b/http/arora/DETAILS
index 6b18f1a..371a683 100755
--- a/http/arora/DETAILS
+++ b/http/arora/DETAILS
@@ -1,15 +1,24 @@
            SPELL=arora
-if [[ $ARORA_VCS_AUTOUPDATE == y ]]
+if [[ $ARORA_VCS == y ]]
 then
+  if [[ $ARORA_VCS_AUTOUPDATE == y ]]
+  then
          VERSION=$(date +%Y%m%d)
-else
+  else
          VERSION=git
-fi
+  fi
           SOURCE=$SPELL-git.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_URL[0]=git://github.com/Arora/arora.git:$SPELL-git
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=1
+else
+         VERSION=0.6.1
+          SOURCE=$SPELL-$VERSION.tar.gz
+      SOURCE_URL=http://arora.googlecode.com/files/$SOURCE
+     SOURCE_HASH=sha512:9e34ca6a0dfaecad60f6e90de214ef772256c16d9fb9e8fcb52e7ed9e8c81f9fbf6dfbbd155447a42e4e64d53a2f234349974b1fe795c5c1438bf04b161f30a4
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+fi
         WEB_SITE=http://code.google.com/p/arora/
          ENTERED=20080707
       LICENSE[0]=GPL
diff --git a/http/arora/HISTORY b/http/arora/HISTORY
index 500899c..f119e48 100644
--- a/http/arora/HISTORY
+++ b/http/arora/HISTORY
@@ -1,3 +1,9 @@
+2009-05-07 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Added released version 0.6.1
+	* BUILD: Changed to used just qmake
+	* DEPENDS: only depend qt4 with webkit
+	* PREPARE: Added to choose git version
+
 2009-02-10 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* PRE_BUILD: deleted, patches no longer work or seem needed
 



More information about the SM-Commit mailing list