Skip to Content.
Sympa Menu

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

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 (9c73db2718f0a2b7b9900c8d2906f3978c868b02)
  • Date: Sun, 1 Mar 2009 17:44:22 -0600

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

http/webkitgtk/CONFIGURE | 2 --
http/webkitgtk/DEPENDS | 7 +------
http/webkitgtk/DETAILS | 12 ++++++++++--
http/webkitgtk/HISTORY | 7 +++++++
http/webkitgtk/PREPARE | 1 +
http/webkitgtk/PRE_BUILD | 5 +++--
http/webkitgtk/UP_TRIGGERS | 10 ++++++++++
7 files changed, 32 insertions(+), 12 deletions(-)

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

webkitgtk: Added released version 1.1.1 and updated nightly build to
41279. Only uses libsoup now for http backend.

diff --git a/http/webkitgtk/CONFIGURE b/http/webkitgtk/CONFIGURE
index b55731f..788f906 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,6 +1,4 @@
config_query_list WEBKIT_FONT_BE "Select font backend to use" freetype2
pango &&

-config_query_list WEBKIT_HTTP_BE "Select http backend to use" curl libsoup &&
-
config_query_option WEBKIT_SVG "Enable SVG support?" y \
"--enable-svg" "--disable-svg"
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 59a3e14..3951e07 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -11,15 +11,10 @@ depends bison &&
depends flex &&
depends sqlite &&
depends libxslt &&
+depends libsoup &&

if [[ $WEBKIT_FONT_BE == freetype2 ]]; then
depends freetype2
else
depends pango "--with-font-backend=pango"
-fi &&
-
-if [[ $WEBKIT_HTTP_BE == curl ]]; then
- depends curl
-else
- depends libsoup "--with-http-backend=soup"
fi
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index b7ad6ec..cf4dde2 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,9 +1,17 @@
SPELL=webkitgtk
- VERSION=r41017
+if [[ $WEBKITGTK_NIGHT == "y" ]]; then
+ VERSION=r41279
SOURCE=WebKit-$VERSION.tar.bz2
SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/$SOURCE
-
SOURCE_HASH=sha512:cb0c7dbeed49eb2c0ad2efb6b6eaa1c5ed5522662194ae3bb4538023b9c2624336c8c823b5e5c4088fba75e022182e7e43704cdf2f8c987b1f6cda066d63c795
+
SOURCE_HASH=sha512:70d95f1ceb7d1d4ba99c876484bde5915742ace348400585e42bd8ea47c31a171a4805c8c4cca9695092c281a653ab4e58afb4e5dd0aa1cc97ee1230ca173e04
SOURCE_DIRECTORY="$BUILD_DIRECTORY/WebKit-$VERSION"
+else
+ VERSION=1.1.1
+ SOURCE=webkit-$VERSION.tar.gz
+ SOURCE_URL[0]=http://cafe.minaslivre.org/webkit/$SOURCE
+
SOURCE_HASH=sha512:94c44cc56f7c24f2611af29d08695d25b2c8678e0bb77ab9ab7de94535bc72f80451b7145f3d93c609e9a6e15ebfba0e5526f71e3f8b72a3c40f9e41436704a4
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
+fi
WEB_SITE=http://webkit.org/
GATHER_DOCS=off
LICENSE[0]=GPL
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 1ab7ced..2ee0bbb 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,10 @@
+2009-03-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Added webkit released version 1.1.1
+ * PREPARE: Added to select release or nightly build
+ * CONFIGURE: curl is no longer an option
+ * DEPENDS: no longer choice between libsoup and curl. Only libsoup
+ * UP_TRIGGERS: Added.
+
2009-02-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to r41017

diff --git a/http/webkitgtk/PREPARE b/http/webkitgtk/PREPARE
new file mode 100755
index 0000000..bf2ada3
--- /dev/null
+++ b/http/webkitgtk/PREPARE
@@ -0,0 +1 @@
+config_query WEBKITGTK_NIGHT "Build recent nightly build?" n
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index 1b0a55f..a361563 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&

+if [[ $WEBKITGTK_NIGHT == "y" ]]; then
+cd "$SOURCE_DIRECTORY" &&
sed -i "/.*configure \$AUTOGEN_CONFIGURE_ARGS.*/d" autogen.sh &&
-
./autogen.sh
+fi
diff --git a/http/webkitgtk/UP_TRIGGERS b/http/webkitgtk/UP_TRIGGERS
new file mode 100755
index 0000000..705264d
--- /dev/null
+++ b/http/webkitgtk/UP_TRIGGERS
@@ -0,0 +1,10 @@
+# this makes ABI changes automatically cast those that depend on
+# webkitgtk via an up_trigger
+
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION}" != "${OLD_SPELL_VERSION}" ]; then
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (9c73db2718f0a2b7b9900c8d2906f3978c868b02), George Sherwood, 03/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page