added upstream webkit patch for wayland build bug

3 files changed, 77 insertions, 1 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c344958..bcf6586 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -20,6 +20,7 @@ AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2
 AUX webkit-gtk-2.4.6-gstreamer-check.patch 834 SHA256 4911657b844a204eadffbc5e9c193efebc44a21e68199c5d776c5ac5ee2925b5 SHA512 970ab2e26528c18a8922bda7f135a719508a00f482f4d9fbf2cde74e90967ee3e0c10964cf7049dc8a199e2d001b34e500f9b2935002106770ad82e904bff48c WHIRLPOOL 271fae207373bec7cc61529fe374f1212d61c73d01a07dc0c5ab76619c3089198030a22ec831a7dd1401cfe717776acf5e218913ca7f5b053882ed44d2d540be
 AUX webkit-gtk-2.4.7-disable-accelerated-compositing.patch 544 SHA256 74aeacbc6206d45107fba00428f2fa33a29cc8915fac379bc536fe473db7fb5e SHA512 11e392e0a9bd317f68c369ef7002833bddb0540325b34e23415c97db885ec8ea058ef1fa2a6d599d4623be3c47e2142e053cabfeb6539378724d0fea9b698d67 WHIRLPOOL 64ec0159a5ce5b7e7f05cf04c37a1fcde2fd250461695834b7e9be03b82798d81bbcef4dab3c01baaae37e4607a85f590eb895bfc498463ca0becf97a246bca6
 AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72
+AUX webkit-gtk-2.4.8-wayland-webkit2.patch 2379 SHA256 0875047b6171c8336d34003d096b2467c00ec797e9084adc2e562c9473ef6230 SHA512 49c65acfc0afd8a6f6f5919dfe2cc0601b24ec87b26078da705ce05d2b49dd8514744b75f759942c66fed07943d9b894fe7ea3812ea97381490c774ecd39ceef WHIRLPOOL 1c3d6019c7f7e5c0c2d3ffc0fbf624d03b1a890339093e0e6c1c477cc28cc1a2d9d33fb02d10d94251b5854c2fddbff7c19fd26e030cfdf830d0698b9caf95b6
 AUX webkit-gtk-accelerated-compositing.patch 685 SHA256 262085eff6f5ce3527db0b2ab3fe6bd56df07dadc01efd1699e0b7653bf01a79 SHA512 239424fe3199cf45be878727f9e1d41303c78dc666624230016de939c5c7b332d33698e1307da6e5c57e3b8e6523f36622df81783c2d06aeb79e0b5e9783f803 WHIRLPOOL 64105d154fcf1cc124b2c46b4297c6aabe0c3e5ab5eb50999ad674dc8e0903c549c2cda0f389ff12e2e5a25e911ace3c1e3ac6ddb6cee6d9e1ef2aca6fd7ed86
 AUX webkit-gtk-disable-webgl-fix.patch 403 SHA256 7d89169b11e40c2398016b04cf3e6a1e02101a1ff5cec930a5091c3d267ce127 SHA512 80fb6d221ee1a0871d5fa1c96023344294b1d26aebb9dec338e47b4011fa20d7caadd6562940b3e182f81679284036e316ccaaec1fe6d8c8d90a34ef44593f3a WHIRLPOOL 863b124114b0b455f4289b3b8f0a7dcfb90753d63f0fb3d95f1363aa9f7ced6563a65caa1f03197719b51ab82d842bde93d90e3f082b4099d6debcb1aed485d6
 AUX webkit-gtk-undefined-symbols-test.patch 1204 SHA256 c5d9d839cc9473c06db2af7c0bdfdd6f11d3d8558e2e5a49ee4a23b3a47ff84a SHA512 9c03ac3d3e2811bde54301d8a0a28bb31aea338daf8874c23120f08ff0791af402fa4626fa680d32c5fae34028912e792a02043e438af75097991e5b07789a16 WHIRLPOOL 772dce0b045c70e724081901941059278222fef36afc5e48cb05e672e58528d2158571b75acf646afa784080c1c8e52db1345c8d5aa0c470f6b02e109af760de
@@ -39,4 +40,4 @@ EBUILD webkit-gtk-2.4.3.ebuild 9227 SHA256 33ea5699c83fd8443d377142837eb6f735e41
 EBUILD webkit-gtk-2.4.4-r1.ebuild 10064 SHA256 d6c5543bea59c8f81ae68340e55fbb88f6be4563351bae11e68c1f5510f50505 SHA512 c419e89876412405862af7cb166159b2a43fbb23f4498c97aa41d6edaab72da761523621b7aab57fa2ca38ccb69d8bec508aa38bdfe17c639e261a2167cf2474 WHIRLPOOL 15d4a6a34438ea96195e3954b050f234116d36b7067a71fe0629ae81517e876473b84675ae155d3effc9f0d9522163d9fd6f0f276340f09a3461a89fa3c57e8b
 EBUILD webkit-gtk-2.4.6.ebuild 10449 SHA256 1edede238c7cd575c2df4ddaf1fc58944f5860b68e3713d6682ec8aeb5f98084 SHA512 4b9fad43e34e369f9448ecd1d4f02f1f81628b94070e1c8db46fd9c77dad391051056eed69f4436172e5ea9f23931b22cac564c6dfaa922604766ef0d77b3903 WHIRLPOOL 2916f69b8163a6bde68fb37f9fd4386c71803f27e6051a316464581fd9b9e317905b82e97b05cc5e9ce41ed470d89ed0a290f8db8e541b483c160f9cad0b2392
 EBUILD webkit-gtk-2.4.7.ebuild 10515 SHA256 22e6b21f07aee587045b51e754711963617b99f347625f780c5dba42edc8fc21 SHA512 030a3b3e5de7ac7793ec6a406f3352574ee185c6f4ab1aad82517a56fbc2bc2ede3b63696122970d2c7b25b4e32e36a6c1c070912874cd77e74778abb44ff2f6 WHIRLPOOL b9b647fe5765205ba6522b1b2699b694174b837490bb2bb0eeec181fca5d8437e40fcef92079c2fa5a5978ddcce43c97285e7ee752eaf21437d96c90f5b20bd9
-EBUILD webkit-gtk-2.4.8.ebuild 10301 SHA256 87d749be071e3639b59b94b9f7052fb64c52fc7cabea4353749b4f83a66695c1 SHA512 855e89431ed2c15d3778ddff77ccd6abe0fa4ed5286a56ed9889875d2ff0f080c5f43f581dc1054025c80c24209e6c52a786404ddf6e718407bd0239659375ca WHIRLPOOL e2490e4db66ab6ca0b46ce896bb5e170c0915efee888c83cd3fc17b9637f91acfbf55cadec78d32dc2aa01438eb318fc1b1ec33354697e4d551c5833cf8900e1
+EBUILD webkit-gtk-2.4.8.ebuild 10454 SHA256 da285147f93fe89ae50a38b50593b2a1b490e92afe89733737e7471e6f6910ea SHA512 ad0c613b41e406b0b0bee37c0e63280e6e2051660f291c918f2d257658dc87425596e5f8eabdb67e250f5a067c34d7a9c83b53b05dcff362e46ed227ab6f0be1 WHIRLPOOL e47e36169c898fca89466ae12a8e8e7c3f750b2d1755b66b2cf2ea48d62f81cc799b7c69f261a59dd1096be73c89081b5ac7cad0b25cd2ec8c1ae04da587cd17
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.8-wayland-webkit2.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.8-wayland-webkit2.patch
new file mode 100644
index 0000000..fd016a5
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.8-wayland-webkit2.patch
@@ -0,0 +1,71 @@
+From ea9a80ffb659f1b65cc4ccef1f092cfbf79d6ad5 Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tpopela@redhat.com>
+Date: Fri, 16 Jan 2015 12:29:48 +0100
+Subject: [PATCH] 2015-01-16  Tomas Popela  <tpopela@redhat.com>
+
+        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=140241
+
+        Reviewed by NOBODY (OOPS!).
+
+        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
+        just when WebKit2 is enabled and we are not building for X11.
+
+        * GNUmakefile.list.am:
+---
+ Source/WebCore/ChangeLog           | 12 ++++++++++++
+ Source/WebCore/GNUmakefile.list.am |  8 ++++++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
+index 587a6c3..7e91646 100644
+--- a/Source/WebCore/ChangeLog
++++ b/Source/WebCore/ChangeLog
+@@ -1,3 +1,15 @@
++2015-01-16  Tomas Popela  <tpopela@redhat.com>
++
++        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
++        https://bugs.webkit.org/show_bug.cgi?id=140241
++
++        Reviewed by NOBODY (OOPS!).
++
++        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
++        just when WebKit2 is enabled and we are not building for X11.
++
++        * GNUmakefile.list.am:
++
+ 2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
+ 
+         Crash in WebCore::Node::getFlag
+diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
+index 2f5cb19..22956c7 100644
+--- a/Source/WebCore/GNUmakefile.list.am
++++ b/Source/WebCore/GNUmakefile.list.am
+@@ -6254,9 +6254,13 @@ endif # END USE_GLX
+ endif # END TARGET_X11
+ 
+ if TARGET_WAYLAND
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ endif # END TARGET_WAYLAND
+ 
+ if TARGET_X11_OR_WAYLAND
+@@ -6305,9 +6309,13 @@ webcoregtk_sources += \
+ endif # END TARGET_WIN32
+ 
+ if TARGET_QUARTZ
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ platformgtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
index 1257bf3..c6c0d71 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
@@ -192,6 +192,10 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=137640
 	epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
 
+	# Fix building with x11+wayland, bug #536898
+	# https://bugs.webkit.org/show_bug.cgi?id=140241
+	epatch "${FILESDIR}"/${PN}-2.4.8-wayland-webkit2.patch
+
 	AT_M4DIR=Source/autotools eautoreconf
 
 	gnome2_src_prepare