Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (c2b26388f4e5e2a6a70b2c6a6420ca4af29b70d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (c2b26388f4e5e2a6a70b2c6a6420ca4af29b70d1)
  • Date: Tue, 13 Jan 2009 18:41:35 -0600

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

http/midori/BUILD | 8 ++------
http/midori/CONFIGURE | 1 -
http/midori/DEPENDS | 15 ++++-----------
http/midori/DETAILS | 4 ++--
http/midori/HISTORY | 8 ++++++++
http/midori/INSTALL | 6 +-----
http/midori/PRE_BUILD | 10 ----------
7 files changed, 17 insertions(+), 35 deletions(-)

New commits:
commit c2b26388f4e5e2a6a70b2c6a6420ca4af29b70d1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

midori: Updated to version 0.1.2. No loner any option
to build with autotools

diff --git a/http/midori/BUILD b/http/midori/BUILD
index c010c37..65c8900 100755
--- a/http/midori/BUILD
+++ b/http/midori/BUILD
@@ -1,6 +1,2 @@
-if [[ $MIDORI_WAF == n ]]; then
- default_build
-else
- ./waf --prefix=${INSTALL_ROOT}/usr configure &&
- ./waf build
-fi
+./waf --prefix=${INSTALL_ROOT}/usr configure &&
+./waf build
diff --git a/http/midori/CONFIGURE b/http/midori/CONFIGURE
deleted file mode 100755
index b2b974b..0000000
--- a/http/midori/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query MIDORI_WAF "Do you want to use waf to configure midori?
(recommended, requires python)" y
diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index 3caf66c..c369b51 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -1,15 +1,8 @@
depends gtk+2 &&
depends webkitgtk &&
depends libxml2 &&
-if [[ $MIDORI_WAF == y ]]; then
- depends python &&
- optional_depends unique "" "" "provide libUnique support" &&
- optional_depends sqlite "" "" "enable save history between sessions" &&
- optional_depends libsoup "" "" "enable icons, save as and view source
functions"
-else
- depends libtool &&
- depends xml-parser-expat &&
- depends intltool
-fi &&
-
+depends python &&
+optional_depends unique "" "" "provide libUnique support" &&
+optional_depends sqlite "" "" "enable save history between sessions" &&
+optional_depends libsoup "" "" "enable icons, save as and view source
functions" &&
optional_depends gnome-icon-theme "" "" "for all the icons"
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 75a8bda..2244ebd 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -10,10 +10,10 @@ if [[ $MIDORI_VCS == y ]]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.1.1
+ VERSION=0.1.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:e5e459fed675e9e5c971ed6babefcc51df70dd03d3debaa1ae0a4f6a6df88817189820169b557b24cf3adb6aaf8b3a858252c6ab57f4e50c5eeb698e2431362a
+
SOURCE_HASH=sha512:abd510b1a049a8bfce06720ad81edd3b7adb7ed94f458411611498d2d7bafe485072b7233a3019120d108214b5e21d7fc3a856a12dbb54523bbb19bb592aa82e
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://software.twotoasts.de/?page=midori
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index ed2ed5a..a7b87ed 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,11 @@
+2009-01-13 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 0.1.2
+ * CONFIGURE: Removed. Upstream removed option to build without waf
+ * PRE_BUILD: Removed. See above.
+ * BUILD: Remove non-waf option
+ * INSTALL: Remove non-waf option
+ * DEPENDS: Removed depends for non-waf option
+
2009-01-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: quoting paths; fixed short desc
* PROVIDES: added, midori is a web-browser, too, and ns-plugin
compatible
diff --git a/http/midori/INSTALL b/http/midori/INSTALL
index 3787cdf..fec962e 100755
--- a/http/midori/INSTALL
+++ b/http/midori/INSTALL
@@ -1,8 +1,4 @@
-if [[ $MIDORI_WAF == y ]]; then
- ./waf install
-else
- default_install
-fi &&
+ ./waf install &&

cp -v "$SPELL_DIRECTORY/midori.sh" "$INSTALL_ROOT/etc/profile.d" &&

diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
deleted file mode 100755
index 34e0ba2..0000000
--- a/http/midori/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-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 George Sherwood (c2b26388f4e5e2a6a70b2c6a6420ca4af29b70d1), George Sherwood, 01/13/2009

Archive powered by MHonArc 2.6.24.

Top of Page