webkit-gtk-2.2.2 fix

10 files changed, 288 insertions, 1 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 12bf50f..a229c81 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,11 +2,19 @@ AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062c
 AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
 AUX webkit-gtk-1.7.90-test_garbage_collection.patch 597 SHA256 f2ca641430a0ff09001391d649aaf135c151177ce879a29136c78a68f2dfc4d0 SHA512 5d6cbe8977918ef75d9d9d2b3c31815981e85ebe2ddf467577a3de5854aa123b884158fb4c3142ab69e028f32e3715f8d9ace56545236b6bf470af8a3dff42ec WHIRLPOOL c905f847ea9c75eca9f1ba127ab0a46d3c993bef23d5c40b75bfe4fa109bb01d8f3f181c933ac7440308d112bffc5c50f20af735d24b7781b43f742be5e9e888
+AUX webkit-gtk-2.2.2-3dopengles.patch 503 SHA256 1a1200bf1ada2bc84b00c2687e73c1b8eee781daea56831ea097b1e507ca974d SHA512 6a296985ced4922c8959f2cf563e249fff784e5a4291b87550312966a93b1f85e4c478fd9803077c1c783377ddd46f6a646dd469fbdd024494f5fe297788c4e9 WHIRLPOOL b75e0397e17162315895175f9a01be7cab8551fb772c273343fc91c1384d906fcefe5468acb8398e908a41c998dfd0814ff052ccc9af1073724be2b6b1acf0bf
 AUX webkit-gtk-2.2.2-freetype-2.5.1.patch 2851 SHA256 5f1fe73fb19c91b44749cdd68452ab124b533001d9e8a1c90f4cb9cbe416a9d8 SHA512 19c51e02189a177ce4a2b4a2f929cacc621e2e453d402c3b0eea91306a1ed6cde638ce62b665301a48c365efc8aedcedb2370ea95555515d4d6c546dc19c569f WHIRLPOOL cfa950c38310effa0eb09c3942d8e321097d783197e5bbcfbf2967a5414d40a8270baf2589765cc12da32ab1b25b26752d9932158b91df404aee2e8ece6fef2c
+AUX webkit-gtk-2.2.2-gles2-texmap.patch 2443 SHA256 30f3bf54ec911ac9a6af191169b60bc415fb23aef18fc31b3417a3be4ba752da SHA512 c3c0a657cbf45d31a50b8d4a6b21fde648c15b6cea4a225971d00a702a8d53e5e788beca311c14e01ab59f7e729aef5ea6a63a819062dd1c669406342a3c682f WHIRLPOOL 168a13fbc42097b6eeca208f1a10f818604faada068076e8c90ff0495f98a7a4a222bab07ba4513e739cc837d285d4dddf27ad8e8e4a92e66012cb052de6702c
 AUX webkit-gtk-2.2.2-unittests-build.patch 1328 SHA256 f49a561effc00858c21db55607849f5b9c8f09cf4ee76f60262e71992013b625 SHA512 66d44483ac7de8b12f310239c4f8cb40a700ea9aad494decbe15b8976a4f4ff5ed53c97660e7762a7bb51de721ec081133368ca2871128d6e6e871fed5b0e042 WHIRLPOOL 77b308072cd705be3700da85ec05208d24bf8ff4aec9b93a1f73b311314fde1608e89ca8218e1f9da206d30bf2c378d727bc51a83f8144f7a559d35e6b5fe47e
 AUX webkit-gtk-2.2.4-jscore.patch 1551 SHA256 049aed6edac497e77fbcff429f35800a7b667867e4c2bb94cc54a00c216f22a7 SHA512 c5d433ea1ceb2091109b1a600b766edcd4fb2947d6ed21ef2e99a8d5d1c76a77e282dab0e9f2f1869ce3ecd3fa066fdc9b75db1bb5eeca3d3fe434bc75f1793e WHIRLPOOL ca5d571aa4967dda33530ef6e68069173eb7710a35dbf5c3494cff578559de8b686a466576313ee1ba9926df2616beef50ad88309ffcd7e1877396f2a46664c3
 AUX webkit-gtk-2.2.4-unittests-build.patch 2866 SHA256 714b4663c5ae3fc695ae13c40fbedfae358e7ae4b6c2743a35ddd5e96d213133 SHA512 e4ba2eafdc97a673d07d1e253832c30ec32b57e02eb5b61d7a1c327760630f39d24e215a7940bcd5cd9ca321cd4d71e433f231e12e8476ebda62abfa53573297 WHIRLPOOL 5252edd1a69769ef99724f1aaf7844e50a9db1c204984ee066c2dd116bc58814631ddd9bea6bf4822e4c1122ad230f50f87e5f037b00e35ee81299fb9adf7ab5
+AUX webkit-gtk-2.2.5-gir-nvidia-hangs.patch 4078 SHA256 843ed737a72f4cb705901efc05ba23442e1eceb21602c21a7593fa81e5b78a51 SHA512 3cb09602a87e7ab0f45ec1ae38f4ac51f2af86a871fe66373723ed1ce911984d5e9ba572b9d46601ac1f14ca8ecabcd21296b7c32cb21f2c1a1fe005248128d0 WHIRLPOOL aefa244dc599729c9fadb0faeb3f217d8b89b3be35ee2e19e86aa84ec2081d1ac35b81a29255992f9d952bf96386af701bf5a31c0f2aeb139b2044b1a0b394d1
+AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
+AUX webkit-gtk-2.2.5-ia64-malloc.patch 780 SHA256 4a057c94f3e83101dc48401897a2e9295106e395bdf2a7abcad8334afb26f22b SHA512 09d3287fb41dbe5f87e483874f9c81b0e5dbcc1eed709285aaa4f0232377ba19865491ed0f2e5a108bbc8f3d486bc6ab30f3c940cb68dc8515c1826b181051df WHIRLPOOL 4f97a8d74b95cdfe1d223391b93c6de0dbe0944fd9872bf81c5e1d357f677ca6650beb73ad44e50dd51dc4505807592b2caaee4010e271cbb6ada772c6b2a72d
+AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
+AUX webkit-gtk-2.2.5-sparc64-build.patch 1169 SHA256 fe6c7c345eb46a0f6856b5f1c547a65185b36c314d6f55a7980c640da0a53b56 SHA512 c59c6aed45ce237d68e58e5b03f46dc66ae4b73cd8a78f7eab9429ef3fe13882d0985da33f30fb425e0b5945298502ac35f9888e666c177fe2467f3f1ed35892 WHIRLPOOL f5a55fcaafc203352583e9ded39e79edca8e9d13cb1cf6e6574e905729fc8e9f92ccd75cd9309b66734f91830847164ebe9011c149e17c85af5549bd40b04f90
+AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
 DIST webkitgtk-2.2.2.tar.xz 9378852 SHA256 4a45768695ccded14fdc47f99dbcdb750076f55dad61560cadac7b55db0b304d SHA512 8098b69438cebc298796d4f1bdd5528bcf2e57102214caccc05256d9f393ae2d925dfdba8e7219f41791c094311f90beb80a957d648ca382df7a110272c0caab WHIRLPOOL 20db7d729eabe958faded0b92655eb1cbdb38803739bb3ec0edb5e3331c1ada26d9013c34d88c80e1e6cca68a8762b736812227f18f2530ae70c89d41800d111
 DIST webkitgtk-2.2.4.tar.xz 9393040 SHA256 5e1aee1bfca3602cb02920d6984c584c775c661b30c33955e35ff9a21b4c4d74 SHA512 9467abb72dda5839274702ee9173d8d83599196446f80537cf18e9be4b42fb7e23fdeb7d053d87a0143de5b499163d693dd09c4f035a315df78c46d9f7408705 WHIRLPOOL 216f0ab3d51916e608d4e8e7c71a5c753a5a3e668bb9d095d42456d37dc43087551f569a864c5820fce1c7e6fccce215e07eded90b00d3ff8fde03215b3628d5
-EBUILD webkit-gtk-2.2.2.ebuild 9172 SHA256 4b58cd0cde9ea281254b65f6e90418128b0e6cc71eeb395aadad46f0945c3279 SHA512 98cb031534a9615c82b5c4c2119f63a1819360dd5120bedba44dcd8308ad5951480f3041390184a1ab5812d144f5ed6d1b19e15a13b06f135185304813421767 WHIRLPOOL 108a8610387201a6efde0d1f776146742c1cc25045109bea41d1a0341041bedbd1334290bc6cfe1fe9c83aa4a5d34c19eb6d56e008f3912711bb731512b65190
+EBUILD webkit-gtk-2.2.2.ebuild 9319 SHA256 c6a83bd39f1950a81e42ba829ab3a2c63ac6cf99285294b2f85f5991de67c060 SHA512 02766da78a7aa5cd31b44f07a9faab8ba120c517299ab993ffb4c57f9bf2a0281aaa5d617be0733a57540b55b039f3a4186eb77c40c70f484a6de06186cc3df8 WHIRLPOOL c691c7ccbde6c3f345af8053c5e46ed1e410abbdf65b8894695d6affd5a5611eaa1d4ca63c2bb577fd7fddf0cd985b291d88836f8b126c30105f7ff7313a6305
 EBUILD webkit-gtk-2.2.4-r200.ebuild 9169 SHA256 52f77a8c13cc892e9ecc53dc6dea9ae7525891ae37c13f705a05664278837265 SHA512 d8e77fbc76528a47c147efc2fb7fdab0a2a12138c4ac039af16c78eb62a8e7fd7c6f2559e3a4e246dce5745066d0918ceffb012847968888d24c958848401724 WHIRLPOOL 6ee4177e52b932c15cba0bdd60b8f776f0a1cf601639ffab9d3cfbc474f98a0c8540ebefe53b1fe02985df3717d2994dd481c647887db3d95815325fa517d7e5
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-3dopengles.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-3dopengles.patch
new file mode 100644
index 0000000..2eed3b8
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-3dopengles.patch
@@ -0,0 +1,11 @@
+--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
++++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h
+@@ -37,7 +37,7 @@
+ #include <GLES2/gl2ext.h>
+ #endif
+ 
+-#if OS(QNX) || PLATFORM(QT)
++#if OS(QNX) || PLATFORM(QT) || PLATFORM(GTK)
+ // See https://bugs.webkit.org/show_bug.cgi?id=91030.
+ // Newer Khorons headers do define these with a PROC suffix, but older headers don't.
+ #define PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-gles2-texmap.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-gles2-texmap.patch
new file mode 100644
index 0000000..4f4a8d4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-gles2-texmap.patch
@@ -0,0 +1,74 @@
+Subversion Revision: 114502
+diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
+index 6d8ccc501cc12dc73e9b15ddbfc17aaf6fc818f6..1dba94ad456eb4df2caf255b7f1616117b814b24 100644
+--- a/Source/WebCore/ChangeLog
++++ b/Source/WebCore/ChangeLog
+@@ -1,3 +1,19 @@
++2012-04-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
++
++        [Qt][Texmap] Error of cross-compiling webkit with Qt 4.8.1
++        https://bugs.webkit.org/show_bug.cgi?id=84321
++
++        Speculative build-fix for Qt 4.8.
++        Use QGLContext for Qt 4.x instead of the platform-specific context.
++
++        Reviewed by NOBODY (OOPS!).
++
++        No new tests, build fix.
++
++        * platform/graphics/texmap/TextureMapperGL.cpp:
++        (SharedGLData):
++        (WebCore::TextureMapperGLData::SharedGLData::getCurrentGLContext):
++
+ 2012-04-18  No'am Rosenthal  <noam.rosenthal@nokia.com>
+ 
+         [Qt] Fix Qt-Mac build after libxml patch
+diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
+index 894ebbf5649eb257598dfd76cefaeeeb78d0e70e..191c4984f585c5422bb79d3fcf2aad66d01714c7 100644
+--- a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
++++ b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
+@@ -30,12 +30,14 @@
+ #include <wtf/PassRefPtr.h>
+ #include <wtf/RefCounted.h>
+ 
+-#if PLATFORM(QT) && QT_VERSION >= 0x050000
++#if PLATFORM(QT)
++#if QT_VERSION >= 0x050000
+ #include <QOpenGLContext>
+ #include <QPlatformPixmap>
+-#endif
+-
+-#if OS(WINDOWS)
++#else
++#include <QGLContext>
++#endif // QT_VERSION
++#elif OS(WINDOWS)
+ #include <windows.h>
+ #elif OS(MAC_OS_X)
+ #include <AGL/agl.h>
+@@ -51,16 +53,23 @@
+ #endif
+ 
+ #define GL_CMD(...) do { __VA_ARGS__; ASSERT_ARG(__VA_ARGS__, !glGetError()); } while (0)
+-
+ namespace WebCore {
+ struct TextureMapperGLData {
+     struct SharedGLData : public RefCounted<SharedGLData> {
+-#if PLATFORM(QT) && QT_VERSION >= 0x050000
++#if PLATFORM(QT)
++#if QT_VERSION >= 0x050000
+         typedef QOpenGLContext* GLContext;
+         static GLContext getCurrentGLContext()
+         {
+             return QOpenGLContext::currentContext();
+         }
++#else
++        typedef const QGLContext* GLContext;
++        static GLContext getCurrentGLContext()
++        {
++            return QGLContext::currentContext();
++        }
++#endif
+ #elif OS(WINDOWS)
+         typedef HGLRC GLContext;
+         static GLContext getCurrentGLContext()
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
new file mode 100644
index 0000000..854a112
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
@@ -0,0 +1,95 @@
+Description: deadlock in gobject introspection
+Bug-Dyson: http://osdyson.org/issues/161
+Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=463960
+Stack:
+25849:  /home/pashev/packaging/webkitgtk/webkitgtk-2.0.4/build-2.0/tmp-introsp
+-----------------  lwp# 1 / thread# 1  --------------------
+ fffffd7ffeeaf957 lwp_park (0, 0, 0)
+ fffffd7ffeea8036 mutex_lock_impl () + 156
+ fffffd7ffeea810b mutex_lock () + b
+ fffffd7ffee340fa _preexec_atfork_unload () + 3a
+ fffffd7ffee343ab _preexec_exit_handlers () + bb
+ fffffd7fff5ccf0d purge_exit_handlers () + 10d
+ fffffd7fff5cec18 remove_hdl () + ce8
+ fffffd7fff5c8895 dlclose_core () + c5
+ fffffd7fff5c88e5 dlclose_intn () + 15
+ fffffd7fff5c89bb dlclose_check () + 7b
+ fffffd7fff5c8a21 dlclose () + 41
+ fffffd7ffaa03c41 px_module_manager_load () + 191
+ fffffd7ffaa03cf6 px_module_manager_load_dir () + 66
+ fffffd7ffaa050d7 px_proxy_factory_new () + 107
+ fffffd7ffb201671 ???????? ()
+ fffffd7feca30eca g_type_create_instance () + 16a
+ fffffd7feca1597c ???????? ()
+ fffffd7feca17472 g_object_newv () + 792
+ fffffd7feca17aec g_object_new () + ec
+ fffffd7fece5d052 ???????? ()
+ fffffd7fece5d1d8 ???????? ()
+ fffffd7fc98659a5 ???????? ()
+ fffffd7feca173f6 g_object_newv () + 716
+ fffffd7feca17aec g_object_new () + ec
+ fffffd7fc986da24 soup_session_add_feature_by_type () + e4
+ fffffd7fc986fb43 ???????? ()
+ fffffd7feca17e00 g_object_set_valist () + 300
+ fffffd7feca186d7 g_object_set () + e7
+ fffffd7fc5724f87 WebCore::ResourceHandle::defaultSession() () + a7
+ fffffd7fc48da299 webkitExit() () + 9
+ fffffd7ffee33f56 _exithandle () + 66
+ fffffd7ffee1e191 exit () + 11
+ 00000000004086af ???????? ()
+ 000000000040724c _start () + 6c
+-----------------  lwp# 2 / thread# 2  --------------------
+ fffffd7ffeeaf957 lwp_park (0, 0, 0)
+ fffffd7ffeea94bf cond_wait_queue () + 4f
+ fffffd7ffeea9b12 __cond_wait () + b2
+ fffffd7ffeea9b42 cond_wait () + 22
+ fffffd7ffeea9b79 pthread_cond_wait () + 9
+ fffffd7fc4eed04b WebCore::IconDatabase::syncThreadMainLoop() () + 12b
+ fffffd7fc4eed278 WebCore::IconDatabase::iconDatabaseSyncThread() () + 138
+ fffffd7fc3b2bc59 WTF::wtfThreadEntryPoint(void*) () + 19
+ fffffd7ffeeaf617 _thrp_setup () + 77
+ fffffd7ffeeaf910 _lwp_start ()
+-----------------  lwp# 3 / thread# 3  --------------------
+ fffffd7ffeeaf957 lwp_park (0, 0, 0)
+ fffffd7ffeea8036 mutex_lock_impl () + 156
+ fffffd7ffeea810b mutex_lock () + b
+ fffffd7ffee33e17 atexit_locks () + 17
+ fffffd7ffee58ce9 libc_prepare_atfork () + 9
+ fffffd7ffee34533 _prefork_handler () + 33
+ fffffd7ffee9fc85 forkx () + 275
+ fffffd7ffee9fcab fork () + b
+ fffffd7fec68aacb ???????? ()
+ fffffd7fec68b2a7 g_spawn_sync () + 167
+ fffffd7fec68b994 g_spawn_command_line_sync () + 74
+ fffffd7feceb2748 ???????? ()
+ fffffd7feceb4019 g_dbus_address_get_for_bus_sync () + 2c9
+ fffffd7fecebd11e ???????? ()
+ fffffd7fecec4643 g_bus_get_sync () + 63
+ fffffd7ffc60700b ???????? ()
+ fffffd7ffc60714f ???????? ()
+ fffffd7fec648ad0 g_main_context_dispatch () + 130
+ fffffd7fec648e40 ???????? ()
+ fffffd7fec648f08 g_main_context_iteration () + 38
+ fffffd7ffc606f65 ???????? ()
+ fffffd7fec66d50d ???????? ()
+ fffffd7ffeeaf617 _thrp_setup () + 77
+ fffffd7ffeeaf910 _lwp_start ()
+Index: webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp
+===================================================================
+--- webkit.orig/Source/WebKit/gtk/webkit/webkitglobals.cpp	2013-12-02 00:06:10.504150531 +0400
++++ webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp	2013-12-03 14:08:05.956932011 +0400
+@@ -564,6 +564,14 @@
+ 
+     WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
+ 
++    // http://osdyson.org/issues/161
++    // WebKitGTK FTBFS when building GObject introspection due to deadlock.
++    // When gobject introspection is done, a simple program call exit()
++    // exit() -> webkitExit() -> g_object_unref() -> webkit_get_default_session()
++    // -> ResourceHandle::defaultSession() => default session doesn't exist! AND
++    // we try to create it! Thus deadlock. So, create default session earlier:
++    (void) webkit_get_default_session();
++
+     atexit(webkitExit);
+ }
+ 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
new file mode 100644
index 0000000..8aee778
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
@@ -0,0 +1,20 @@
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -72,6 +72,15 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ 
++/* CPU(HPPA) - HP PARISC */
++#if defined(__hppa__)
++#define WTF_CPU_HPPA 1
++#define WTF_CPU_BIG_ENDIAN 1
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
++#endif
++
+ /* CPU(IA64) - Itanium / IA-64 */
+ #if defined(__ia64__)
+ #define WTF_CPU_IA64 1
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
new file mode 100644
index 0000000..5f0542c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
@@ -0,0 +1,20 @@
+Description: Fix wide pointer issues on ia64 (closes: #642750).
+Author: Stephan Schreiber <info@fs-driver.org>
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -705,6 +705,13 @@
+ #define ENABLE_JIT 1
+ #endif
+ 
++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
++   some memory barriers are missing in the thread-unsafe code around the
++   pagemap_cache_ object. */
++#if CPU(IA64) || CPU(IA64_32)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
+ #if !defined(ENABLE_JIT) \
+     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
new file mode 100644
index 0000000..a63e9e8
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
@@ -0,0 +1,12 @@
+--- a/Source/WTF/wtf/Platform.h	2014-02-25 00:33:16.561606810 +0100
++++ b/Source/WTF/wtf/Platform.h	2014-02-25 00:49:52.895512955 +0100
+@@ -79,6 +79,9 @@
+ #if !defined(__LP64__)
+ #define WTF_CPU_IA64_32 1
+ #endif
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
+ #endif
+ 
+ /* CPU(MIPS) - MIPS 32-bit */
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
new file mode 100644
index 0000000..691b528
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
@@ -0,0 +1,23 @@
+$OpenBSD: patch-Source_WTF_wtf_Atomics_h,v 1.3 2013/10/20 09:07:57 landry Exp $
+
+https://bugs.webkit.org/show_bug.cgi?id=86835
+Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems based on __sync_fetch_and_add builtin
+
+--- Source/WTF/wtf/Atomics.h.orig	Sat Aug  3 18:10:38 2013
++++ Source/WTF/wtf/Atomics.h	Sun Oct 20 11:06:14 2013
+@@ -112,6 +112,15 @@ inline int atomicDecrement(int volatile* addend) { ret
+ inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
+ inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
+ 
++#elif COMPILER(GCC) && CPU(SPARC64)
++#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
++
++inline int atomicIncrement(int volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
++inline int atomicDecrement(int volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
++
++inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
++inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
++
+ #endif
+ 
+ #if OS(WINDOWS)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
new file mode 100644
index 0000000..8c387ff
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
@@ -0,0 +1,20 @@
+Description: Fix wide pointer issues on ia64 (closes: #642750).
+Author: Stephan Schreiber <info@fs-driver.org>
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -705,6 +705,13 @@
+ #define ENABLE_JIT 1
+ #endif
+ 
++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
++   some memory barriers are missing in the thread-unsafe code around the
++   pagemap_cache_ object. */
++#if CPU(IA64) || CPU(IA64_32)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Win64. */
+ #if !defined(ENABLE_JIT) \
+     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
index 3b842fa..05a6ef2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild
@@ -185,6 +185,10 @@ src_prepare() {
 	# bug #493654, upstream bug #125074
 	epatch "${FILESDIR}/${PN}-2.2.2-freetype-2.5.1.patch"
 
+	# add back-ported patches for gles2 texmap and stuff
+	##epatch "${FILESDIR}"/${P}-gles2-texmap.patch
+	epatch "${FILESDIR}"/${P}-3dopengles.patch
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }