Skip to Content.
Sympa Menu

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

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 (271b809644abd8c19e72af17d2d89b67cc39790f)
  • Date: Sun, 20 Dec 2009 08:30:50 -0600

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

http/webkitgtk/CONFIGURE | 5 +----
http/webkitgtk/DEPENDS | 15 +++++++++++----
http/webkitgtk/HISTORY | 4 ++++
libs/icu/DETAILS | 15 +++++++++++----
libs/icu/HISTORY | 4 ++++
libs/icu/PREPARE | 2 ++
6 files changed, 33 insertions(+), 12 deletions(-)

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

webkitgtk: made libxslt and gtk-doc optional, moved the svg query to
DEPENDS

commit 4e23a3b0568f54d668e2f0c74157c46f864ab730
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

icu: made the, according to the website, unstable development release
optional.

diff --git a/http/webkitgtk/CONFIGURE b/http/webkitgtk/CONFIGURE
index 788f906..06f5802 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,4 +1 @@
-config_query_list WEBKIT_FONT_BE "Select font backend to use" freetype2
pango &&
-
-config_query_option WEBKIT_SVG "Enable SVG support?" y \
- "--enable-svg" "--disable-svg"
+config_query_list WEBKIT_FONT_BE "Select font backend to use" freetype2 pango
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index f139549..c39ec50 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -10,13 +10,20 @@ depends jpeg &&
depends bison &&
depends flex &&
depends sqlite &&
-depends libxslt &&
depends libsoup &&
depends enchant &&

-if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- depends gtk-doc
-fi &&
+optional_depends cairo '--enable-svg' \
+ '--disable-svg' \
+ 'Enable SVG support?'
+
+optional_depends libxslt '--enable-xslt' \
+ '--disable-xslt' \
+ 'for XSLT support' &&
+
+optional_depends gtk-doc '--enable-gtk-doc' \
+ '--disable-gtk-doc' \
+ 'for documentation generation' &&

if [[ $WEBKIT_FONT_BE == freetype2 ]]; then
depends freetype2
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index fa6ffca..005570d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2009-12-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made gtk-doc and libxslt optional,
+ moved svg query to an optional dep.
+
2009-12-06 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 1.1.15.4
Updated devel to version 1.1.17
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index 935c6a7..bd28f4d 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,15 +1,22 @@
SPELL=icu
+if [[ "$ICU_DEV" == 'y' ]]; then
VERSION=4.3.3

SOURCE_HASH=sha512:fea20d34d4b60fce4fbdda260307acc504726b028dabf526578fbb8117c68a133a8a764b473865b6e5e0b85ff73b3ba6006deccef00c64956528904f37959c4e
-# SOURCE2_HASH=sha512:
+else
+ VERSION=4.2.1
+
SOURCE_HASH=sha512:c2ec0edbdb9a5790e88f7b09c96b31f9b2120bed0c1a575cdabbcc1f9281e6cb137b44707d0ad44f794e6c9abde64c6b76d8cf4818d51459d3fb11c2e10e01dc
+fi
SPELLX=icu4c
VERSIONX=${VERSION//./_}
SOURCE=$SPELLX-$VERSIONX-src.tgz
-# SOURCE2=$SPELLX-${VERSIONX}-docs.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+
+if [[ "$ICU_DEV" == 'y' ]]; then
+ SOURCE2_HASH=sha512:
+ SOURCE2=$SPELLX-${VERSIONX}-docs.zip
+fi
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL"
SITE=http://download.icu-project.org/files
SOURCE_URL[0]=$SITE/$SPELLX/$VERSION/$SOURCE
-# SOURCE2_URL[0]=$SITE/$SPELLX/$VERSION/$SOURCE2
WEB_SITE=http://site.icu-project.org/
LICENSE[0]=$WEB_SITE/license.jsp
ENTERED=20030320
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 342b784..36ed6d9 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,7 @@
+2009-12-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS,PREPARE: made unstable development snapshot and
+ installation of docs optional.
+
2009-12-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.3

diff --git a/libs/icu/PREPARE b/libs/icu/PREPARE
new file mode 100755
index 0000000..ddd2aa4
--- /dev/null
+++ b/libs/icu/PREPARE
@@ -0,0 +1,2 @@
+config_query ICU_DEV 'Build the development version?' n &&
+config_query ICU_DOC 'Install the documentation?' n




Archive powered by MHonArc 2.6.24.

Top of Page