summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-01 12:05:29 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-01 12:05:29 +0000
commit1e5c5336fc9647944688a49bb4a43de5532dba42 (patch)
tree8499c49d18fd6aad65a5b143f267c41339c219dc /app-dicts
parentFix building with GCC 4.5+ wrt #319361 by Kacper Kowalik. (diff)
downloadgentoo-2-1e5c5336fc9647944688a49bb4a43de5532dba42.tar.gz
gentoo-2-1e5c5336fc9647944688a49bb4a43de5532dba42.tar.bz2
gentoo-2-1e5c5336fc9647944688a49bb4a43de5532dba42.zip
Fix building with GCC 4.5+ wrt #322213 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-dicts')
-rw-r--r--app-dicts/qvortaro/ChangeLog6
-rw-r--r--app-dicts/qvortaro/files/qvortaro-0.4.1-gcc45.patch13
-rw-r--r--app-dicts/qvortaro/qvortaro-0.4.1.ebuild4
3 files changed, 21 insertions, 2 deletions
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/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