Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (986a536790ed756b0147f680324da9ede1dcfc89)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (986a536790ed756b0147f680324da9ede1dcfc89)
  • Date: Mon, 15 Mar 2010 04:12:58 -0500

GIT changes to master grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

http/uzbl/CONFIGURE | 10 ++++++++++
http/uzbl/DEPENDS | 22 +++++++++++++++-------
http/uzbl/DETAILS | 9 +++++++++
http/uzbl/INSTALL | 9 +++++++++
http/uzbl/PREPARE | 3 +++
5 files changed, 46 insertions(+), 7 deletions(-)

New commits:
commit e521585d3a9ff55fdbd924a22950645b3a73bd9d
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

uzbl: added release version and added options as to what can be built

diff --git a/http/uzbl/CONFIGURE b/http/uzbl/CONFIGURE
new file mode 100755
index 0000000..56be088
--- /dev/null
+++ b/http/uzbl/CONFIGURE
@@ -0,0 +1,10 @@
+. $GRIMOIRE/config_query_multi.function
+message "all - everything listed" &&
+message "uzbl-core - just the core interface with no pre-existing scripts" &&
+message "uzbl-browser - full browser with supporting scripts" &&
+message "uzbl-tabbed - supporting script that manages uzbl windows and
nothing else" &&
+config_query_multi UZBL_INSTALL "What do you wish to install?" \
+ all \
+ uzbl-core \
+ uzbl-browser \
+ uzbl-tabbed
diff --git a/http/uzbl/DEPENDS b/http/uzbl/DEPENDS
index 57d9a3d..ba9cbbf 100755
--- a/http/uzbl/DEPENDS
+++ b/http/uzbl/DEPENDS
@@ -1,13 +1,21 @@
-depends git &&
+. $GRIMOIRE/FUNCTIONS
+if [[ $UZBL_SCM == y ]]; then
+depends git
+fi &&
depends pkgconfig &&
depends webkitgtk &&
+simple_version_check_force_depends webkitgtk 1115 4
depends gtk+2 &&
depends libxt &&
suggest_depends dmenu \
- "" \
- "" \
- "For some support scripts" &&
+ "" \
+ "" \
+ "For some support scripts" &&
suggest_depends zenity \
- "" \
- "" \
- "For some support scripts"
+ "" \
+ "" \
+ "For some support scripts" &&
+suggest_depends python \
+ "" \
+ "" \
+ "For support scripts - uzbl-browser and tabbed make use of
this heavily"
diff --git a/http/uzbl/DETAILS b/http/uzbl/DETAILS
index 956f16b..dda0e39 100755
--- a/http/uzbl/DETAILS
+++ b/http/uzbl/DETAILS
@@ -1,4 +1,5 @@
SPELL=uzbl
+if [[ $UZBL_SCM == y ]]; then
if [[ $UZBL_AUTO == y ]]; then
VERSION=$(date +%Y%m%d)
else
@@ -9,6 +10,14 @@ fi
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+else
+ VERSION=2010.03.14
+ VERGITHASH=38ef86e
+ SOURCE="Dieterbe-${SPELL}-$VERGITHASH.tar.gz"
+
SOURCE_HASH=sha512:d90cd65b8617a85eba92abbf2173d5786ef801f8703197fe050fdeee0304d9c89b561379f83c9e2c85ba008887f77e37c2e311ea34dffb43fd34c0d014a9c7ea
+ SOURCE_URL[0]=http://github.com/Dieterbe/uzbl/tarball/$VERSION
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Dieterbe-${SPELL}-$VERGITHASH"
+fi
WEB_SITE="http://www.uzbl.org/";
LICENSE[0]=GPLv3
ENTERED=20090502
diff --git a/http/uzbl/INSTALL b/http/uzbl/INSTALL
index 621f3f8..5ad2a2a 100755
--- a/http/uzbl/INSTALL
+++ b/http/uzbl/INSTALL
@@ -1 +1,10 @@
+if [[ $UZBL_INSTALL == uzbl-core ]]; then
+make PREFIX=${INSTALL_ROOT}/usr install-uzbl-core
+elif [[ $UZBL_INSTALL == uzbl-browser ]]; then
+make PREFIX=${INSTALL_ROOT}/usr install-uzbl-browser
+elif [[ $UZBL_INSTALL == uzbl-tabbed ]]; then
+make PREFIX=${INSTALL_ROOT}/usr install-uzbl-tabbed
+else
make PREFIX=${INSTALL_ROOT}/usr install
+fi
+
diff --git a/http/uzbl/PREPARE b/http/uzbl/PREPARE
index 58397cb..26d363f 100755
--- a/http/uzbl/PREPARE
+++ b/http/uzbl/PREPARE
@@ -1,3 +1,6 @@
+config_query UZBL_SCM "Do you want to use the SCM version?" n &&
+if [[ $UZBL_SCM == y ]] ; then
config_query UZBL_AUTO \
"Automaticaly update the spell on sorcery queue/system-update?" \
"n"
+fi



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (986a536790ed756b0147f680324da9ede1dcfc89), Andraž Levstik, 03/15/2010

Archive powered by MHonArc 2.6.24.

Top of Page