Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (1c9b1892167cfa88a85d075b439b61c84acc8890)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Mathieu Lonjaret <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (1c9b1892167cfa88a85d075b439b61c84acc8890)
  • Date: Sat, 23 Aug 2008 10:09:19 -0500

GIT changes to master grimoire by Mathieu Lonjaret <lejatorn AT sourcemage.org>:

http/midori/BUILD | 18 +++++++++++-------
http/midori/DEPENDS | 1 +
http/midori/HISTORY | 4 ++++
http/midori/INSTALL | 5 +++++
4 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit 1c9b1892167cfa88a85d075b439b61c84acc8890
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

midori: fixed git install, added python dep

diff --git a/http/midori/BUILD b/http/midori/BUILD
index 4fcde59..e447bd4 100755
--- a/http/midori/BUILD
+++ b/http/midori/BUILD
@@ -1,10 +1,14 @@
-OPTS="--prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
+if [[ $MIDORI_VCS == y ]]; then
+ ./waf --prefix=${INSTALL_ROOT}/usr configure &&
+ ./waf build
+else
+ OPTS="--prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
--mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
$OPTS" &&

-./autogen.sh $OPTS &&
-
-make
+ ./autogen.sh $OPTS &&
+ make
+fi
diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index e7b5059..7927df6 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -2,5 +2,6 @@ depends gtk+2 &&
depends webkitgtk &&
depends libsexy &&
depends libxml2 &&
+depends python &&

optional_depends gnome-icon-theme "" "" "for all the icons"
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 6d8b360..6c2e6ba 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+2008-08-23 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * BUILD, INSTALL: fixed git build
+ * DEPENDS: added python (required by build scripts)
+
2008-08-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: Changed SOURCE_URL[0] extension, updated spell to 0.0.19

diff --git a/http/midori/INSTALL b/http/midori/INSTALL
new file mode 100755
index 0000000..9a2e9d9
--- /dev/null
+++ b/http/midori/INSTALL
@@ -0,0 +1,5 @@
+if [[ $MIDORI_VCS == y ]]; then
+ ./waf install
+else
+ default_install
+fi



  • [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (1c9b1892167cfa88a85d075b439b61c84acc8890), Mathieu Lonjaret, 08/23/2008

Archive powered by MHonArc 2.6.24.

Top of Page