From 7e8db680a056c73b11e9d39640a3f876707449f0 Mon Sep 17 00:00:00 2001
From: alihanozturk <alihan@pisilinux.org>
Date: Sat, 18 Jun 2016 20:13:54 +0300
Subject: [PATCH] webkit-gtk2:fix

---
 network/misc/webkit-gtk2/actions.py           | 38 +++++++----
 .../files/install-minibrowser.patch           | 37 +++++++++++
 network/misc/webkit-gtk2/pspec.xml            | 64 +++++++++++--------
 3 files changed, 100 insertions(+), 39 deletions(-)
 create mode 100644 network/misc/webkit-gtk2/files/install-minibrowser.patch

diff --git a/network/misc/webkit-gtk2/actions.py b/network/misc/webkit-gtk2/actions.py
index e3b91e89e1..3a2dc24db1 100644
--- a/network/misc/webkit-gtk2/actions.py
+++ b/network/misc/webkit-gtk2/actions.py
@@ -10,31 +10,47 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
 shelltools.export("XDG_DATA_HOME", get.workDIR())
-pisitools.flags.replace("-ggdb3", "-g")
+#pisitools.flags.replace("-ggdb3", "-g")
+
+cflags = get.CFLAGS().replace("-ggdb3","")
+cxxflags = get.CXXFLAGS().replace("-gddb3", "")
 
 paths = ["JavaScriptCore", "WebCore", "WebKit"]
 docs = ["AUTHORS", "ChangeLog", "COPYING.LIB", "THANKS", \
         "LICENSE-LGPL-2", "LICENSE-LGPL-2.1", "LICENSE"]
 
 def setup():
+    shelltools.export("CFLAGS", cflags)
+    shelltools.export("CXXFLAGS", cxxflags)
     autotools.configure("\
-                         --disable-webkit2 \
-                         --libexecdir=/usr/lib \
-                         --with-gtk=2.0 \
-                         --with-gnu-ld \
-                         --disable-silent-rules \
+                        --libexecdir=/usr/lib/WebKitGTK \
+                        --disable-static \
+                        --disable-webkit2 \
+                        --disable-gtk-doc \
+                        --disable-silent-rules \
+                        --disable-wayland-target \
+                        --enable-geolocation \
+                        --enable-glx \
+                        --enable-webgl \
+                        --with-gnu-ld \
+                        --with-gstreamer=1.0 \
+                        --with-gtk=2.0 \
+                        --enable-x11-target \
+                        --enable-video \
+                        --enable-web-audio \
+                        --enable-introspection \
                         ")
-#--enable-dependency-tracking \
-#--disable-gtk-doc \
-#--enable-video \
-#--enable-introspection \
 
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
-    autotools.make()
+    shelltools.export("CFLAGS", cflags)
+    shelltools.export("CXXFLAGS", cxxflags)
+    autotools.make("-j1 all stamp-po")
 
 def install():
+    shelltools.export("CFLAGS", cflags)
+    shelltools.export("CXXFLAGS", cxxflags)
     autotools.rawInstall("-j1 DESTDIR=%s" % get.installDIR())
 
     pisitools.domove("/usr/share/gtk-doc/html", "/usr/share/doc/webkit-gtk2")
diff --git a/network/misc/webkit-gtk2/files/install-minibrowser.patch b/network/misc/webkit-gtk2/files/install-minibrowser.patch
new file mode 100644
index 0000000000..1ac5e72b0c
--- /dev/null
+++ b/network/misc/webkit-gtk2/files/install-minibrowser.patch
@@ -0,0 +1,37 @@
+From: Alberto Garcia <berto@igalia.com>
+Subject: Install the MiniBrowser binary
+Forwarded: not-needed
+Index: webkitgtk/Tools/MiniBrowser/gtk/main.c
+===================================================================
+--- webkitgtk.orig/Tools/MiniBrowser/gtk/main.c
++++ webkitgtk/Tools/MiniBrowser/gtk/main.c
+@@ -265,8 +265,6 @@ int main(int argc, char *argv[])
+     }
+     g_option_context_free (context);
+ 
+-    g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
+-
+     // Enable the favicon database, by specifying the default directory.
+     webkit_web_context_set_favicon_database_directory(webkit_web_context_get_default(), NULL);
+ 
+Index: webkitgtk/Tools/MiniBrowser/gtk/GNUmakefile.am
+===================================================================
+--- webkitgtk.orig/Tools/MiniBrowser/gtk/GNUmakefile.am
++++ webkitgtk/Tools/MiniBrowser/gtk/GNUmakefile.am
+@@ -1,5 +1,5 @@
+ if ENABLE_WEBKIT2
+-noinst_PROGRAMS += \
++libexec_PROGRAMS += \
+ 	Programs/MiniBrowser
+ endif
+ 
+@@ -44,9 +44,6 @@ Programs_MiniBrowser_LDADD = \
+ 	$(GTK_LIBS) \
+ 	$(LIBSOUP_LIBS)
+ 
+-Programs_MiniBrowser_LDFLAGS = \
+-	-no-install
+-
+ CLEANFILES += \
+ 	$(top_builddir)/Programs/MiniBrowser \
+ 	$(minibrowser_built_sources) \
diff --git a/network/misc/webkit-gtk2/pspec.xml b/network/misc/webkit-gtk2/pspec.xml
index 22f6bbe059..0a0ad016bb 100644
--- a/network/misc/webkit-gtk2/pspec.xml
+++ b/network/misc/webkit-gtk2/pspec.xml
@@ -14,38 +14,42 @@
         <IsA>library</IsA>
         <Summary>An opensource web browser engine for GTK+ applications</Summary>
         <Description>The GTK+ port of WebKit is intended to provide a browser component primarily for users of the portable GTK+ UI toolkit on platforms like Linux.</Description>
-        <Archive sha1sum="fbe02db8a4f01a70e7cdf0d16f8a18463e18b104" type="tarxz">http://www.webkitgtk.org/releases/webkitgtk-2.4.9.tar.xz</Archive>
+        <Archive sha1sum="e425ae86084ab6335dadb368c9e8f53600665d54" type="tarxz">http://www.webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency versionFrom="10.4.3">mesa-devel</Dependency>
-            <Dependency versionFrom="1.21">gtk-doc</Dependency>
-            <Dependency versionFrom="2.36.0">glib2-devel</Dependency>
-            <Dependency versionFrom="2.24.23">gtk2-devel</Dependency>
-            <Dependency versionFrom="2.2.1">ruby-devel</Dependency>
-            <Dependency versionFrom="0.4.3">webp-devel</Dependency>
+            <Dependency>mesa-devel</Dependency>
+            <Dependency>gtk-doc</Dependency>
+            <Dependency>glib2-devel</Dependency>
+            <Dependency>gtk2-devel</Dependency>
+            <Dependency>ruby-devel</Dependency>
+            <Dependency>webp-devel</Dependency>
             <Dependency>cairo-devel</Dependency>
-            <Dependency versionFrom="54.1">icu4c-devel</Dependency>
-            <Dependency versionFrom="1.1.4">libXt-devel</Dependency>
-            <Dependency versionFrom="1.6.0">enchant-devel</Dependency>
-            <Dependency versionFrom="3.8.8.3">sqlite-devel</Dependency>
-            <Dependency versionFrom="0.12.0">geoclue-devel</Dependency>
-            <Dependency versionFrom="2.49.1">libsoup-devel</Dependency>
-            <Dependency versionFrom="2.5">fontconfig-devel</Dependency>
-            <Dependency versionFrom="1.1.28">libxslt-devel</Dependency>
-            <Dependency versionFrom="0.9.40">harfbuzz-devel</Dependency>
-            <Dependency versionFrom="0.18">libsecret-devel</Dependency>
-            <Dependency versionFrom="0.4.4">libXcomposite-devel</Dependency>
-            <Dependency versionFrom="1.3.1">libjpeg-turbo-devel</Dependency>
+            <Dependency>icu4c-devel</Dependency>
+            <Dependency>libXt-devel</Dependency>
+            <Dependency>enchant-devel</Dependency>
+            <Dependency>sqlite-devel</Dependency>
+            <Dependency>geoclue-devel</Dependency>
+            <Dependency>libsoup-devel</Dependency>
+            <Dependency>fontconfig-devel</Dependency>
+            <Dependency>libxslt-devel</Dependency>
+            <Dependency>harfbuzz-devel</Dependency>
+            <Dependency>libsecret-devel</Dependency>
+            <Dependency>libXcomposite-devel</Dependency>
+            <Dependency>libjpeg-turbo-devel</Dependency>
             <Dependency>gstreamer-next-devel</Dependency>
-            <Dependency versionFrom="1.40.0">gobject-introspection-devel</Dependency>
+            <Dependency>gst-libav-next</Dependency>
+            <Dependency>gobject-introspection-devel</Dependency>
             <Dependency>gst-plugins-base-next-devel</Dependency>
-            <Dependency versionFrom="2.21">which</Dependency>
-            <Dependency versionFrom="0.12">icon-theme-hicolor</Dependency>
-            <Dependency versionFrom="3.0.4">gperf</Dependency>
-            <Dependency versionFrom="1.1.2">libSM-devel</Dependency>
+            <Dependency>gst-plugins-bad-next-devel</Dependency>
+            <Dependency>gst-plugins-good-next</Dependency>
+            <Dependency>which</Dependency>
+            <Dependency>icon-theme-hicolor</Dependency>
+            <Dependency>gperf</Dependency>
+            <Dependency>libSM-devel</Dependency>
         </BuildDependencies>
         <Patches>
+            <Patch level="1">install-minibrowser.patch</Patch>
             <!--<Patch>webkitgtk-2.4.8-gcc5.patch</Patch>-->
-	    <!--<Patch>webkitgtk-2.4.8-gmutexlocker.patch</Patch>-->
+            <!--<Patch>webkitgtk-2.4.8-gmutexlocker.patch</Patch>-->
         </Patches>
     </Source>
 
@@ -81,7 +85,11 @@
             <Dependency>libXcomposite</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>gstreamer-next</Dependency>
+            <Dependency>gst-libav-next</Dependency>
+            <Dependency>gst-plugins-bad-next</Dependency>
             <Dependency>gst-plugins-base-next</Dependency>
+            <Dependency>gst-plugins-good-next</Dependency>
+            <Dependency>gobject-introspection</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -114,9 +122,9 @@
 
     <History>
         <Update release="2">
-            <Date>2016-06-09</Date>
-            <Version>2.4.9</Version>
-            <Comment>Release Bump</Comment>
+            <Date>2016-06-11</Date>
+            <Version>2.4.11</Version>
+            <Comment>Version Bump</Comment>
             <Name>Pisi Linux Community</Name>
             <Email>admin@pisilinux.org</Email>
         </Update>