[Lunar-commits] <moonbase-other> webkit: make it work again

[samuel verstraete]

commit 713ca85072d148aba54c5ff1b988310d79fbd6e1
Author: samuel verstraete <samuel.verstraete at gmail.com>
Date: Wed, 01 Aug 2012 02:17:43 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/713ca85072d148aba54c5ff1b988310d79fbd6e1

webkit: make it work again
bison
multithreaded stuff
---
  web/webkit/BUILD                                             +25/-2    
  web/webkit/DETAILS                                           +4/-2     
  2 files changed, 29 insertions (+), 4 deletions (-)

--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -1,5 +1,5 @@
 (
-
+  patch_it $SOURCE2 1 &&
 
   OPTS+=" --with-target=x11             \
           --with-unicode-backend=icu    \
@@ -11,11 +11,34 @@
           --enable-svg-foreign-object   \
           --enable-svg-as-image         \
           --enable-optimizations        \
+	  --enable-video                \
+	  --disable-glibtest            \
           --with-gtk=2.0                \
           --disable-gtk-doc-html"      &&
 
-  default_build &&
+  #make build work even if gtk-doc is not installed
+  if ! module_installed gtk-doc ; then
+    sed -i '/gtkdoc --rebase/s:^:# :' GNUmakefile.in 
+  fi &&
 
+  # stolen from blfs, avoid race condition in build with multiple makes
+  # http://www.linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html
+  if in_depends $MODULE gobject-introspection && [[ $MAKES -gt 1 ]] ; then
+    default_config && 
+    error_count=0 &&
+    until default_make
+    do
+      if (( $((error_count++)) > 4 )) ; then 
+        echo Too Many Errors &&
+        break
+      fi
+    done &&
+    unset error_count &&
+    make install
+  else
+    default_build
+  fi &&
+  
   install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher' 
 
 ) > $C_FIFO 2>&1
--- a/web/webkit/DETAILS
+++ b/web/webkit/DETAILS
@@ -1,13 +1,15 @@
           MODULE=webkit
          VERSION=1.8.1
           SOURCE=$MODULE-$VERSION.tar.xz
+         SOURCE2=webkit-bison-2.6.patch
       SOURCE_URL=http://www.webkitgtk.org/releases/
+     SOURCE2_URL=$PATCH_URL/
       SOURCE_VFY=sha1:d26543baace03c31aa3de82bc24f06f14c6b3052
+     SOURCE2_VFY=sha1:18c5611095a3d105d8ee02357dd6fb729c1eb86a
         WEB_SITE=http://www.webkit.org
          ENTERED=20070919
-         UPDATED=20120502
+         UPDATED=20120730
            SHORT="gtk+ web rendering engine"
-           PSAFE=no
 
 cat << EOF
 WebKitGTK+ is a web content engine, derived from KHTML and KJS from KDE,