[Lunar-commits] <moonbase-gnome3> webkitgtk+-3: adopt changes from the webkit module

[v4hn]

commit 88854fcd0dca73b4f6f154324d83551ef7243bad
Author: v4hn <me at v4hn.de>
Date: Tue, 07 Aug 2012 14:09:25 -0700
URL: https://github.com/lunar-linux/moonbase-gnome3/commit/88854fcd0dca73b4f6f154324d83551ef7243bad

webkitgtk+-3: adopt changes from the webkit module
---
  libs/webkitgtk+-3/BUILD                                      +20/-3    
  libs/webkitgtk+-3/CONFIGURE                                  +3/-1     
  libs/webkitgtk+-3/DEPENDS                                    +5/-4     
  libs/webkitgtk+-3/DETAILS                                    +8/-4     
  4 files changed, 36 insertions (+), 12 deletions (-)

--- a/libs/webkitgtk+-3/BUILD
+++ b/libs/webkitgtk+-3/BUILD
@@ -1,17 +1,34 @@
 (
-
+  patch_it $SOURCE2 1 &&
 
   OPTS+=" --with-target=x11             \
           --with-unicode-backend=icu    \
           --with-font-backend=freetype  \
           --enable-xslt                 \
-          --enable-svg-fonts            \
           --enable-optimizations        \
+          --disable-glibtest            \
           --with-gtk=3.0                \
+          --enable-video                \
+          --disable-web-audio           \
           --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
+  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/Gtk3Launcher'
 
 ) > $C_FIFO 2>&1
--- a/libs/webkitgtk+-3/CONFIGURE
+++ b/libs/webkitgtk+-3/CONFIGURE
@@ -6,4 +6,6 @@ mquery ENABLE_TRANSFER  "Enable HTML5 data transfer items support?" n "--enable-
 mquery ENABLE_INDEX "Enable the indexed database API?" n "--enable-indexed-database" "--disable-indexed-database"
 mquery ENABLE_SPEECH "Enable the speech input API?" n "--enable-input-speech" "--disable-input-speech"
 mquery ENABLE_RESIZE "Enable image resizer?" n "--enable-image-resizer" "--disable-image-resizer"
-mquery ENABLE_WEB_AUDIO "Enable support for Web Audio ?" n " --enable-web-audio" "--disable-web-audio"
+
+# y to this breaks build with 1.8.2 so --disable is in BUILD for now
+#mquery ENABLE_WEB_AUDIO "Enable support for Web Audio ?" n " --enable-web-audio" "--disable-web-audio"
--- a/libs/webkitgtk+-3/DEPENDS
+++ b/libs/webkitgtk+-3/DEPENDS
@@ -1,3 +1,4 @@
+depends gtk+-3
 depends icu4c
 depends gperf
 depends libxslt
@@ -12,10 +13,10 @@ depends gst-plugins-base
 # workaround for make_names.pl
 depends Switch
 
-# see webkit module for gtk+-2
-depends "gtk+-3"
+# compile fails without this for 1.8.2 so --enable is in BUILD for now
+#optional_depends "gst-plugins-good"      "--enable-video"         "--disable-video"         "for HTML5 video support"
+depends "gst-plugins-good"
 
-optional_depends "gst-plugins-good"      "--enable-video"         "--disable-video"         "for HTML5 video support"
 optional_depends "geoclue"               "--enable-geolocation"   "--disable-geolocation"   "for geolocation support"
 optional_depends "gobject-introspection" "--enable-introspection" "--disable-introspection" "say Y for Epiphany, and possibly others"
-optional_depends "librsvg"               "--enable-svg"           "--disable-svg"           "for svg graphics support"
+optional_depends "librsvg"      "--enable-svg --enable-svg-fonts" "--disable-svg"           "for svg graphics support"
--- a/libs/webkitgtk+-3/DETAILS
+++ b/libs/webkitgtk+-3/DETAILS
@@ -1,14 +1,18 @@
+# WHEN BUMPING THIS MODULE PLEASE CHECK IF ANY OF THE COMMENTED
+# BUILD OPTIONS IN CONFIGURE/DEPENDS WORK AGAIN!
           MODULE=webkitgtk\+-3
-         VERSION=1.8.1
+         VERSION=1.8.2
           SOURCE=webkit-$VERSION.tar.xz
+         SOURCE2=webkit-bison-2.6.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkit-$VERSION
       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,