From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SpIac-0000Y6-BW for garchives@archives.gentoo.org; Thu, 12 Jul 2012 12:33:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 198DFE05EF; Thu, 12 Jul 2012 12:33:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B4694E05EF for ; Thu, 12 Jul 2012 12:33:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0C661B400B for ; Thu, 12 Jul 2012 12:33:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 57B6DE5433 for ; Thu, 12 Jul 2012 12:33:25 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1342096296.e7f0d84a0ad621789983c8849e2de5a610468867.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failure.patch net-libs/webkit-gtk/metadata.xml net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: e7f0d84a0ad621789983c8849e2de5a610468867 X-VCS-Branch: master Date: Thu, 12 Jul 2012 12:33:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 92fa9de2-2b10-4f33-be78-49649d072110 X-Archives-Hash: f38a8c8a2e1af793e4ae4c53d635a4e6 commit: e7f0d84a0ad621789983c8849e2de5a610468867 Author: Priit Laes plaes org> AuthorDate: Thu Jul 12 12:31:36 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Thu Jul 12 12:31:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3De7f0d84a net-libs/webkit-gtk: Added 1.9.4 to overlay --- net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper | 33 +++ .../files/webkit-gtk-1.2.3-fix-pool-sparc.patch | 65 ++++++ .../files/webkit-gtk-1.2.5-darwin-quartz.patch | 79 +++++++ .../files/webkit-gtk-1.2.5-darwin8.patch | 33 +++ .../files/webkit-gtk-1.2.5-tests-build.patch | 22 ++ .../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 ++ .../files/webkit-gtk-1.8.0-no-geoloc.patch | 57 +++++ .../files/webkit-gtk-1.8.1-tests-xvfb.patch | 32 +++ .../webkit-gtk-1.9.4-llint-build-failure.patch | 43 ++++ net-libs/webkit-gtk/metadata.xml | 16 ++ net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild | 220 ++++++++++++++= ++++++ 13 files changed, 706 insertions(+), 0 deletions(-) diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/w= ebkit-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=3D${1//-}; shift + +echo ${LIBTOOL} "$@" +${LIBTOOL} "$@" + +retval=3D$? + +files=3D$(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.2.3-fix-pool-sparc.pa= tch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch new file mode 100644 index 0000000..3b1c5c4 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch @@ -0,0 +1,65 @@ +Description: Fixup pool and add sparc support +--- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h ++++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h +@@ -127,7 +127,7 @@ namespace WTF { + : m_freeList(pool()) + , m_isDoneWithInitialFreeList(false) + {=20 +- memset(m_pool.pool, 0, sizeof(m_pool.pool)); ++ memset(m_pool, 0, sizeof(m_pool)); + } +=20 + Node* allocate() +@@ -171,7 +171,7 @@ namespace WTF { + } +=20 + private: +- Node* pool() { return reinterpret_cast(m_pool.pool); } ++ Node* pool() { return reinterpret_cast(m_pool); } + Node* pastPool() { return pool() + m_poolSize; } +=20 + bool inPool(Node* node) +@@ -182,10 +182,7 @@ namespace WTF { + Node* m_freeList; + bool m_isDoneWithInitialFreeList; + static const size_t m_poolSize =3D 256; +- union { +- char pool[sizeof(Node) * m_poolSize]; +- double forAlignment; +- } m_pool; ++ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) -= 1) / sizeof(uint32_t)]; + }; +=20 + template struct ListHashSetNode { +--- webkit-1.2.1.orig/WebCore/platform/text/AtomicString.cpp ++++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp +@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str + if (string->length() !=3D length) + return false; +=20 ++#if CPU(ARM) || CPU(SPARC) || CPU(SH4) + // FIXME: perhaps we should have a more abstract macro that indicat= es when + // going 4 bytes at a time is unsafe +-#if CPU(ARM) || CPU(SH4) + const UChar* stringCharacters =3D string->characters(); + for (unsigned i =3D 0; i !=3D length; ++i) { + if (*stringCharacters++ !=3D *characters++) +--- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h ++++ webkit-1.2.1/WebCore/platform/text/StringHash.h +@@ -54,13 +54,13 @@ namespace WebCore { +=20 + // FIXME: perhaps we should have a more abstract macro that= indicates when + // going 4 bytes at a time is unsafe +-#if CPU(ARM) || CPU(SH4) ++#if CPU(ARM) || CPU(SPARC) || CPU(SH4) + const UChar* aChars =3D a->characters(); + const UChar* bChars =3D b->characters(); +- for (unsigned i =3D 0; i !=3D aLength; ++i) { ++ for (unsigned i =3D 0; i !=3D aLength; ++i) + if (*aChars++ !=3D *bChars++) + return false; +- } ++ + return true; + #else + /* Do it 4-bytes-at-a-time on architectures where it's safe= */ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.pat= ch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch new file mode 100644 index 0000000..5046118 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch @@ -0,0 +1,79 @@ +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch= -quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=3Dtxt +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch= -quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=3Dtxt + +--- 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. =20 + */ +- ++#if 0 + #include "GtkVersioning.h" + #include "xembed.h" + #include "gtk2xtbin.h" +@@ -951,3 +951,4 @@ +=20 + return; + } ++#endif +--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp ++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp +@@ -60,10 +60,13 @@ + #include "runtime_root.h" + #include + #include ++#include "NotImplemented.h" +=20 + #include + #include +=20 ++#undef XP_UNIX ++ + #if defined(XP_UNIX) + #include "gtk2xtbin.h" + #define Bool int // this got undefined somewhere +@@ -441,9 +444,9 @@ + event->setDefaultHandled(); + } +=20 +-#if defined(XP_UNIX) + void PluginView::handleFocusInEvent() + { ++#if defined(XP_UNIX) + XEvent npEvent; + initXEvent(&npEvent); +=20 +@@ -453,10 +456,12 @@ + event.detail =3D NotifyDetailNone; +=20 + dispatchNPEvent(npEvent); ++#endif + } +=20 + void PluginView::handleFocusOutEvent() + { ++#if defined(XP_UNIX) + XEvent npEvent; + initXEvent(&npEvent); +=20 +@@ -466,8 +471,8 @@ + event.detail =3D NotifyDetailNone; +=20 + dispatchNPEvent(npEvent); +-} + #endif ++} +=20 + void PluginView::setParent(ScrollView* parent) + { +@@ -797,8 +802,8 @@ + } +=20 + if (m_isWindowed) { +-#if defined(XP_UNIX) + GtkWidget* pageClient =3D m_parentFrame->view()->hostWindow()->= platformPageClient(); ++#if defined(XP_UNIX) +=20 + if (m_needsXEmbed) { + // If our parent is not anchored the startup process will diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch b/n= et-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch new file mode 100644 index 0000000..cf25b5d --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch @@ -0,0 +1,33 @@ +https://bugs.webkit.org/show_bug.cgi?id=3D39847 + +additionally, also on Darwin8 glib stuff includes system headers that +use isascii, so we can't have it die on that. + +--- JavaScriptCore/wtf/FastMalloc.cpp ++++ JavaScriptCore/wtf/FastMalloc.cpp +@@ -1381,14 +1381,12 @@ + // Bytes allocated from system + uint64_t system_bytes_; +=20 +-#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY + // Number of pages kept in free lists that are still committed. + Length free_committed_pages_; +=20 + // Minimum number of free committed pages since last scavenge. (Can b= e 0 if + // we've committed new pages since the last scavenge.) + Length min_free_committed_pages_since_last_scavenge_; +-#endif +=20 + bool GrowHeap(Length n); +=20 +--- WebCore/config.h ++++ WebCore/config.h +@@ -125,7 +125,7 @@ + // this breaks compilation of , at least, so turn it off= for now + // Also generates errors on wx on Windows, presumably because these fun= ctions + // are used from wx headers. +-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) ++#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !defined(B= UILDING_ON_TIGER) + #include + #endif +=20 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch= b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch new file mode 100644 index 0000000..0d9e144 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch @@ -0,0 +1,22 @@ +Do not build tests if not requested to. + +--- a/GNUmakefile.am 2010-12-21 17:23:58.000000000 +0100 ++++ b/GNUmakefile.am 2010-12-21 17:24:28.000000000 +0100 +@@ -46,7 +46,8 @@ +=20 + # Libraries and support components + bin_PROGRAMS :=3D ++check_PROGRAMS :=3D + noinst_PROGRAMS :=3D + noinst_HEADERS :=3D + noinst_LTLIBRARIES :=3D + lib_LIBRARIES :=3D +@@ -541,7 +541,7 @@ + include WebKit/gtk/po/GNUmakefile.am +=20 + # Build unit tests +-noinst_PROGRAMS +=3D $(TEST_PROGS) ++check_PROGRAMS +=3D $(TEST_PROGS) +=20 + webkit_tests_cflags =3D \ + -fno-strict-aliasing \ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.pat= ch 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=3Dtxt +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch= -quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=3Dtxt + +Adapted for 1.6.1 + +--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp ++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp +@@ -70,6 +70,8 @@ + #endif + #include +=20 ++#undef XP_UNIX ++ + #if defined(XP_UNIX) + #include "RefPtrCairo.h" + #include "gtk2xtbin.h" +@@ -439,9 +441,9 @@ + event->setDefaultHandled(); + } +=20 +-#if defined(XP_UNIX) + void PluginView::handleFocusInEvent() + { ++#if defined(XP_UNIX) + if (!m_isStarted || m_status !=3D PluginStatusLoadedSuccessfully) + return; +=20 +@@ -454,10 +456,12 @@ + event.detail =3D NotifyDetailNone; +=20 + dispatchNPEvent(npEvent); ++#endif + } +=20 + void PluginView::handleFocusOutEvent() + { ++#if defined(XP_UNIX) + if (!m_isStarted || m_status !=3D PluginStatusLoadedSuccessfully) + return; +=20 +@@ -470,8 +474,8 @@ + event.detail =3D NotifyDetailNone; +=20 + dispatchNPEvent(npEvent); +-} + #endif ++} +=20 + 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. =20 + */ +- ++#if 0 + #include "GtkVersioning.h" + #include "xembed.h" + #include "gtk2xtbin.h" +@@ -966,3 +966,4 @@ +=20 + return; + } ++#endif diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspect= ion.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspecti= on.patch new file mode 100644 index 0000000..c34cc40 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.pat= ch @@ -0,0 +1,21 @@ +diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakef= ile.am +--- a/Source/WebKit/gtk/GNUmakefile.am ++++ b/Source/WebKit/gtk/GNUmakefile.am +@@ -269,7 +269,7 @@ + WEBKIT_GIRSOURCES +=3D WebKit-@WEBKITGTK_API_VERSION@.gir +=20 + $(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=3D"$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \ + --symbol-prefix=3Dwebkit \ + --identifier-prefix=3DWebKit \ + --namespace=3DWebKit \ +@@ -280,7 +280,7 @@ + --include=3DSoup-2.4 \ + --library=3Dwebkitgtk-@WEBKITGTK_API_VERSION@ \ + --library=3Djavascriptcoregtk-@WEBKITGTK_API_VERSION@ \ +- --libtool=3D"$(LIBTOOL)" \ ++ --libtool=3D"bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \ + --pkg=3Dgobject-2.0 \ + --pkg=3Dgtk+-@GTK_API_VERSION@ \ + --pkg=3Dlibsoup-2.4 \ diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_col= lection.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 i= s +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); +=20 +- 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(); + } +=20 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch b= /net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch new file mode 100644 index 0000000..1094f50 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-no-geoloc.patch @@ -0,0 +1,57 @@ +2012-03-31 Martin Robinson + + [GTK] [Stable] --disable geolocation broken after recent merges + https://bugs.webkit.org/show_bug.cgi?id=3D82452 + + No review, as this is just a build fix. + + Fix the geolocation build. + + * webkit/webkitgeolocationpolicydecision.cpp: + (webkit_geolocation_policy_decision_new): When gelocation is off= , just return null. + * webkit/webkitgeolocationpolicydecisionprivate.h: Activate webk= it_geolocation_policy_decision_new + for non-Geolocation builds. + +Index: /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeo= locationpolicydecisionprivate.h +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeoloc= ationpolicydecisionprivate.h (revision 112120) ++++ /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeoloc= ationpolicydecisionprivate.h (revision 112800) +@@ -26,6 +26,4 @@ + #include "webkitgeolocationpolicydecision.h" +=20 +-#if ENABLE(GEOLOCATION) +- + extern "C" { +=20 +@@ -34,5 +32,3 @@ + } +=20 +-#endif // ENABLE(GEOLOCATION) +- + #endif +Index: /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeo= locationpolicydecision.cpp +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeoloc= ationpolicydecision.cpp (revision 112120) ++++ /releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitgeoloc= ationpolicydecision.cpp (revision 112800) +@@ -54,8 +54,8 @@ + } +=20 +-#if ENABLE(GEOLOCATION) + WebKitGeolocationPolicyDecision* webkit_geolocation_policy_decision_new= (WebKitWebFrame* frame, WebCore::Geolocation* geolocation) + { +- g_return_val_if_fail(frame, NULL); ++#if ENABLE(GEOLOCATION) ++ g_return_val_if_fail(frame, 0); + WebKitGeolocationPolicyDecision* decision =3D WEBKIT_GEOLOCATION_PO= LICY_DECISION(g_object_new(WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION, NULL)= ); + WebKitGeolocationPolicyDecisionPrivate* priv =3D decision->priv; +@@ -64,6 +64,8 @@ + priv->geolocation =3D geolocation; + return decision; ++#else ++ return 0; ++#endif + } +-#endif +=20 + /** +=20 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 new file mode 100644 index 0000000..e310c65 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch @@ -0,0 +1,32 @@ +Rely on virtualx.eclass instead of manually spawning Xvfb. Fixes occasio= nal +test failures. + +--- a/Tools/Scripts/run-gtk-tests ++++ b/Tools/Scripts/run-gtk-tests +@@ -147,18 +147,9 @@ +=20 + def _setup_testing_environment(self): + self._test_env =3D os.environ +- self._test_env["DISPLAY"] =3D self._options.display + self._test_env["WEBKIT_INSPECTOR_PATH"] =3D os.path.abspath(os.= path.join(self._programs_path, 'resources', 'inspector')) + self._test_env['GSETTINGS_BACKEND'] =3D 'memory' +=20 +- try: +- self._xvfb =3D self._create_process(["Xvfb", self._options.= display, "-screen", "0", "800x600x24", "-nolisten", "tcp"], +- stdout=3Dsubprocess.PIPE,= stderr=3Dsubprocess.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 ski= p the accessibility tests. + if not self._start_accessibility_daemons(): + print "Could not start accessibility bus, so skipping TestW= ebKitAccessibility" +@@ -170,7 +161,6 @@ + self._spi_registryd.terminate() + if self._spi_bus_launcher: + self._spi_bus_launcher.terminate() +- self._xvfb.kill(); +=20 + def _remove_skipped_tests(self): + tests_to_remove =3D [] diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failu= re.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failure= .patch new file mode 100644 index 0000000..a614d3b --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failure.patc= h @@ -0,0 +1,43 @@ +[GTK] LLint build fails with -g -02 +https://bugs.webkit.org/show_bug.cgi?id=3D90098 + +diff --git a/Source/JavaScriptCore/offlineasm/offsets.rb b/Source/JavaSc= riptCore/offlineasm/offsets.rb +index 4f2734f..ecd1b53 100644 +--- a/Source/JavaScriptCore/offlineasm/offsets.rb ++++ b/Source/JavaScriptCore/offlineasm/offsets.rb +@@ -60,7 +60,7 @@ end +=20 + # + # offsetsAndConfigurationIndex(ast, file) -> +-# [[offsets, index], ...] ++# {[offsets, index], ...} + # + # Parses the offsets from a file and returns a list of offsets and the + # index of the configuration that is valid in this build target. +@@ -68,7 +68,7 @@ end +=20 + def offsetsAndConfigurationIndex(file) + endiannessMarkerBytes =3D nil +- result =3D [] ++ result =3D {} + =20 + def readInt(endianness, bytes) + if endianness =3D=3D :little +@@ -154,13 +154,15 @@ def offsetsAndConfigurationIndex(file) + | data | + offsets << readInt(endianness, data) + } +- result << [offsets, index] ++ #result << [offsets, index] ++ if not result.has_key?(offsets) ++ result[offsets] =3D index ++ end + } + end + } + =20 + raise MissingMagicValuesException unless result.length >=3D 1 +- raise if result.map{|v| v[1]}.uniq.size < result.map{|v| v[1]}.size + =20 + result + end diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metad= ata.xml new file mode 100644 index 0000000..4232b5d --- /dev/null +++ b/net-libs/webkit-gtk/metadata.xml @@ -0,0 +1,16 @@ + + + + gnome + + Enable code coverage support + Enable geolocation support through + app-misc/geoclue + Use dev-libs/gobject-introspection + for introspection + Build support for the WebGL HTML API using + virtual/opengl + Enable WebKit2 API that splits web content rende= ring + and application UI into separate processes + + diff --git a/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.9.4-r300.ebuild new file mode 100644 index 0000000..93fd313 --- /dev/null +++ b/net-libs/webkit-gtk/webkit-gtk-1.9.4-r300.ebuild @@ -0,0 +1,220 @@ +# 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.1-= r301.ebuild,v 1.5 2012/06/20 06:34:59 ssuominen Exp $ + +EAPI=3D"4" + +# Don't define PYTHON_DEPEND: python only needed at build time +inherit autotools flag-o-matic gnome2-utils pax-utils python virtualx + +MY_P=3D"webkit-${PV}" +DESCRIPTION=3D"Open source web browser engine" +HOMEPAGE=3D"http://www.webkitgtk.org/" +SRC_URI=3D"http://www.webkitgtk.org/releases/${MY_P}.tar.xz" +#SRC_URI=3D"mirror://gentoo/${P}.tar.xz" + +LICENSE=3D"LGPL-2 LGPL-2.1 BSD" +SLOT=3D"3" +KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd= ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +# geoclue +IUSE=3D"aqua coverage debug doc +geoloc +gstreamer +introspection +jit s= pell +webgl" +# bugs 372493, 416331 +REQUIRED_USE=3D"introspection? ( geoloc gstreamer )" + +# use sqlite, svg by default +# dependency on >=3Dx11-libs/gtk+-2.13:2 for gail +# Aqua support in gtk3 is untested +# gtk2 is needed for plugin process support +RDEPEND=3D" + dev-libs/libxml2:2 + dev-libs/libxslt + virtual/jpeg + >=3Dmedia-libs/libpng-1.4:0 + >=3Dx11-libs/cairo-1.10 + >=3Ddev-libs/glib-2.32:2 + >=3Dx11-libs/gtk+-3.4:3[aqua=3D,introspection?] + >=3Ddev-libs/icu-3.8.1-r1 + >=3Dnet-libs/libsoup-2.37.92:2.4[introspection?] + dev-db/sqlite:3 + >=3Dx11-libs/pango-1.21 + x11-libs/libXrender + >=3Dx11-libs/gtk+-2.13:2 + + geoloc? ( app-misc/geoclue ) + + gstreamer? ( + media-libs/gstreamer:0.10 + >=3Dmedia-libs/gst-plugins-base-0.10.30:0.10 ) + + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) + + spell? ( >=3Dapp-text/enchant-0.22 ) + + webgl? ( virtual/opengl ) + +" +# paxctl needed for bug #407085 +DEPEND=3D"${RDEPEND} + dev-lang/perl + =3Ddev-lang/python-2* + sys-devel/bison + >=3Dsys-devel/flex-2.5.33 + sys-devel/gettext + dev-util/gperf + virtual/pkgconfig + dev-util/gtk-doc-am + app-accessibility/at-spi2-core + + doc? ( >=3Ddev-util/gtk-doc-1.10 ) + introspection? ( jit? ( sys-apps/paxctl ) ) + test? ( + x11-themes/hicolor-icon-theme + jit? ( sys-apps/paxctl ) ) +" +# Need real bison, not yacc + +S=3D"${WORKDIR}/${MY_P}" + +pkg_setup() { + # Needed for CodeGeneratorInspector.py + python_set_active_version 2 + python_pkg_setup + if is-flagq "-g*" ; then + einfo "You need ~23GB of free space to build this package with debuggi= ng CFLAGS." + fi +} + +src_prepare() { + DOCS=3D"ChangeLog NEWS" # other ChangeLog files handled by src_install + + # intermediate MacPorts hack while upstream bug is not fixed properly + # https://bugs.webkit.org/show_bug.cgi?id=3D28727 + use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch + + # Drop DEPRECATED flags + LC_ALL=3DC sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakef= ile.am || die + + # Don't force -O2 + sed -i 's/-O2//g' "${S}"/configure.ac || die + + # Build-time segfaults under PaX with USE=3D"introspection jit", bug #4= 04215 + 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 f= ailures + # like https://bugs.webkit.org/show_bug.cgi?id=3D35471 and bug #323669 + gnome2_environment_reset + + # https://bugs.webkit.org/show_bug.cgi?id=3D79498 + #epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch" + + # XXX: failing tests + # https://bugs.webkit.org/show_bug.cgi?id=3D50744 + # testkeyevents is interactive + # mimehandling test sometimes fails under Xvfb (works fine manually) + # datasource test needs a network connection and intermittently fails w= ith + # icedtea-web + sed -e '/Programs\/unittests\/testwebinspector/ d' \ + -e '/Programs\/unittests\/testkeyevents/ d' \ + -e '/Programs\/unittests\/testmimehandling/ d' \ + -e '/Programs\/unittests\/testwebdatasource/ d' \ + -i Source/WebKit/gtk/GNUmakefile.am || die + if ! use gstreamer; then + # webkit2's TestWebKitWebView requires