Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (7803433d2dffc063758ac161ae694565111805df)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (7803433d2dffc063758ac161ae694565111805df)
  • Date: Mon, 7 Jul 2014 00:15:41 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

http/midori/DEPENDS | 41 +++++++++++++++++++++++------------------
http/midori/DETAILS | 6 +++---
http/midori/DOWNLOAD | 8 ++++++++
http/midori/HISTORY | 4 ++++
http/midori/PRE_BUILD | 12 ++++++++----
5 files changed, 46 insertions(+), 25 deletions(-)

New commits:
commit 7803433d2dffc063758ac161ae694565111805df
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/midori: git -> bzr, converted to cmake build system completely

diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index a37eea8..3c4d498 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -1,44 +1,49 @@
+depends cmake &&
+depends libnotify &&
depends libxml2 &&
depends libsoup &&
depends python &&
depends sqlite &&
depends vala &&

+if [[ "$MIDORI_BRANCH" == "scm" ]]; then
+ depends bzr
+fi &&
+
optional_depends gtk+3 \
- "--enable-gtk3" \
- "--disable-gtk3" \
+ "-DUSE_GTK3=ON" \
+ "-DUSE_GTK3=OFF" \
"use GTK3 instead of GTK2?" &&

if is_depends_enabled $SPELL gtk+3 ; then
- depends webkitgtk3
+ depends webkitgtk3 &&
+ optional_depends granite \
+ "-DUSE_GRANITE=ON" \
+ "-DUSE_GRANITE=OFF" \
+ "for fancy notebook and pop-overs"
else
depends gtk+2 &&
depends webkitgtk
fi &&

optional_depends gettext \
- "--enable-nls" \
- "--disable-nls" \
+ "-DENABLE_NLS=1" \
+ "-DENABLE_NLS=0" \
"for native language support" &&

-optional_depends libnotify \
- "" \
- "--disable-libnotify" \
- "for notification support" &&
+optional_depends gobject-introspection \
+ "-DUSE_GIR=ON" \
+ "-DUSE_GIR=OFF" \
+ "generate GObject Introspection bindings" &&

optional_depends libzeitgeist \
- "--enable-zeitgeist" \
- "--disable-zeitgeist" \
+ "-DUSE_ZEITGEIST=ON" \
+ "-DUSE_ZEITGEIST=OFF" \
"for Zeitgeist history integration" &&

-optional_depends unique \
- "--enable-unique" \
- "--disable-unique" \
- "for single instance support" &&
-
optional_depends gtk-doc \
- "--enable-apidocs" \
- "--disable-apidocs" \
+ "-DUSE_APIDOCS=ON" \
+ "-DUSE_APIDOCS=OFF" \
"for API documentation" &&

optional_depends gnome-icon-theme "" "" "for all the icons" &&
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 671f58d..570a26c 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -2,11 +2,11 @@
SPELL=midori
if [[ $MIDORI_BRANCH == scm ]]; then
VERSION=$(get_scm_version)
- SOURCE=$SPELL-git.tar.bz2
- SOURCE_URL[0]=git://git.xfce.org/apps/$SPELL:$SPELL-git
+ SOURCE=$SPELL-trunk.tar.bz2
+
SOURCE_URL[0]=bzr_http://bazaar.launchpad.net/~midori/midori/trunk/:midori-trunk
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-trunk"
else
VERSION=0.5.8
BRANCH=`echo $VERSION | cut -d . -f 1,2`
diff --git a/http/midori/DOWNLOAD b/http/midori/DOWNLOAD
new file mode 100755
index 0000000..3c77268
--- /dev/null
+++ b/http/midori/DOWNLOAD
@@ -0,0 +1,8 @@
+. $GRIMOIRE/FUNCTIONS &&
+
+if [[ "$MIDORI_BRANCH" == "scm" ]]
+then
+ bzr_download
+else
+ default_download
+fi
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 2ca1816..61847bb 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+2014-07-07 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, DEPEMDS, DOWNLOAD, PRE_BUILD: git -> bzr, converted to
cmake
+ build system completely
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
index d13b7fb..ac41ad8 100755
--- a/http/midori/PRE_BUILD
+++ b/http/midori/PRE_BUILD
@@ -1,4 +1,8 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file &&
-cd $SOURCE_DIRECTORY
+if [[ "$MIDORI_BRANCH" == "scm" ]]; then
+ default_pre_build
+else
+ mk_source_dir $SOURCE_DIRECTORY &&
+ cd $SOURCE_DIRECTORY &&
+ unpack_file &&
+ cd $SOURCE_DIRECTORY
+fi



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (7803433d2dffc063758ac161ae694565111805df), Pol Vinogradov, 07/07/2014

Archive powered by MHonArc 2.6.24.

Top of Page