[Lunar-commits] <moonbase> WebKit: update to r35289

[Samuel Verstraete]

commit 3062ed1e1b58a1aaeadd528aac2ac3eff318acad
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Fri Jul 25 09:20:55 2008 +0200

    WebKit: update to r35289
    
    Also add a bunch of new features
    
    Conflicts:
    
    	zbeta/WebKit/DETAILS
---
 utils/evms/BUILD        |    8 --------
 utils/evms/DEPENDS      |    3 ---
 utils/evms/DETAILS      |   26 --------------------------
 utils/evms/POST_INSTALL |    3 ---
 utils/evms/PRE_BUILD    |    6 ------
 zbeta/WebKit/BUILD      |    6 +++++-
 zbeta/WebKit/DEPENDS    |   12 +++++++++++-
 zbeta/WebKit/DETAILS    |    4 ++--
 8 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/utils/evms/BUILD b/utils/evms/BUILD
deleted file mode 100644
index 6925409..0000000
--- a/utils/evms/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-unset CPP CPPFLAGS &&
-default_build 
-if ! grep -q "$MODULE/$VERSION" /etc/ld.so.conf; then
-  echo "/lib/evms/2.5.5/" >> /etc/ld.so.conf
-fi &&
-ldconfig
-) > $C_FIFO 2>&1
diff --git a/utils/evms/DEPENDS b/utils/evms/DEPENDS
deleted file mode 100644
index 5c0b232..0000000
--- a/utils/evms/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends ncurses
-optional_depends gtk+-2 "" "--disable-gui" "to use the evmsgui program" 
-
diff --git a/utils/evms/DETAILS b/utils/evms/DETAILS
deleted file mode 100644
index be8bdc3..0000000
--- a/utils/evms/DETAILS
+++ /dev/null
@@ -1,26 +0,0 @@
-           MODULE=evms
-          VERSION=2.5.5
-           SOURCE=$MODULE-$VERSION.tar.gz
-       SOURCE_URL=$SFORGE_URL/$MODULE
-          SOURCE2=md_super_fix.patch
-          SOURCE3=raid5_degrade_fix.patch
-          SOURCE4=raid5_remove_spare_fix.patch
-          SOURCE5=raid5_remove_spare_fix_2.patch
-      SOURCE2_URL=http://evms.sourceforge.net/patches/2.5.5/engine/
-      SOURCE3_URL=http://evms.sourceforge.net/patches/2.5.5/engine/
-      SOURCE4_URL=http://evms.sourceforge.net/patches/2.5.5/engine/
-      SOURCE5_URL=http://evms.sourceforge.net/patches/2.5.5/engine/
-         WEB_SITE=http://evms.sourceforge.net
-          ENTERED=20060828
-          UPDATED=20060828
-            SHORT="Enterprise Volume Management System"
-       MAINTAINER=elangelo at lunar-linux.org
-
-cat << EOF
-The Enterprise Volume Management System (EVMS) Project has the goal of
-providing unparalleled flexibility and extensibility in managing
-storage. It represents a new approach to logical volume management
-for Linux. The architecture introduces a plug-in model that allows
-for easy expansion and customization of various levels of volume
-management.
-EOF
diff --git a/utils/evms/POST_INSTALL b/utils/evms/POST_INSTALL
deleted file mode 100644
index 045f9d9..0000000
--- a/utils/evms/POST_INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-message "${PROBLEM_COLOR} Before you start this program, be aware that it will claim all your storage devices (hard disks, usb sticks, etc). Go and read the online manual on http://evms.sourceforge.net/user_guide/ ${DEFAULT_COLOR}"
-message "${PROBLEM_COLOR} For starters, add the device names of the harddisks you do not want to be handled by evms in the exclude statement on line 184 in the /etc/evms.conf. (e.g.   exclude = [ hda sda sdb sdc]   ) ${DEFAULT_COLOR}"
-
diff --git a/utils/evms/PRE_BUILD b/utils/evms/PRE_BUILD
deleted file mode 100644
index 34d0001..0000000
--- a/utils/evms/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch_it $SOURCE2 1 &&
-patch_it $SOURCE3 1 &&
-patch_it $SOURCE4 1 &&
-patch_it $SOURCE5 1
diff --git a/zbeta/WebKit/BUILD b/zbeta/WebKit/BUILD
index dcf1fb0..0948bee 100644
--- a/zbeta/WebKit/BUILD
+++ b/zbeta/WebKit/BUILD
@@ -1,6 +1,10 @@
 (
 
-  OPTS+=" --with-font-backend=pango --enable-video"
+  bad_flags linker &&
+
+  OPTS="$OPTS --enable-svg-experimental --enable-svg --enable-svg-animation \
+        --enable-svg-filters --enable-svg-fonts --enable-svg-foreign-object \
+	--enable-svg-as-image --enable-svg-use-element"
 
   default_cvs_build
 
diff --git a/zbeta/WebKit/DEPENDS b/zbeta/WebKit/DEPENDS
index 880a1f3..a0e51fe 100644
--- a/zbeta/WebKit/DEPENDS
+++ b/zbeta/WebKit/DEPENDS
@@ -2,6 +2,16 @@ depends gtk+-2
 depends icu
 depends gperf
 depends libxslt
-depends curl
 depends sqlite
+depends jpeg
 depends libpng
+
+optional_depends gst-plugins-good "--enable-video" "" "Enable video support?"
+
+optional_depends libsoup "--with-http-backend=soup" "" "Build with libsoup http backend instead of curl?"
+
+optional_depends curl "--with-http-backend=curl" "" "Build with curl http backend? (Say N if you said Y to libsoup)"
+
+optional_depends pango "--with-font-backend=pango" "" "Build with Pango font backend?"
+
+optional_depends freetype2 "--with-font-backend=freetype" "" "Build with freetype support? (Say N if you said Y to pango)"
diff --git a/zbeta/WebKit/DETAILS b/zbeta/WebKit/DETAILS
index 36d1a5a..f2bc8a0 100644
--- a/zbeta/WebKit/DETAILS
+++ b/zbeta/WebKit/DETAILS
@@ -1,11 +1,11 @@
           MODULE=WebKit
          VERSION=r35289
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://nightly.webkit.org/files/trunk/src
+      SOURCE_URL=http://nightly.webkit.org/files/src
       SOURCE_VFY=sha1:590cbe40554c510339d7bc15225c6ba978b6cb1d
         WEB_SITE=http://www.webkit.org
          ENTERED=20070919
-         UPDATED=20080621
+         UPDATED=20080724
            SHORT="a web content engine"
 
 cat<<EOF