Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3c4107004e1cb95089a18629d2bf2d2e946d4e9d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3c4107004e1cb95089a18629d2bf2d2e946d4e9d)
  • Date: Mon, 8 Sep 2008 17:12:04 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

http/midori/BUILD | 4 ++++
http/midori/CONFIGURE | 1 +
http/midori/DEPENDS | 11 +++++++++--
http/midori/INSTALL | 4 ++++
http/midori/PRE_BUILD | 10 ++++++++++
5 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit e9fdd22f8998ee53b52f5891c8dde80c68b3ac0b
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

midori: works without python again

diff --git a/http/midori/BUILD b/http/midori/BUILD
index 27e176d..d52ca84 100755
--- a/http/midori/BUILD
+++ b/http/midori/BUILD
@@ -1,2 +1,6 @@
+if [ "$MIDORI_WAF" = 'n' ]; then
+ default_build
+else
./waf --prefix=${INSTALL_ROOT}/usr configure &&
./waf build
+fi
diff --git a/http/midori/CONFIGURE b/http/midori/CONFIGURE
new file mode 100755
index 0000000..26af001
--- /dev/null
+++ b/http/midori/CONFIGURE
@@ -0,0 +1 @@
+config_query MIDORI_WAF "Do you want to use waf to configure midori?
(recommenden, requires python)" y
diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index 7927df6..86fe2d7 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -2,6 +2,13 @@ depends gtk+2 &&
depends webkitgtk &&
depends libsexy &&
depends libxml2 &&
-depends python &&
+if [ "$MIDORI_WAF" = 'y' ]; then
+ depends python
+else
+ depends libtool &&
+ depends xml-parser-expat &&
+ depends intltool
+fi &&

-optional_depends gnome-icon-theme "" "" "for all the icons"
+optional_depends gnome-icon-theme "" "" "for all the icons" &&
+optional_depends gtksourceview "" "" "enable view source"
diff --git a/http/midori/INSTALL b/http/midori/INSTALL
index 0ba76dc..c8e49e9 100755
--- a/http/midori/INSTALL
+++ b/http/midori/INSTALL
@@ -1 +1,5 @@
+if [ "$MIDORI_WAF" = 'y' ]; then
./waf install
+else
+ default_install
+fi
diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
new file mode 100755
index 0000000..83e46f0
--- /dev/null
+++ b/http/midori/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+if [ "$MIDORI_WAF" = 'n' ]; then
+ cd $SOURCE_DIRECTORY &&
+ intltoolize --copy --force --automake &&
+ libtoolize --copy --force || glibtoolize --copy --force &&
+ aclocal &&
+ autoheader &&
+ autoconf &&
+ automake --add-missing --copy
+fi



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3c4107004e1cb95089a18629d2bf2d2e946d4e9d), Arjan Bouter, 09/08/2008

Archive powered by MHonArc 2.6.24.

Top of Page