Apply -webkit patch, bug 261044

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 40 insertions, 6 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index a4a54a274017..1ed1a4b2a0c3 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.46 2009/02/28 23:20:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.47 2009/03/03 11:41:45 tampakrap Exp $
+
+  03 Mar 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +files/quassel-0.4.0-no-webkit.patch, quassel-0.4.0-r1.ebuild,
+  quassel-0.4.0-r2.ebuild:
+  Apply -webkit patch, bug 261044
 
 *quassel-0.4.0-r2 (28 Feb 2009)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 0abf3f389515..529f0c5cec7d 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX quassel-0.4.0-no-webkit.patch 288 RMD160 9c498415d8f4e719063d6258d247cf3016e27d10 SHA1 75b07c4484ce0a4033d5dea96474cb759225c22b SHA256 2f05034bda83e11118818492ee91a6483380cec919f16094bc3edcd333a71570
 AUX quasselcore-2.conf 548 RMD160 afc8ee2d5bc8449c51afd46699e7b9796ff77b1f SHA1 e9492c10864df233edda84411f7cf15e1f7f3573 SHA256 973bff9a4dac8e25b6a7b8dc8355f763c65e31f070b1fc5904f6325045ad3cb5
 AUX quasselcore-2.init 1627 RMD160 fc0885dc6a2295ad1dcb49aefc1adfd184388fb2 SHA1 2629a3019913b1c685406fc88ead655e10bed943 SHA256 318e85a896fc2672651fa270dd98bfb664c0cb20cc8ae34c18363dbef36d820b
 AUX quasselcore.conf 386 RMD160 01ce00964866419ea2b11c4f23d09a6542d32ccd SHA1 13f2d8da2ec68c6c8db019900abfa2334c1d0652 SHA256 b0e8873ac4a9a1ab78f8b96141e2c0159eeaf7e8ad0c7d8d3e53320fafcef1da
@@ -8,8 +12,15 @@ DIST quassel-0.4.0.tar.bz2 3012967 RMD160 1529bdde49f05b2f9da0bcef6c4605da28074b
 EBUILD quassel-0.3.0.3.ebuild 3985 RMD160 f2a5fe715e7796d61e0d7d90363d2a7bc927c6cb SHA1 7c896d5b375f506e43b692335335103d535790d5 SHA256 7d9463a9382584bba994b6bed0ae5a9d1913564913f3821627d17d6bb5ebd3a8
 EBUILD quassel-0.3.1-r2.ebuild 3962 RMD160 0e1095c1324a79c70dbcf2753355329d60a8058f SHA1 fc4c675071abeb2df4d46f9cdd8055cd6fa8a245 SHA256 8bd02f36bcf91037d39c50ce279c4b02f82a7e290bf9ba1ffe88d43542dc4156
 EBUILD quassel-0.3.1-r4.ebuild 3630 RMD160 0982437d5517b566029d596ca267325fd9f733cb SHA1 3833991fe5f535f35e5d7cb2325dbde9531b431c SHA256 8969fa3f74f1e65eb014989c123e4c1cc9691f019c5654efea4dfb1c04891378
-EBUILD quassel-0.4.0-r1.ebuild 3546 RMD160 eb1ee76405da0ea375faf400f66c17096d22d837 SHA1 2895e92d4560200abbf14fee6d0505a91d2ae448 SHA256 59e7c6b11a29812031b23b12df6aefa3c77997e0610ad1599bfc8a95ce714e12
-EBUILD quassel-0.4.0-r2.ebuild 3601 RMD160 bea2eeae3c678bde86ec317dddfc876b880ebf88 SHA1 cafb823af75df472b7c9a943d97528cb90b6e91b SHA256 8a4c1bc1837f6006039756aae8a7af9647d99bc97712ca07fe497018c932af72
+EBUILD quassel-0.4.0-r1.ebuild 3590 RMD160 ee3288b5f2ed2b162b792e1df7556e960cc60a33 SHA1 6d8c741b3946644a799aeba81c64746184c9c62a SHA256 c75b47473b96a9cab9b96ee8ed84771c57f0527b94117e42812c754dba1306c2
+EBUILD quassel-0.4.0-r2.ebuild 3647 RMD160 5b6fdf8898f3893c766df1520a16dbd5a5717e9b SHA1 4f9d3a5cfb4114651053b93dcdfa8ecc28bf8083 SHA256 9ee431dc1cb7f08d4869defff1cc6a6e7cb4b1f6f0c509f1697c543411b358d0
 EBUILD quassel-9999.ebuild 3617 RMD160 6f023e4ddcf6fda42d292e0b32ab61cf2840e18c SHA1 341859a8d41925411c59d6ed65f44c5e9a72143c SHA256 20f28c55de81dbfdff1ca1fdd315470adc2df0675201a01f3a073304f508bfa4
-MISC ChangeLog 9033 RMD160 695415a0926252641185f45f5324a395af9783cb SHA1 e84ef60bac1c90e2e23dcccff727c5874433e301 SHA256 22c7d2f8768596baebc024e8561a64ebf92118f1e52dcef1a78eec7b75685ce0
+MISC ChangeLog 9218 RMD160 72e427537969713f960ba079972c8f7d6bdf426d SHA1 03bcf94ee0969ddadc8cac45ad31a21f4b50af9a SHA256 5f8021c6a3bd3cad5b6cc281d490be1407c2f92979ed5d29d4003a0c0dd080df
 MISC metadata.xml 1569 RMD160 13153e6baac0747a9c4b7606a12121c7e3aac326 SHA1 562f75d3fb7734fb0f0cb2566216bc552e0ece85 SHA256 e6be6532135d9a65f789159ff71dfe987dc8e7ea710e2668dbf741738b15f24c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmtF04ACgkQjDdoMVfcAHgh3QCfUgvz5eSEVinajBe9gPrw5die
+bKEAmgPPb3YoepzpaQb8JNJpmPn2gMUh
+=q708
+-----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/files/quassel-0.4.0-no-webkit.patch b/net-irc/quassel/files/quassel-0.4.0-no-webkit.patch
new file mode 100644
index 000000000000..ab884c06995c
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.4.0-no-webkit.patch
@@ -0,0 +1,14 @@
+--- a/src/qtui/chatscene.cpp
++++ b/src/qtui/chatscene.cpp
+@@ -24,7 +24,10 @@
+ #include <QGraphicsSceneMouseEvent>
+ #include <QMenu>
+ #include <QPersistentModelIndex>
+-#include <QWebView>
++
++#ifdef HAVE_WEBKIT
++#  include <QWebView>
++#endif
+ 
+ #include "chatitem.h"
+ #include "chatline.h"
diff --git a/net-irc/quassel/quassel-0.4.0-r1.ebuild b/net-irc/quassel/quassel-0.4.0-r1.ebuild
index f3bbfef1a115..061fd89e136e 100644
--- a/net-irc/quassel/quassel-0.4.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.0-r1.ebuild,v 1.1 2009/02/20 20:02:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.0-r1.ebuild,v 1.2 2009/03/03 11:41:45 tampakrap Exp $
 
 EAPI="2"
 
@@ -62,6 +62,8 @@ pkg_setup() {
 }
 
 src_configure() {
+	epatch "${FILESDIR}/${P}-no-webkit.patch"
+
 	local MY_LANGUAGES=""
 	for i in ${LINGUAS}; do
 		MY_LANGUAGES="${i},${MY_LANGUAGES}"
diff --git a/net-irc/quassel/quassel-0.4.0-r2.ebuild b/net-irc/quassel/quassel-0.4.0-r2.ebuild
index e1aa72c2faf9..35eda29411d5 100644
--- a/net-irc/quassel/quassel-0.4.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.0-r2.ebuild,v 1.1 2009/02/28 23:20:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.0-r2.ebuild,v 1.2 2009/03/03 11:41:45 tampakrap Exp $
 
 EAPI="2"
 
@@ -64,6 +64,8 @@ pkg_setup() {
 }
 
 src_configure() {
+	epatch "${FILESDIR}/${P}-no-webkit.patch"
+
 	local MY_LANGUAGES=""
 	for i in ${LINGUAS}; do
 		MY_LANGUAGES="${i},${MY_LANGUAGES}"