[Lunar-commits] <moonbase-gnome3> Merge pull request #15 from stumbles/webkitgtk3

[Florin Braescu]

commit c5475b2ef06dbee72c376025519fbcdbceb44366
Author: Florin Braescu <florin at lunar-linux.org>
Date: Wed, 29 Oct 2014 10:17:21 +0200
URL: https://github.com/lunar-linux/moonbase-gnome3/commit/c5475b2ef06dbee72c376025519fbcdbceb44366

Merge pull request #15 from stumbles/webkitgtk3

webkitgtk3: Adjustment to the BUILD. The aim here is utilizing the webki...
---
  libs/webkitgtk3/BUILD | +20/-13   
  1 file changed, 20 insertions(+), 13 deletions(-)

--- a/libs/webkitgtk3/BUILD
+++ b/libs/webkitgtk3/BUILD
@@ -3,7 +3,6 @@ OPTS+=" --enable-x11-target           \
         --enable-optimizations        \
         --enable-introspection        \
         --disable-glibtest            \
-        --with-gtk=3.0                \
         --enable-video                \
         --enable-webgl                \
         --disable-gtk-doc-html"      &&
@@ -13,20 +12,28 @@ 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 &&
-
+# First we build the gtk3 version
+mkdir build-3 &&
+cp -a Documentation build-3 &&
+cd build-3
+OPTS+=" --with-gtk=3.0" &&
+../configure --prefix=/usr $OPTS &&
+default_make &&
 install 'Programs/GtkLauncher' '/usr/bin/Gtk3Launcher' &&
 
+cd ../ &&
+# Now if gtk+-2 is install we build for it
+if module_installed gtk+-2 ; then
+mkdir build-2 &&
+cp -a Documentation build-2 &&
+cd build-2
+OPTS+=" --with-gtk=2.0 --disable-webkit2" &&
+../configure --prefix=/usr $OPTS &&
+default_make &&
+install 'Programs/GtkLauncher' '/usr/bin/Gtk2Launcher'
+fi &&
+
+cd ../ &&
 # symlink plugin folder to a location webkit looks for it
 if [ ! -e "/usr/lib/browser-plugins" ]; then
    ln -sf /usr/lib/lunar/plugins /usr/lib/browser-plugins