From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 1 Jun 2010 12:05:29 +0000 (+0000)
Subject: Fix building with GCC 4.5+ wrt #322213 by Diego E. Pettenò.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=faf74fc741cfc12fc13e1b24341d81b2b93a0412;p=gentoo.git

Fix building with GCC 4.5+ wrt #322213 by Diego E. Pettenò.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/app-dicts/qvortaro/ChangeLog b/app-dicts/qvortaro/ChangeLog
index 45052a0fb5fd..387f78362730 100644
--- a/app-dicts/qvortaro/ChangeLog
+++ b/app-dicts/qvortaro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/qvortaro
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/qvortaro/ChangeLog,v 1.15 2010/01/27 11:50:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/qvortaro/ChangeLog,v 1.16 2010/06/01 12:05:29 ssuominen Exp $
+
+  01 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> qvortaro-0.4.1.ebuild,
+  +files/qvortaro-0.4.1-gcc45.patch:
+  Fix building with GCC 4.5+ wrt #322213 by Diego E. Pettenò.
 
 *qvortaro-0.4.1 (27 Jan 2010)
 
diff --git a/app-dicts/qvortaro/Manifest b/app-dicts/qvortaro/Manifest
index 95417a27fa91..697b2cdd69fc 100644
--- a/app-dicts/qvortaro/Manifest
+++ b/app-dicts/qvortaro/Manifest
@@ -1,4 +1,5 @@
+AUX qvortaro-0.4.1-gcc45.patch 282 RMD160 757931ae7054652ed5cd53008b01537da73ab0a0 SHA1 6c1ef53f48fde95257637d69e3af4adf08fb40ce SHA256 e72a99de87a49fb58859e9f060f2294224d7f83ffaa578504514ba5ad64e9d4d
 DIST qvortaro-0.4.1.tar.gz 174664 RMD160 6069bffdb7e137f1c5371d72d85ea484934f1bf2 SHA1 a4def0f7706edae74fa221dbdf1a46c3f047104b SHA256 e576eb6bdc9bdedb67d89488a0d163a3d6eebc7b33a385708403e62c4ed46928
-EBUILD qvortaro-0.4.1.ebuild 616 RMD160 b2b262f87b1bed61a8797eb284b2a8b0e0b53469 SHA1 5432f2a01f78f2ee4a857832b9642b25138516b7 SHA256 9e819c159006c380fc2242f8608ee66877a673e7acb7dd8bdc845e447cd3e040
-MISC ChangeLog 421 RMD160 a9dba0fcf39f49ab3a91c8cdf418a2d31a519e51 SHA1 27f581e55a2458d9ce79f1c310d4f4c10eece9df SHA256 9d443afb729efeb78d585688b7f0c6d5e491d38eb6dc2d7678b133bc0a43d464
+EBUILD qvortaro-0.4.1.ebuild 660 RMD160 b4b869ab37909cb1e2c85193722a709b555d0912 SHA1 b622a0ccf5f1f876643769265acad542c65c3089 SHA256 7a7b1b29539e016b7e57c7c5c016ff86602256a9240d78c162deef2f104158ce
+MISC ChangeLog 599 RMD160 f455f44f4b7e60b9f7d3bf29ddcfd23bd51faafa SHA1 ed3feead4352ec49fa81ec15144efa6a2b0cdadf SHA256 3898daa590451bb6b43dffa40ac2cd72ffc9cc4e055abcc6e7748b65814a00d7
 MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
diff --git a/app-dicts/qvortaro/files/qvortaro-0.4.1-gcc45.patch b/app-dicts/qvortaro/files/qvortaro-0.4.1-gcc45.patch
new file mode 100644
index 000000000000..431cdc4914bf
--- /dev/null
+++ b/app-dicts/qvortaro/files/qvortaro-0.4.1-gcc45.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/322213
+
+--- src/eolistbrowser.cpp
++++ src/eolistbrowser.cpp
+@@ -28,7 +28,7 @@
+ {
+   ui.setupUi(this);
+ 
+-  rxEscape = QRegExp::QRegExp("('|_|%){1}");
++  rxEscape = QRegExp("('|_|%){1}");
+ 
+   m_model = new QSqlQueryModel(this);
+   ui.list->setModel(m_model);
diff --git a/app-dicts/qvortaro/qvortaro-0.4.1.ebuild b/app-dicts/qvortaro/qvortaro-0.4.1.ebuild
index f599b2a09f79..b8695fecd2fa 100644
--- a/app-dicts/qvortaro/qvortaro-0.4.1.ebuild
+++ b/app-dicts/qvortaro/qvortaro-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/qvortaro/qvortaro-0.4.1.ebuild,v 1.1 2010/01/27 11:50:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/qvortaro/qvortaro-0.4.1.ebuild,v 1.2 2010/06/01 12:05:29 ssuominen Exp $
 
 EAPI=2
 inherit eutils qt4-r2
@@ -17,6 +17,8 @@ IUSE=""
 DEPEND="x11-libs/qt-gui:4
 	x11-libs/qt-sql:4"
 
+PATCHES=( "${FILESDIR}/${P}-gcc45.patch" )
+
 src_install() {
 	dobin qvortaro || die
 	newicon src/img/icon_16.png ${PN}.png