public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/hardened-dev:uclibc commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
@ 2013-05-09 22:39 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2013-05-09 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     57c141e4758781c92a259271beae45dcf78b4505
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 22:39:07 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May  9 22:39:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=57c141e4

net-libs/webkit-gtk: patch to disable backtrace in the tree

---
 net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper    |   33 --
 .../files/webkit-gtk-1.6.1-darwin-quartz.patch     |   67 ---
 .../webkit-gtk-1.6.3-paxctl-introspection.patch    |   21 -
 .../files/webkit-gtk-1.7.5-linguas.patch           |   47 --
 .../webkit-gtk-1.7.90-parallel-make-hack.patch     |   21 -
 ...webkit-gtk-1.7.90-test_garbage_collection.patch |   18 -
 .../webkit-gtk-1.8.0-typedef-WebKitWebView.patch   |   28 --
 ...gtk-1.8.1-CodeGeneratorGObject-properties.patch |   20 -
 .../webkit-gtk-1.8.1-gst-required-version.patch    |   29 --
 .../files/webkit-gtk-1.8.1-tests-xvfb.patch        |   32 --
 .../files/webkit-gtk-1.8.2-bison-2.6.patch         |  508 --------------------
 ...webkit-gtk-1.8.3-disable-backtrace-uclibc.patch |   21 -
 .../webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch  |   27 -
 net-libs/webkit-gtk/metadata.xml                   |   16 -
 net-libs/webkit-gtk/webkit-gtk-1.8.3-r299.ebuild   |  231 ---------
 net-libs/webkit-gtk/webkit-gtk-1.8.3-r399.ebuild   |  243 ----------
 16 files changed, 0 insertions(+), 1362 deletions(-)

diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
deleted file mode 100755
index d4f270c..0000000
--- a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
-# generated by g-ir-scanner.
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-echo ${LIBTOOL} "$@"
-${LIBTOOL} "$@"
-
-retval=$?
-
-files=$(find . -path "*tmp-introspect*/.libs/*")
-
-if type -p paxctl > /dev/null; then
-	echo "PT PaX marking -${flags} ${files}"
-	for f in ${files}; do
-		# First, try modifying the existing PAX_FLAGS header
-		paxctl -q${flags} "${f}" && continue
-		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
-		paxctl -qc${flags} "${f}" && continue
-		# Third, try pulling the base down a page, to create space and
-		# insert a PT_GNU_STACK header (works on ET_EXEC)
-		paxctl -qC${flags} "${f}" && continue
-	done
-elif type -p scanelf > /dev/null; then
-	# Try scanelf, the Gentoo swiss-army knife ELF utility
-	# Currently this sets PT if it can, no option to control what it does.
-	echo "Fallback PaX marking -${flags} ${files}"
-	scanelf -Xxz ${flags} ${files}
-fi
-
-exit ${retval}

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
deleted file mode 100644
index 5ad357e..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Original from:
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
-
-Adapted for 1.6.1
-
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -70,6 +70,8 @@
- #endif
- #include <gtk/gtk.h>
- 
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "RefPtrCairo.h"
- #include "gtk2xtbin.h"
-@@ -439,9 +441,9 @@
-         event->setDefaultHandled();
- }
- 
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -454,10 +456,12 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
-+#endif
- }
- 
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -470,8 +474,8 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
--}
- #endif
-+}
- 
- void PluginView::setParent(ScrollView* parent)
- {
---- Source/WebCore/plugins/gtk/gtk2xtbin.c
-+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
-@@ -41,7 +41,7 @@
-  * The GtkXtBin widget allows for Xt toolkit code to be used
-  * inside a GTK application.  
-  */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -966,3 +966,4 @@
- 
-   return;
- }
-+#endif

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
deleted file mode 100644
index c34cc40..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
---- a/Source/WebKit/gtk/GNUmakefile.am
-+++ b/Source/WebKit/gtk/GNUmakefile.am
-@@ -269,7 +269,7 @@
- WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
- 
- $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
--	$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
-+	$(AM_V_GEN)LIBTOOL="$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \
- 	     --symbol-prefix=webkit \
- 	     --identifier-prefix=WebKit \
- 	     --namespace=WebKit \
-@@ -280,7 +280,7 @@
- 	     --include=Soup-2.4 \
- 	     --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
- 	     --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
--	     --libtool="$(LIBTOOL)" \
-+	     --libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \
- 	     --pkg=gobject-2.0 \
- 	     --pkg=gtk+-@GTK_API_VERSION@ \
- 	     --pkg=libsoup-2.4 \

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
deleted file mode 100644
index df14a5c..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Respect intltool's LINGUAS variable for building translations.
-
---- a/webkit-1.7.5/GNUmakefile.am
-+++ b/webkit-1.7.5/GNUmakefile.am
-@@ -54,6 +54,9 @@
- IDL_BINDINGS :=
- TEST_PROGS :=
- POFILES :=
-+PO_LINGUAS :=
-+USER_LINGUAS :=
-+USE_LINGUAS :=
- MOFILES :=
- dom_binding_idls :=
- wtf_cppflags:=
---- a/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
-+++ b/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
-@@ -27,7 +27,15 @@
- 
- POFILES += $(shell ls $(srcdir)/Source/WebKit/gtk/po/*.po)
- 
--MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
-+PO_LINGUAS += $(patsubst $(srcdir)/Source/WebKit/gtk/po/%.po,%,$(POFILES))
-+
-+USER_LINGUAS += $(filter $(LINGUAS),$(PO_LINGUAS))
-+
-+USE_LINGUAS += $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS="$(PO_LINGUAS)"; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+MOFILES += $(USE_LINGUAS:%=Source/WebKit/gtk/po/%.mo)
-+
-+ALL_MOFILES := $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
- 
- .po.mo:
- 	test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
-@@ -124,11 +132,11 @@
- 	$(top_builddir)/stamp-po
- 
- MAINTAINERCLEANFILES += \
--	$(MOFILES) \
-+	$(ALL_MOFILES) \
- 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
- 
- DISTCLEANFILES += \
--	$(MOFILES) \
-+	$(ALL_MOFILES) \
- 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
- 
- po-install-data-local: all

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
deleted file mode 100644
index b632ca2..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Horrible failure of a hack to enable workaround for
-https://bugs.webkit.org/show_bug.cgi?id=79498
-
---- a/GNUmakefile.am
-+++ b/GNUmakefile.am
-@@ -285,6 +285,15 @@
- all-local: stamp-po
- 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
- 
-+# Horrible hack to enable workaround for parallel make failure
-+all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
-+
-+all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
-+
-+all-programs-local: GNUmakefile $(PROGRAMS)
-+
-+all-data-local: GNUmakefile $(DATA)
-+
- # remove built sources and program directories
- clean-local:
- 	-rm -rf $(GENPROGRAMS)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
deleted file mode 100644
index 577c249..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Garbage collection test fails intermittently if icedtea browser plugin is
-installed.
-
---- a/Source/WebKit/gtk/tests/testdomdocument.c
-+++ b/Source/WebKit/gtk/tests/testdomdocument.c
-@@ -353,12 +353,6 @@
-                test_dom_document_get_links,
-                dom_document_fixture_teardown);
- 
--    g_test_add("/webkit/domdocument/test_garbage_collection",
--               DomDocumentFixture, HTML_DOCUMENT_LINKS,
--               dom_document_fixture_setup,
--               test_dom_document_garbage_collection,
--               dom_document_fixture_teardown);
--
-     return g_test_run();
- }
- 

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch
deleted file mode 100644
index c3852aa..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h
-===================================================================
---- /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h	(revision 109222)
-+++ /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h	(revision 109329)
-@@ -34,4 +34,6 @@
- 
- typedef struct _WebKitPrintOperation WebKitPrintOperation;
-+typedef struct _WebKitFindController WebKitFindController;
-+typedef struct _WebKitWebView        WebKitWebView;
- 
- #ifdef G_OS_WIN32
-@@ -47,6 +49,3 @@
- #endif
- 
--typedef struct _WebKitFindController WebKitFindController;
--typedef struct _WebKitWebView        WebKitWebView;
--
- #endif // WebKitDefines_h
-Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
-===================================================================
---- /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h	(revision 109222)
-+++ /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h	(revision 109329)
-@@ -49,5 +49,4 @@
- #define WEBKIT_WEB_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
- 
--typedef struct _WebKitWebView WebKitWebView;
- typedef struct _WebKitWebViewClass WebKitWebViewClass;
- typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch
deleted file mode 100644
index ff2f5ae..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Mikhail Khokhlov <mikhail.khokhlov@lge.com>
-
-https://bugs.webkit.org/show_bug.cgi?id=84526
-
-Index: Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
-===================================================================
---- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	(revision 115562)
-+++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	(working copy)
-@@ -1444,9 +1444,10 @@
-     print IMPL "namespace WebKit {\n\n";
-     print IMPL @cBodyPriv;
-     print IMPL "} // namespace WebKit\n\n";
-+
-+    print IMPL @cBodyProperties;
-     print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString;
- 
--    print IMPL @cBodyProperties;
-     print IMPL @cBody;
- 
-     close(IMPL);

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch
deleted file mode 100644
index cd0337b..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-2012-05-01  Landry Breuil  <landry@openbsd.org>
-
-        [GTK] Fix gstreamer detection during configure
-        https://bugs.webkit.org/show_bug.cgi?id=84325
-
-        Reviewed by Philippe Normand.
-
-        * configure.ac: Fix GSTREAMER_REQUIRED_VERSION and
-        GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION assignments.
-
-Index: /trunk/configure.ac
-===================================================================
---- /trunk/configure.ac	(revision 115666)
-+++ /trunk/configure.ac	(revision 115737)
-@@ -343,10 +343,10 @@
- 
- case "$with_gstreamer" in
--     0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
--           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-+     0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
-+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-            GST_API_VERSION=0.10
-            ;;
--     0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
--           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
-+     0.11) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_11_REQUIRED_VERSION
-+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
-            GST_API_VERSION=0.11
-            ;;

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch
deleted file mode 100644
index e310c65..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Rely on virtualx.eclass instead of manually spawning Xvfb. Fixes occasional
-test failures.
-
---- a/Tools/Scripts/run-gtk-tests
-+++ b/Tools/Scripts/run-gtk-tests
-@@ -147,18 +147,9 @@
- 
-     def _setup_testing_environment(self):
-         self._test_env = os.environ
--        self._test_env["DISPLAY"] = self._options.display
-         self._test_env["WEBKIT_INSPECTOR_PATH"] = os.path.abspath(os.path.join(self._programs_path, 'resources', 'inspector'))
-         self._test_env['GSETTINGS_BACKEND'] = 'memory'
- 
--        try:
--            self._xvfb = self._create_process(["Xvfb", self._options.display, "-screen", "0", "800x600x24", "-nolisten", "tcp"],
--                                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
--        except Exception as e:
--            sys.stderr.write("Failed to run Xvfb: %s\n", e)
--            sys.stderr.flush()
--            return False
--
-         # If we cannot start the accessibility daemons, we can just skip the accessibility tests.
-         if not self._start_accessibility_daemons():
-             print "Could not start accessibility bus, so skipping TestWebKitAccessibility"
-@@ -170,7 +161,6 @@
-             self._spi_registryd.terminate()
-         if self._spi_bus_launcher:
-             self._spi_bus_launcher.terminate()
--        self._xvfb.kill();
- 
-     def _remove_skipped_tests(self):
-         tests_to_remove = []

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.2-bison-2.6.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.2-bison-2.6.patch
deleted file mode 100644
index 73b657b..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.2-bison-2.6.patch
+++ /dev/null
@@ -1,508 +0,0 @@
-2012-07-30  Alexis Menard  <alexis.menard@openbossa.org>
-
-        Build fix with newer bison 2.6.
-        https://bugs.webkit.org/show_bug.cgi?id=92264
-
-        Reviewed by Adam Barth.
-
-        As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
-        YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
-        version I had access to as well as recent Linux runs at least version 2.3 so it's safe
-        to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
-        As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
-        of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
-
-        No new tests : build fix and the patch should not trigger any regressions
-
-        * css/CSSGrammar.y:
-        * css/CSSParser.cpp:
-        * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
-        * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
-        therefore including this file within the namespace {} declarations leads to xpathyyparse being
-        defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
-        (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 
-        to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
-
-Index: /trunk/Source/WebCore/css/CSSParser.cpp
-===================================================================
---- /trunk/Source/WebCore/css/CSSParser.cpp	(revision 124098)
-+++ /trunk/Source/WebCore/css/CSSParser.cpp	(revision 124099)
-@@ -115,5 +115,5 @@
- #endif
- 
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
- 
- using namespace std;
-Index: /trunk/Source/WebCore/css/CSSGrammar.y
-===================================================================
---- /trunk/Source/WebCore/css/CSSGrammar.y	(revision 124098)
-+++ /trunk/Source/WebCore/css/CSSGrammar.y	(revision 124099)
-@@ -54,11 +54,10 @@
- #define YYDEBUG 0
- 
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
- 
- %pure_parser
-+
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
- 
- %union {
-@@ -90,5 +89,5 @@
- %{
- 
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
-     return 1;
-Index: /trunk/Source/WebCore/xml/XPathParser.cpp
-===================================================================
---- /trunk/Source/WebCore/xml/XPathParser.cpp	(revision 124098)
-+++ /trunk/Source/WebCore/xml/XPathParser.cpp	(revision 124099)
-@@ -33,22 +33,19 @@
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
- 
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
--
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"    
-+using namespace XPath;
-+
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
- 
- Parser* Parser::currentParser = 0;
--    
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
- 
-@@ -631,4 +628,2 @@
- }
- 
--}
--}
-Index: /trunk/Source/WebCore/xml/XPathGrammar.y
-===================================================================
---- /trunk/Source/WebCore/xml/XPathGrammar.y	(revision 124098)
-+++ /trunk/Source/WebCore/xml/XPathGrammar.y	(revision 124099)
-@@ -35,4 +35,5 @@
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-@@ -45,6 +46,4 @@
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
- 
- using namespace WebCore;
-@@ -54,4 +53,5 @@
- 
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
- 
- %union
-@@ -72,5 +72,5 @@
- 
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-     
- %}
-@@ -119,5 +119,5 @@
-     OrExpr
-     {
--        PARSER->m_topExpr = $1;
-+        parser->m_topExpr = $1;
-     }
-     ;
-@@ -139,5 +139,5 @@
-     {
-         $$ = new LocationPath;
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -151,5 +151,5 @@
-         $$ = $2;
-         $$->insertFirstStep($1);
--        PARSER->unregisterParseNode($1);
-+        parser->unregisterParseNode($1);
-     }
-     ;
-@@ -160,6 +160,6 @@
-         $$ = new LocationPath;
-         $$->appendStep($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -167,5 +167,5 @@
-     {
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     |
-@@ -174,6 +174,6 @@
-         $$->appendStep($2);
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-     }
-     ;
-@@ -184,9 +184,9 @@
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, *$1, *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, *$1);
--        PARSER->deleteNodeTest($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -195,6 +195,6 @@
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-@@ -202,9 +202,9 @@
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -213,9 +213,9 @@
-         if ($3) {
-             $$ = new Step($1, *$2, *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, *$2);
--        PARSER->deleteNodeTest($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($2);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -224,6 +224,6 @@
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-@@ -231,9 +231,9 @@
-         if ($3) {
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($2);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -260,6 +260,6 @@
-             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- 
--        PARSER->deleteString($1);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-@@ -267,6 +267,6 @@
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
--        PARSER->deleteString($1);        
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-@@ -274,7 +274,7 @@
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
--        PARSER->deleteString($1);        
--        PARSER->deleteString($3);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->deleteString($3);
-+        parser->registerNodeTest($$);
-     }
-     ;
-@@ -294,6 +294,6 @@
-         $$ = new Vector<Predicate*>;
-         $$->append(new Predicate($1));
--        PARSER->unregisterParseNode($1);
--        PARSER->registerPredicateVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerPredicateVector($$);
-     }
-     |
-@@ -301,5 +301,5 @@
-     {
-         $$->append(new Predicate($2));
--        PARSER->unregisterParseNode($2);
-+        parser->unregisterParseNode($2);
-     }
-     ;
-@@ -316,5 +316,5 @@
-     {
-         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -324,5 +324,5 @@
-     {
-         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -330,5 +330,5 @@
-     {
-         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -338,6 +338,6 @@
-     {
-         $$ = new VariableReference(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -350,6 +350,6 @@
-     {
-         $$ = new StringExpression(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -357,6 +357,6 @@
-     {
-         $$ = new Number($1->toDouble());
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -370,6 +370,6 @@
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -379,7 +379,7 @@
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->deleteExpressionVector($3);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->deleteExpressionVector($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -390,6 +390,6 @@
-         $$ = new Vector<Expression*>;
-         $$->append($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerExpressionVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerExpressionVector($$);
-     }
-     |
-@@ -397,5 +397,5 @@
-     {
-         $$->append($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     ;
-@@ -413,7 +413,7 @@
-         $$->addSubExpression($1);
-         $$->addSubExpression($3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -431,7 +431,7 @@
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -441,8 +441,8 @@
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -454,7 +454,7 @@
-     {
-         $$ = new Filter($1, *$2);
--        PARSER->unregisterParseNode($1);
--        PARSER->deletePredicateVector($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->deletePredicateVector($2);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -466,7 +466,7 @@
-     {
-         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -478,7 +478,7 @@
-     {
-         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -490,7 +490,7 @@
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -502,7 +502,7 @@
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -514,7 +514,7 @@
-     {
-         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -522,7 +522,7 @@
-     {
-         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -534,7 +534,7 @@
-     {
-         $$ = new NumericOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -547,6 +547,6 @@
-         $$ = new Negative;
-         $$->addSubExpression($2);
--        PARSER->unregisterParseNode($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($2);
-+        parser->registerParseNode($$);
-     }
-     ;

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
deleted file mode 100644
index 0646ec4..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nuar webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Assertions.cpp webkit-1.8.3/Source/JavaScriptCore/wtf/Assertions.cpp
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Assertions.cpp	2012-08-20 16:26:04.000000000 +0000
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Assertions.cpp	2012-11-04 00:59:49.415465313 +0000
-@@ -52,7 +52,7 @@
- #include <windows.h>
- #endif
- 
--#if OS(DARWIN) || OS(LINUX)
-+#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -249,7 +249,7 @@
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if OS(DARWIN) || OS(LINUX)
-+#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
-     *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch
deleted file mode 100644
index e422aa4..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=417523
-https://bugs.webkit.org/show_bug.cgi?id=96602
-
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 128398)
-+++ configure.ac	(working copy)
-@@ -268,6 +268,10 @@
- AC_SUBST([OLE32_LIBS])
- 
- 
-+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-+AC_SUBST([DLOPEN_LIBS])
-+
-+
- # determine the GTK+ version to use
- AC_MSG_CHECKING([the GTK+ version to use])
- AC_ARG_WITH([gtk],
-@@ -554,7 +558,7 @@
- if test "$enable_webgl" = "yes" ||  test "$with_accelerated_compositing" = "opengl" ; then
-     AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
-     AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
--    OPENGL_LIBS="-lGL -ldl"
-+    OPENGL_LIBS="-lGL $DLOPEN_LIBS"
- fi
- AC_SUBST([OPENGL_LIBS])
- 

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
deleted file mode 100644
index 4232b5d..0000000
--- a/net-libs/webkit-gtk/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-	<flag name="coverage">Enable code coverage support</flag>
-	<flag name="geoloc">Enable geolocation support through
-		<pkg>app-misc/geoclue</pkg></flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
-	<flag name="webgl">Build support for the WebGL HTML API using
-		<pkg>virtual/opengl</pkg></flag>
-	<flag name="webkit2">Enable WebKit2 API that splits web content rendering
-		and application UI into separate processes</flag>
-  </use>
-</pkgmetadata>

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r299.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r299.ebuild
deleted file mode 100644
index cc02d7e..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r299.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.6 2012/10/28 16:48:17 armin76 Exp $
-
-EAPI="4"
-
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
-
-MY_P="webkit-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="introspection? ( geoloc gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4:0
-	>=x11-libs/cairo-1.10
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.37.92:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.21
-	x11-libs/libXrender
-
-	geoloc? ( app-misc/geoclue )
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
-	spell? ( >=app-text/enchant-0.22 )
-
-	webgl? ( virtual/opengl )
-"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	dev-util/gperf
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? ( x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-# Need real bison, not yacc
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
-	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	# TODO: FAILS TO APPLY!
-	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
-
-	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
-	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
-
-	# bug #416057; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
-
-	# bug #428012; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.2-bison-2.6.patch"
-
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.8.3-libdl.patch"
-
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
-	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# https://bugs.webkit.org/show_bug.cgi?id=79498
-	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
-
-	# XXX: failing tests
-	# https://bugs.webkit.org/show_bug.cgi?id=50744
-	# testkeyevents is interactive
-	# mimehandling test sometimes fails under Xvfb (works fine manually)
-	# datasource test needs a network connection and intermittently fails with icedtea-web
-	# webplugindatabase intermittently fails with icedtea-web
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-	# garbage collection test fails intermittently if icedtea-web is installed
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# occasional test failure due to additional Xvfb process spawned
-	epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
-	# Bug to-be-filled-int
-	epatch "${FILESDIR}/${PN}-1.8.3-disable-backtrace-uclibc.patch"
-
-	# For >=sys-devel/automake-1.12 compability wrt #420591
-	sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am || die
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	local myconf
-
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	# WebKit2 can only be built with gtk3
-	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable debug debug-features)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable webgl)
-		--enable-web-sockets
-		--with-gtk=2.0
-		--disable-gtk-doc
-		--disable-webkit2
-		--enable-dependency-tracking
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Horrible failure of a hack to work around parallel make problems,
-	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	emake -j1 all-built-sources-local
-	emake all-ltlibraries-local
-	emake all-programs-local
-	use introspection && emake WebKit-1.0.gir
-	emake all-data-local
-	default
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/unittests/test*) \
-		Programs/unittests/.libs/test*
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-1"
-
-	# File collisions with slot 3
-	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
-	rm -rf "${ED}usr/share/gtk-doc" || die
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r399.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r399.ebuild
deleted file mode 100644
index 8bab24d..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r399.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.6 2012/10/28 16:48:17 armin76 Exp $
-
-EAPI="4"
-
-# Don't define PYTHON_DEPEND: python only needed at build time
-inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
-
-MY_P="webkit-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl webkit2"
-# bugs 372493, 416331
-REQUIRED_USE="introspection? ( geoloc gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4:0
-	>=x11-libs/cairo-1.10
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.4:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.37.92:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.21
-	x11-libs/libXrender
-
-	geoloc? ( app-misc/geoclue )
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
-	spell? ( >=app-text/enchant-0.22 )
-
-	webgl? ( virtual/opengl )
-
-	webkit2? ( >=x11-libs/gtk+-2.13:2 )
-"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	dev-util/gperf
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-	webkit2? ( app-accessibility/at-spi2-core )
-"
-# Need real bison, not yacc
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# Needed for CodeGeneratorInspector.py
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
-	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	# TODO: FAILS TO APPLY!
-	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
-
-	# webkit2 build failure with gcc-4.5, bug #412027
-	epatch "${FILESDIR}/${PN}-1.8.0-typedef-WebKitWebView.patch"
-
-	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
-	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
-
-	# bug #416057; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
-
-	# bug #428012; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.2-bison-2.6.patch"
-
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.8.3-libdl.patch"
-
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
-	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# https://bugs.webkit.org/show_bug.cgi?id=79498
-	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
-
-	# XXX: failing tests
-	# https://bugs.webkit.org/show_bug.cgi?id=50744
-	# testkeyevents is interactive
-	# mimehandling test sometimes fails under Xvfb (works fine manually)
-	# datasource test needs a network connection and intermittently fails with icedtea-web
-	# webplugindatabase intermittently fails with icedtea-web
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-	# FIXME: TestWebKitWebView always fails for webkit-gtk-1.8.2-r300. Why?
-	# if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support
-		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
-	# fi
-	# garbage collection test fails intermittently if icedtea-web is installed
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# occasional test failure due to additional Xvfb process spawned
-	epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
-	# Bug to-be-filled-int
-	epatch "${FILESDIR}/${PN}-1.8.3-disable-backtrace-uclibc.patch"
-
-	# For >=sys-devel/automake-1.12 compability wrt #420591
-	sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am || die
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	local myconf
-
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable debug debug-features)
-		$(use_enable doc gtk-doc)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable webgl)
-		$(use_enable webkit2)
-		--enable-web-sockets
-		--with-gtk=3.0
-		--enable-dependency-tracking
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-		# Aqua support in gtk3 is untested
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Horrible failure of a hack to work around parallel make problems,
-	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	emake -j1 all-built-sources-local
-	emake all-ltlibraries-local
-	emake all-programs-local
-	use introspection && emake WebKit-3.0.gir
-	emake -j1 all-data-local
-	default
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \
-		Programs/unittests/.libs/test*
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
@ 2013-12-18 22:52 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2013-12-18 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     018cda2698a1bb4de7e4b1edf897585ce3eadc8e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 22:53:12 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 22:53:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=018cda26

net-libs/webkit-gtk: remove nonstandard isnan

Package-Manager: portage-2.2.7
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA

---
 net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper    |  33 +++
 .../files/webkit-gtk-1.11.90-gtk-docize-fix.patch  |  10 +
 .../files/webkit-gtk-1.6.1-darwin-quartz.patch     |  67 +++++
 .../webkit-gtk-1.6.3-paxctl-introspection.patch    |  21 ++
 ...webkit-gtk-1.7.90-test_garbage_collection.patch |  18 ++
 ...webkit-gtk-2.0.4-remove-nonstandard-isnan.patch |  12 +
 net-libs/webkit-gtk/metadata.xml                   |  12 +
 net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild    | 278 +++++++++++++++++++++
 8 files changed, 451 insertions(+)

diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
new file mode 100755
index 0000000..d4f270c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
+# generated by g-ir-scanner.
+# PaX marking code stolen from pax-utils.eclass
+
+flags=${1//-}; shift
+
+echo ${LIBTOOL} "$@"
+${LIBTOOL} "$@"
+
+retval=$?
+
+files=$(find . -path "*tmp-introspect*/.libs/*")
+
+if type -p paxctl > /dev/null; then
+	echo "PT PaX marking -${flags} ${files}"
+	for f in ${files}; do
+		# First, try modifying the existing PAX_FLAGS header
+		paxctl -q${flags} "${f}" && continue
+		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
+		paxctl -qc${flags} "${f}" && continue
+		# Third, try pulling the base down a page, to create space and
+		# insert a PT_GNU_STACK header (works on ET_EXEC)
+		paxctl -qC${flags} "${f}" && continue
+	done
+elif type -p scanelf > /dev/null; then
+	# Try scanelf, the Gentoo swiss-army knife ELF utility
+	# Currently this sets PT if it can, no option to control what it does.
+	echo "Fallback PaX marking -${flags} ${files}"
+	scanelf -Xxz ${flags} ${files}
+fi
+
+exit ${retval}

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
new file mode 100644
index 0000000..8f56ab2
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old	2013-03-02 09:22:53.791750644 +0200
++++ configure.ac	2013-03-02 09:24:56.725213764 +0200
+@@ -24,6 +24,7 @@
+ m4_include([Source/autotools/SetupLibtool.m4])
+ m4_include([Source/autotools/ReadCommandLineArguments.m4])
+ m4_include([Source/autotools/FindDependencies.m4])
++GTK_DOC_CHECK([1.10])
+ m4_include([Source/autotools/SetupCompilerFlags.m4])
+ m4_include([Source/autotools/SetupAutoconfHeader.m4])
+ 

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
new file mode 100644
index 0000000..5ad357e
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
@@ -0,0 +1,67 @@
+Original from:
+http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
+http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
+
+Adapted for 1.6.1
+
+--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+@@ -70,6 +70,8 @@
+ #endif
+ #include <gtk/gtk.h>
+ 
++#undef XP_UNIX
++
+ #if defined(XP_UNIX)
+ #include "RefPtrCairo.h"
+ #include "gtk2xtbin.h"
+@@ -439,9 +441,9 @@
+         event->setDefaultHandled();
+ }
+ 
+-#if defined(XP_UNIX)
+ void PluginView::handleFocusInEvent()
+ {
++#if defined(XP_UNIX)
+     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+         return;
+ 
+@@ -454,10 +456,12 @@
+     event.detail = NotifyDetailNone;
+ 
+     dispatchNPEvent(npEvent);
++#endif
+ }
+ 
+ void PluginView::handleFocusOutEvent()
+ {
++#if defined(XP_UNIX)
+     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+         return;
+ 
+@@ -470,8 +474,8 @@
+     event.detail = NotifyDetailNone;
+ 
+     dispatchNPEvent(npEvent);
+-}
+ #endif
++}
+ 
+ void PluginView::setParent(ScrollView* parent)
+ {
+--- Source/WebCore/plugins/gtk/gtk2xtbin.c
++++ Source/WebCore/plugins/gtk/gtk2xtbin.c
+@@ -41,7 +41,7 @@
+  * The GtkXtBin widget allows for Xt toolkit code to be used
+  * inside a GTK application.  
+  */
+-
++#if 0
+ #include "GtkVersioning.h"
+ #include "xembed.h"
+ #include "gtk2xtbin.h"
+@@ -966,3 +966,4 @@
+ 
+   return;
+ }
++#endif

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
new file mode 100644
index 0000000..c34cc40
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
@@ -0,0 +1,21 @@
+diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
+--- a/Source/WebKit/gtk/GNUmakefile.am
++++ b/Source/WebKit/gtk/GNUmakefile.am
+@@ -269,7 +269,7 @@
+ WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
+ 
+ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+-	$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
++	$(AM_V_GEN)LIBTOOL="$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \
+ 	     --symbol-prefix=webkit \
+ 	     --identifier-prefix=WebKit \
+ 	     --namespace=WebKit \
+@@ -280,7 +280,7 @@
+ 	     --include=Soup-2.4 \
+ 	     --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
+ 	     --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
+-	     --libtool="$(LIBTOOL)" \
++	     --libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \
+ 	     --pkg=gobject-2.0 \
+ 	     --pkg=gtk+-@GTK_API_VERSION@ \
+ 	     --pkg=libsoup-2.4 \

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
new file mode 100644
index 0000000..577c249
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
@@ -0,0 +1,18 @@
+Garbage collection test fails intermittently if icedtea browser plugin is
+installed.
+
+--- a/Source/WebKit/gtk/tests/testdomdocument.c
++++ b/Source/WebKit/gtk/tests/testdomdocument.c
+@@ -353,12 +353,6 @@
+                test_dom_document_get_links,
+                dom_document_fixture_teardown);
+ 
+-    g_test_add("/webkit/domdocument/test_garbage_collection",
+-               DomDocumentFixture, HTML_DOCUMENT_LINKS,
+-               dom_document_fixture_setup,
+-               test_dom_document_garbage_collection,
+-               dom_document_fixture_teardown);
+-
+     return g_test_run();
+ }
+ 

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
new file mode 100644
index 0000000..3941faf
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
@@ -0,0 +1,12 @@
+diff -Naur webkitgtk-2.0.4.orig/Source/JavaScriptCore/offlineasm/cloop.rb webkitgtk-2.0.4/Source/JavaScriptCore/offlineasm/cloop.rb
+--- webkitgtk-2.0.4.orig/Source/JavaScriptCore/offlineasm/cloop.rb	2013-07-19 07:03:48.000000000 +0000
++++ webkitgtk-2.0.4/Source/JavaScriptCore/offlineasm/cloop.rb	2013-12-18 22:45:01.710757198 +0000
+@@ -398,7 +398,7 @@
+ end
+ 
+ def cloopEmitCompareDoubleWithNaNCheckAndBranch(operands, condition)
+-    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || isnan(#{operands[1].clValue(:double)})"
++    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) )"
+     $asm.putc "    || (#{operands[0].clValue(:double)} #{condition} #{operands[1].clValue(:double)}))"
+     $asm.putc "    goto #{operands[2].cLabel};"
+ end

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
new file mode 100644
index 0000000..caf7f40
--- /dev/null
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+  	<flag name="coverage">Enable code coverage support</flag>
+	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
+	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
+	<flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
+  </use>
+</pkgmetadata>

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild
new file mode 100644
index 0000000..ec3021b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.8 2013/12/08 19:28:27 pacho Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="3/25" # soname version
+KEYWORDS="amd64"
+IUSE="aqua coverage debug +geoloc +gstreamer libsecret +introspection +jit spell uclibc +webgl"
+# bugs 372493, 416331
+REQUIRED_USE="
+	geoloc? ( introspection )
+	introspection? ( gstreamer )
+"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+# TODO: There's 3 acceleration backends: opengl, egl and gles2
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libwebp
+	virtual/jpeg:0=
+	>=media-libs/libpng-1.4:0=
+	>=x11-libs/cairo-1.10:=[X]
+	>=dev-libs/glib-2.36.0:2
+	>=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1:=
+	>=net-libs/libsoup-2.42.0:2.4[introspection?]
+	dev-db/sqlite:3=
+	>=x11-libs/pango-1.30.0.0
+	x11-libs/libXrender
+	>=x11-libs/gtk+-2.24.10:2
+
+	geoloc? ( app-misc/geoclue )
+	gstreamer? (
+		>=media-libs/gstreamer-1.0.3:1.0
+		>=media-libs/gst-plugins-base-1.0.3:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+	libsecret? ( app-crypt/libsecret )
+	spell? ( >=app-text/enchant-0.22:= )
+	webgl? (
+		virtual/opengl
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/perl
+	|| (
+		virtual/rubygems[ruby_targets_ruby20]
+		virtual/rubygems[ruby_targets_ruby19]
+		virtual/rubygems[ruby_targets_ruby18] )
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-util/gtk-doc-am-1.10
+	dev-util/gperf
+	sys-devel/bison
+	>=sys-devel/flex-2.5.33
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
+	sys-devel/gettext
+	>=sys-devel/make-3.82-r4
+	virtual/pkgconfig
+
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	nvidia_check || die #463960
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+		check-reqs_pkg_pretend
+	fi
+
+	if ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	nvidia_check || die #463960
+
+	# Check whether any of the debugging flags is enabled
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
+			replace-flags -ggdb -g
+			ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
+			ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
+			ewarn "large for current binutils releases (bug #432784) and has very"
+			ewarn "high temporary build space and memory requirements."
+			ewarn "If you really want to build ${PN} with \"-ggdb\", add"
+			ewarn "WEBKIT_GTK_GGDB=yes"
+			ewarn "to your make.conf file."
+		fi
+		einfo "You need to have at least 18GB of temporary build space available"
+		einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
+		einfo "not be enough, as the total space requirements depend on the flags"
+		einfo "(-ggdb vs -g1) and enabled features."
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	use uclibc && epatch "${FILESDIR}"/${P}-remove-nonstandard-isnan.patch
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die
+
+	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	fi
+
+	# We need to reset some variables to prevent permissions problems and failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# Failing tests
+	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
+	# * keyevents is interactive
+	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #????
+	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
+	# * webplugindatabase intermittently fails with icedtea-web, bug #????
+	sed -e '/Programs\/unittests\/testwebinspector/ d' \
+		-e '/Programs\/unittests\/testkeyevents/ d' \
+		-e '/Programs\/unittests\/testmimehandling/ d' \
+		-e '/Programs\/unittests\/testwebdatasource/ d' \
+		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
+		-i Source/WebKit/gtk/GNUmakefile.am || die
+
+	if ! use gstreamer; then
+		# webkit2's TestWebKitWebView requires <video> support, bug #????
+		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
+			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
+	fi
+	# garbage collection test fails intermittently if icedtea-web is installed, bug #????
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# bug #459978, upstream bug #113397
+	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS, bug #????
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #????
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942
+	append-ldflags "-Wl,--no-keep-memory"
+
+	local myconf
+	# TODO: Check Web Audio support
+	# TODO: There's 3 acceleration backends: opengl, egl and gles2
+	# should somehow let user select between them?
+	#
+	# * dependency-tracking is required so parallel builds won't fail
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable geoloc geolocation)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable libsecret credential_storage)
+		$(use_enable webgl)
+		--disable-egl
+		--disable-gles2
+		--with-gtk=3.0
+		--enable-accelerated-compositing
+		--enable-dependency-tracking
+		--disable-gtk-doc
+		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
+		# Aqua support in gtk3 is untested
+
+	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		myconf="${myconf} RUBY=$(type -P ruby20)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+		myconf="${myconf} RUBY=$(type -P ruby19)"
+	else
+		myconf="${myconf} RUBY=$(type -P ruby18)"
+	fi
+
+	econf ${myconf}
+}
+
+#src_compile() {
+	# Avoid parallel make failure with -j9, bug #????
+#	emake DerivedSources/WebCore/JSNode.h
+#	default
+#}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \
+		Programs/unittests/.libs/test*
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	prune_libtool_files
+
+	# Prevents crashes on PaX systems
+	use jit && pax-mark m "${ED}usr/bin/jsc-3"
+}
+
+nvidia_check() {
+	if [[ ${MERGE_TYPE} != "binary" ]] &&
+	   use introspection &&
+	   has_version '=x11-drivers/nvidia-drivers-325*' &&
+	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+	then
+		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
+		eerror "used as the system OpenGL library."
+		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
+		eerror "Mesa as the system OpenGL library:"
+		eerror " # eselect opengl set xorg-x11"
+		eerror "See https://bugs.gentoo.org/463960 for more details."
+		eerror
+		return 1
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
@ 2013-12-19 22:06 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2013-12-19 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     dd70214c7b56009a9b35507fdc238e5ccfaba2aa
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 22:06:49 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 22:06:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=dd70214c

net-libs/webkit-gtk: fix unbalanced bracket

Package-Manager: portage-2.2.7
Manifest-Sign-Key: 0xF52D4BBA

---
 .../webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch    | 2 +-
 net-libs/webkit-gtk/metadata.xml                                        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
index 3941faf..0973216 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
@@ -6,7 +6,7 @@ diff -Naur webkitgtk-2.0.4.orig/Source/JavaScriptCore/offlineasm/cloop.rb webkit
  
  def cloopEmitCompareDoubleWithNaNCheckAndBranch(operands, condition)
 -    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || isnan(#{operands[1].clValue(:double)})"
-+    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) )"
++    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) "
      $asm.putc "    || (#{operands[0].clValue(:double)} #{condition} #{operands[1].clValue(:double)}))"
      $asm.putc "    goto #{operands[2].cLabel};"
  end

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index caf7f40..de08c6e 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -7,6 +7,5 @@
 	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
-	<flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/hardened-dev:uclibc commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
@ 2015-04-22 18:20 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2015-04-22 18:20 UTC (permalink / raw
  To: gentoo-commits

commit:     629994a022ee6d308e97b8b0630614e52d59cdaa
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 18:23:00 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 18:23:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=629994a0

net-libs/webkit-gtk: in tree version works.

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0xF52D4BBA

 net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper    |  33 ---
 .../files/webkit-gtk-1.11.90-gtk-docize-fix.patch  |  10 -
 .../files/webkit-gtk-1.6.1-darwin-quartz.patch     |  67 -----
 .../webkit-gtk-1.6.3-paxctl-introspection.patch    |  21 --
 ...webkit-gtk-1.7.90-test_garbage_collection.patch |  18 --
 ...webkit-gtk-2.0.4-remove-nonstandard-isnan.patch |  12 -
 net-libs/webkit-gtk/metadata.xml                   |  11 -
 net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild    | 278 ---------------------
 8 files changed, 450 deletions(-)

diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
deleted file mode 100755
index d4f270c..0000000
--- a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
-# generated by g-ir-scanner.
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-echo ${LIBTOOL} "$@"
-${LIBTOOL} "$@"
-
-retval=$?
-
-files=$(find . -path "*tmp-introspect*/.libs/*")
-
-if type -p paxctl > /dev/null; then
-	echo "PT PaX marking -${flags} ${files}"
-	for f in ${files}; do
-		# First, try modifying the existing PAX_FLAGS header
-		paxctl -q${flags} "${f}" && continue
-		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
-		paxctl -qc${flags} "${f}" && continue
-		# Third, try pulling the base down a page, to create space and
-		# insert a PT_GNU_STACK header (works on ET_EXEC)
-		paxctl -qC${flags} "${f}" && continue
-	done
-elif type -p scanelf > /dev/null; then
-	# Try scanelf, the Gentoo swiss-army knife ELF utility
-	# Currently this sets PT if it can, no option to control what it does.
-	echo "Fallback PaX marking -${flags} ${files}"
-	scanelf -Xxz ${flags} ${files}
-fi
-
-exit ${retval}

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
deleted file mode 100644
index 8f56ab2..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.old	2013-03-02 09:22:53.791750644 +0200
-+++ configure.ac	2013-03-02 09:24:56.725213764 +0200
-@@ -24,6 +24,7 @@
- m4_include([Source/autotools/SetupLibtool.m4])
- m4_include([Source/autotools/ReadCommandLineArguments.m4])
- m4_include([Source/autotools/FindDependencies.m4])
-+GTK_DOC_CHECK([1.10])
- m4_include([Source/autotools/SetupCompilerFlags.m4])
- m4_include([Source/autotools/SetupAutoconfHeader.m4])
- 

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
deleted file mode 100644
index 5ad357e..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Original from:
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
-
-Adapted for 1.6.1
-
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -70,6 +70,8 @@
- #endif
- #include <gtk/gtk.h>
- 
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "RefPtrCairo.h"
- #include "gtk2xtbin.h"
-@@ -439,9 +441,9 @@
-         event->setDefaultHandled();
- }
- 
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -454,10 +456,12 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
-+#endif
- }
- 
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -470,8 +474,8 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
--}
- #endif
-+}
- 
- void PluginView::setParent(ScrollView* parent)
- {
---- Source/WebCore/plugins/gtk/gtk2xtbin.c
-+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
-@@ -41,7 +41,7 @@
-  * The GtkXtBin widget allows for Xt toolkit code to be used
-  * inside a GTK application.  
-  */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -966,3 +966,4 @@
- 
-   return;
- }
-+#endif

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
deleted file mode 100644
index c34cc40..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
---- a/Source/WebKit/gtk/GNUmakefile.am
-+++ b/Source/WebKit/gtk/GNUmakefile.am
-@@ -269,7 +269,7 @@
- WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
- 
- $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
--	$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
-+	$(AM_V_GEN)LIBTOOL="$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \
- 	     --symbol-prefix=webkit \
- 	     --identifier-prefix=WebKit \
- 	     --namespace=WebKit \
-@@ -280,7 +280,7 @@
- 	     --include=Soup-2.4 \
- 	     --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
- 	     --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
--	     --libtool="$(LIBTOOL)" \
-+	     --libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \
- 	     --pkg=gobject-2.0 \
- 	     --pkg=gtk+-@GTK_API_VERSION@ \
- 	     --pkg=libsoup-2.4 \

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
deleted file mode 100644
index 577c249..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Garbage collection test fails intermittently if icedtea browser plugin is
-installed.
-
---- a/Source/WebKit/gtk/tests/testdomdocument.c
-+++ b/Source/WebKit/gtk/tests/testdomdocument.c
-@@ -353,12 +353,6 @@
-                test_dom_document_get_links,
-                dom_document_fixture_teardown);
- 
--    g_test_add("/webkit/domdocument/test_garbage_collection",
--               DomDocumentFixture, HTML_DOCUMENT_LINKS,
--               dom_document_fixture_setup,
--               test_dom_document_garbage_collection,
--               dom_document_fixture_teardown);
--
-     return g_test_run();
- }
- 

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
deleted file mode 100644
index 0973216..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.0.4-remove-nonstandard-isnan.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur webkitgtk-2.0.4.orig/Source/JavaScriptCore/offlineasm/cloop.rb webkitgtk-2.0.4/Source/JavaScriptCore/offlineasm/cloop.rb
---- webkitgtk-2.0.4.orig/Source/JavaScriptCore/offlineasm/cloop.rb	2013-07-19 07:03:48.000000000 +0000
-+++ webkitgtk-2.0.4/Source/JavaScriptCore/offlineasm/cloop.rb	2013-12-18 22:45:01.710757198 +0000
-@@ -398,7 +398,7 @@
- end
- 
- def cloopEmitCompareDoubleWithNaNCheckAndBranch(operands, condition)
--    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || isnan(#{operands[1].clValue(:double)})"
-+    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) "
-     $asm.putc "    || (#{operands[0].clValue(:double)} #{condition} #{operands[1].clValue(:double)}))"
-     $asm.putc "    goto #{operands[2].cLabel};"
- end

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
deleted file mode 100644
index de08c6e..0000000
--- a/net-libs/webkit-gtk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-  	<flag name="coverage">Enable code coverage support</flag>
-	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
-	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
-	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
-  </use>
-</pkgmetadata>

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild
deleted file mode 100644
index ec3021b..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.4-r99.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.8 2013/12/08 19:28:27 pacho Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version
-KEYWORDS="amd64"
-IUSE="aqua coverage debug +geoloc +gstreamer libsecret +introspection +jit spell uclibc +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# TODO: There's 3 acceleration backends: opengl, egl and gles2
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libwebp
-	virtual/jpeg:0=
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10:=[X]
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1:=
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
-	dev-db/sqlite:3=
-	>=x11-libs/pango-1.30.0.0
-	x11-libs/libXrender
-	>=x11-libs/gtk+-2.24.10:2
-
-	geoloc? ( app-misc/geoclue )
-	gstreamer? (
-		>=media-libs/gstreamer-1.0.3:1.0
-		>=media-libs/gst-plugins-base-1.0.3:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		virtual/opengl
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby19]
-		virtual/rubygems[ruby_targets_ruby18] )
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	nvidia_check || die #463960
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	nvidia_check || die #463960
-
-	# Check whether any of the debugging flags is enabled
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
-			replace-flags -ggdb -g
-			ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
-			ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
-			ewarn "large for current binutils releases (bug #432784) and has very"
-			ewarn "high temporary build space and memory requirements."
-			ewarn "If you really want to build ${PN} with \"-ggdb\", add"
-			ewarn "WEBKIT_GTK_GGDB=yes"
-			ewarn "to your make.conf file."
-		fi
-		einfo "You need to have at least 18GB of temporary build space available"
-		einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
-		einfo "not be enough, as the total space requirements depend on the flags"
-		einfo "(-ggdb vs -g1) and enabled features."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	use uclibc && epatch "${FILESDIR}"/${P}-remove-nonstandard-isnan.patch
-
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# Failing tests
-	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
-	# * keyevents is interactive
-	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #????
-	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
-	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-
-	if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support, bug #????
-		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
-	fi
-	# garbage collection test fails intermittently if icedtea-web is installed, bug #????
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS, bug #????
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #????
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942
-	append-ldflags "-Wl,--no-keep-memory"
-
-	local myconf
-	# TODO: Check Web Audio support
-	# TODO: There's 3 acceleration backends: opengl, egl and gles2
-	# should somehow let user select between them?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable libsecret credential_storage)
-		$(use_enable webgl)
-		--disable-egl
-		--disable-gles2
-		--with-gtk=3.0
-		--enable-accelerated-compositing
-		--enable-dependency-tracking
-		--disable-gtk-doc
-		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
-		# Aqua support in gtk3 is untested
-
-	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby18)"
-	fi
-
-	econf ${myconf}
-}
-
-#src_compile() {
-	# Avoid parallel make failure with -j9, bug #????
-#	emake DerivedSources/WebCore/JSNode.h
-#	default
-#}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) \
-		Programs/unittests/.libs/test*
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	prune_libtool_files
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-22 18:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-19 22:06 [gentoo-commits] proj/hardened-dev:uclibc commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2015-04-22 18:20 Anthony G. Basile
2013-12-18 22:52 Anthony G. Basile
2013-05-09 22:39 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox