[Lunar-commits] <moonbase-other> Merge pull request #21 from elangelo/webkit

[v4hn]

commit 1497f7eef30173afb51dedd79fc310a20588f5ca
Author: v4hn <me at v4hn.de>
Date: Sun, 05 Aug 2012 05:00:09 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/1497f7eef30173afb51dedd79fc310a20588f5ca

Merge pull request #21 from elangelo/webkit

webkit: 1.8.2 & bison 2.6 patch & "support" parallel build
---
  web/webkit/BUILD                                             +19/-3    
  web/webkit/DETAILS                                           +6/-4     
  2 files changed, 0 insertions (+), 0 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,27 @@
           --enable-svg-foreign-object   \
           --enable-svg-as-image         \
           --enable-optimizations        \
+	  --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 &&
 
-  install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher' 
+  #stolen from blfs, avoid race condition in build with multiple makes
+  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 &&
+  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
+         VERSION=1.8.2
           SOURCE=$MODULE-$VERSION.tar.xz
+         SOURCE2=webkit-bison-2.6.patch
       SOURCE_URL=http://www.webkitgtk.org/releases/
-      SOURCE_VFY=sha1:d26543baace03c31aa3de82bc24f06f14c6b3052
+     SOURCE2_URL=$PATCH_URL/
+      SOURCE_VFY=sha1:138f86894e0a7ed0a41c18c4ac30fcaf961d8d79
+     SOURCE2_VFY=sha1:18c5611095a3d105d8ee02357dd6fb729c1eb86a
         WEB_SITE=http://www.webkit.org
          ENTERED=20070919
-         UPDATED=20120502
+         UPDATED=20120803
            SHORT="gtk+ web rendering engine"
-           PSAFE=no
 
 cat << EOF
 WebKitGTK+ is a web content engine, derived from KHTML and KJS from KDE,