[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8f0013482bd15bd9cec2c17226d12102d1d553d7)

Vlad Glagolev scm at sourcemage.org
Sun Jan 11 15:02:11 EST 2009


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 http/midori/BUILD     |    4 ++--
 http/midori/DEPENDS   |    2 +-
 http/midori/DETAILS   |    4 ++--
 http/midori/HISTORY   |    8 ++++++++
 http/midori/INSTALL   |    7 +++++--
 http/midori/PRE_BUILD |    4 ++--
 http/midori/PROVIDES  |    2 ++
 http/midori/midori.sh |   14 ++++++++++++++
 8 files changed, 36 insertions(+), 9 deletions(-)

New commits:
commit 8f0013482bd15bd9cec2c17226d12102d1d553d7
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    midori: fixed for supporting external plugins

diff --git a/http/midori/BUILD b/http/midori/BUILD
index d52ca84..c010c37 100755
--- a/http/midori/BUILD
+++ b/http/midori/BUILD
@@ -1,6 +1,6 @@
-if [ "$MIDORI_WAF" = 'n' ]; then
+if [[ $MIDORI_WAF == n ]]; then
   default_build
 else
   ./waf --prefix=${INSTALL_ROOT}/usr configure &&
-  ./waf build                                  
+  ./waf build
 fi
diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index dbf6c88..3caf66c 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -1,7 +1,7 @@
 depends gtk+2 &&
 depends webkitgtk &&
 depends libxml2 &&
-if [ "$MIDORI_WAF" = 'y' ]; then 
+if [[ $MIDORI_WAF == y ]]; then 
   depends python  &&
   optional_depends unique  "" "" "provide libUnique support" &&
   optional_depends sqlite  "" "" "enable save history between sessions" &&
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 51313e7..75a8bda 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -15,11 +15,11 @@ else
    SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
      SOURCE_HASH=sha512:e5e459fed675e9e5c971ed6babefcc51df70dd03d3debaa1ae0a4f6a6df88817189820169b557b24cf3adb6aaf8b3a858252c6ab57f4e50c5eeb698e2431362a
 fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://software.twotoasts.de/?page=midori
       LICENSE[0]=GPL
          ENTERED=20071209
-           SHORT="Midori is a lightweight web browser"
+           SHORT="lightweight web browser"
 cat << EOF
 Midori is a lightweight web browser.
 
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index f9ba1fe..ed2ed5a 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,11 @@
+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
+	* BUILD: removed extra spaces on a line; cleaned up; added some bashism
+	* DEPENDS, INSTALL: added some more bashism
+	* PRE_BUILD: quoting paths; added more bashism; install .plugins dir
+	* midori.sh: added; needed for external plugins' functionality
+
 2008-12-01 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 0.1.1
 
diff --git a/http/midori/INSTALL b/http/midori/INSTALL
index c8e49e9..d8dffb4 100755
--- a/http/midori/INSTALL
+++ b/http/midori/INSTALL
@@ -1,5 +1,8 @@
-if [ "$MIDORI_WAF" = 'y' ]; then
+if [[ $MIDORI_WAF == y ]]; then
   ./waf install
 else
   default_install
-fi
+fi &&
+
+# install dir for additional plugins
+install -vm 755 -d "$INSTALL_ROOT/usr/lib/midori/.plugins"
diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
index 83e46f0..34e0ba2 100755
--- a/http/midori/PRE_BUILD
+++ b/http/midori/PRE_BUILD
@@ -1,6 +1,6 @@
 default_pre_build &&
-if [ "$MIDORI_WAF" = 'n' ]; then
-  cd $SOURCE_DIRECTORY &&
+if [[ $MIDORI_WAF == n ]]; then
+  cd "$SOURCE_DIRECTORY" &&
   intltoolize --copy --force --automake &&
   libtoolize --copy --force || glibtoolize --copy --force &&
   aclocal &&
diff --git a/http/midori/PROVIDES b/http/midori/PROVIDES
new file mode 100755
index 0000000..63fa884
--- /dev/null
+++ b/http/midori/PROVIDES
@@ -0,0 +1,2 @@
+WEB-BROWSER
+NS-PLUGIN-COMPATIBLE
diff --git a/http/midori/midori.sh b/http/midori/midori.sh
new file mode 100644
index 0000000..1a58bb0
--- /dev/null
+++ b/http/midori/midori.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# First check if this variable is already set
+# then if not set, check it (maybe), then set it
+#
+# Set MOZ_PLUGIN_PATH for midori which need
+# the plugins (e.g. flash) in default path
+#
+
+if [ -z "$MOZ_PLUGIN_PATH" -a ! -f /etc/profile.d/midori.sh ]; then
+	MOZ_PLUGIN_PATH="/usr/lib/midori/.plugins"
+fi &&
+
+export MOZ_PLUGIN_PATH



More information about the SM-Commit mailing list