Backport patch from trunk to fix compilation with Qt-4.6, bug 295466.

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

4 files changed, 29 insertions, 11 deletions

diff --git a/app-admin/keepassx/ChangeLog b/app-admin/keepassx/ChangeLog
index 93970806e89a..70ffacb7954c 100644
--- a/app-admin/keepassx/ChangeLog
+++ b/app-admin/keepassx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/keepassx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.42 2009/11/17 22:35:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/ChangeLog,v 1.43 2009/12/13 02:08:53 spatz Exp $
+
+  13 Dec 2009; Dror Levin <spatz@gentoo.org> keepassx-0.4.1.ebuild,
+  +files/keepassx-0.4.1-compile-with-qt-4.6.patch:
+  Backport patch from trunk to fix compilation with Qt-4.6, bug 295466.
 
   17 Nov 2009; Dror Levin <spatz@gentoo.org> keepassx-0.4.1.ebuild:
   Fix pch USE flag handling, bug 271658.
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 7f5e5819aab9..a15a1fdeee8d 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX keepassx-0.4.1-compile-with-qt-4.6.patch 330 RMD160 d720d1e12095a29b75e95d12aa129db5f77b366c SHA1 e61b31ebe406e6a0e99d82068ae6a5838f42a364 SHA256 4328fe461fde8d98f1187d787818a01396f8023623055e7725677d1525cc4cbb
 DIST KeePassX-0.3.4.tar.gz 535822 RMD160 3f7f364d62e3cc54f54e12f74d7d88cfcf23f231 SHA1 d9204396a0878c3acbce875b42df2899561c5206 SHA256 41dc39f675f812d81e413f7d9684a458fbd4ac9819c91ccc31b504cef8de71ee
 DIST keepassx-0.4.1.tar.gz 1050175 RMD160 9fca65157428454fa755a4ab9c56f7beb07cf7e5 SHA1 f30ba9775965018aea8b7b149e6d0c9d4c617e69 SHA256 f9c1b17505430f68524ecc2be11930afa5d454097536c7a286355e1764b31429
 EBUILD keepassx-0.3.4.ebuild 1305 RMD160 ba86a8361d7de54405fc65631fe370191804b4c0 SHA1 5b4d27f657dc0551eb3979176efc170bd9bc9509 SHA256 3cfb82d83f82d9d8774250ac3e6f4d34b929a4192a883f291186eebd2b4e7405
-EBUILD keepassx-0.4.1.ebuild 1030 RMD160 97614888bea52ea7756278e71a1d21b20d6c9734 SHA1 4bc14a0ab9ed7d724c31c43f2ad2a4ccb033bf97 SHA256 27684853a232fa340da732f86bcf4db28c334aeaab52c6e8dc99b8a869b80612
-MISC ChangeLog 7426 RMD160 8bec51907584fb567e3d182d64538593d5b1ad60 SHA1 a91c2db3b9e68be0e06c59582b362330689ee64b SHA256 824892140f948aacf1c75f5b6a1285e85371f48a8f5ff7b31d5ff8c31bf2a1b1
+EBUILD keepassx-0.4.1.ebuild 1088 RMD160 da0ba93d75d5ee3b42aeced334a03095a7caf368 SHA1 71837e5ebe3783f36012da39e470e34c87930663 SHA256 056c7eb11363749d06760f599c7c930befd5791388e5d914f4cf44dceba12365
+MISC ChangeLog 7618 RMD160 edb3cc50a9691cd367b9bd4acb70e82f2ba5c8b8 SHA1 38c18984be7eea3758c3279f1f5790ffac2ca0de SHA256 2e9a7cc4bcaf1496c8c82f9c7eba41d66872d74072eaeebfbb881459811ecda0
 MISC metadata.xml 495 RMD160 90266b304a5c8425582869e66f36475590a9aeea SHA1 4711ce96501403b2061f630bda3c86d42a09794e SHA256 3280fffee9ad925df39ffbf8a0a90f9eb469669d45934d2921bcbc0b1ed9b8ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iQEcBAEBCgAGBQJLAyVEAAoJEAWF714uGAc60eUIAIlAnO75gTcxwTwgPTUX5wH/
-SDhXw2jiA/sqr494t98DyD3f955xPKChrTdbJ5h8LzhGDjWSSHjttXDkY313hws1
-MgiZJqKdLJUzlD1S46BDAQivTIxwndFASKaU68u7nhgXFjWBYZcuWPb85LX6hw8/
-rlo0RA4cxxYqeU6OCfYvCz600ulRLMM2Eoz4cUBgkdnx4Zr5EB9FBE6MazF7qRLn
-ME6cNSLw2nzinLJQsu2zoz9Ub92DeIo1P4r08x3VtE40F+1UUkcxWkzx5GKyNyLQ
-Ky4/6lkuyBE9hdejH6d2Td4+RYVBj52HCTD95h3izlpUQc+2gOKoTrIvWuY46Hg=
-=4gnY
+iQEcBAEBCgAGBQJLJEy/AAoJEAWF714uGAc6bkUH/0ZNO6EmePW4fku6ZyLfgUwy
+B/o8GqPgkBtOCwNpc642LMrbemlc9PSQBJTYUWcPE0lqaKiVZbN3DKMS2Rv89mZ9
+p/vOfLac4qxHW4nKVoAhwoaH2iytwLvHuvhbDqKNWMqlAlpLYoCTw9C6uNDX9AT7
+HHVy/9h92Zei61m1HI0jk128e7B2u/fe6JWZa9wLFvVx6VM0jk2CLHTMnQ5k5ZrX
+MpVF+GCiB7w2PeIwduoZH7t8mlGrgLpMcTaH5xbyy7/bd6aLujpBnjZdfZoken5c
+gDWCYLCW5p3z7+7dVyu5cIEK4yqDYLrxdCuzHzZZDX7xzAKOlqB2CM+VBiR8et4=
+=QkZt
 -----END PGP SIGNATURE-----
diff --git a/app-admin/keepassx/files/keepassx-0.4.1-compile-with-qt-4.6.patch b/app-admin/keepassx/files/keepassx-0.4.1-compile-with-qt-4.6.patch
new file mode 100644
index 000000000000..26aa51dc0836
--- /dev/null
+++ b/app-admin/keepassx/files/keepassx-0.4.1-compile-with-qt-4.6.patch
@@ -0,0 +1,11 @@
+--- trunk/src/Database.h	2009/12/12 23:06:47	349
++++ trunk/src/Database.h	2009/12/12 23:28:46	350
+@@ -233,7 +233,7 @@
+ /*!
+ This is the common base interface for databases. Every database class must implement this interface necessarily.
+ */
+-class IDatabase:public QObject{
++class IDatabase{
+ public:
+ 	virtual ~IDatabase(){};
+ 	
diff --git a/app-admin/keepassx/keepassx-0.4.1.ebuild b/app-admin/keepassx/keepassx-0.4.1.ebuild
index 9f195244214e..eab0658cc6f7 100644
--- a/app-admin/keepassx/keepassx-0.4.1.ebuild
+++ b/app-admin/keepassx/keepassx-0.4.1.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/app-admin/keepassx/keepassx-0.4.1.ebuild,v 1.3 2009/11/17 22:35:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/keepassx/keepassx-0.4.1.ebuild,v 1.4 2009/12/13 02:08:53 spatz Exp $
 
 EAPI="2"
 
@@ -20,6 +20,8 @@ DEPEND="x11-libs/qt-core:4
 	x11-libs/qt-xmlpatterns:4"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-compile-with-qt-4.6.patch" )
+
 src_configure() {
 	local conf_pch
 	use pch && conf_pch="PRECOMPILED=1" || conf_pch="PRECOMPILED=0"