summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-05-11 15:44:05 +0000
committerDavide Pesavento <pesa@gentoo.org>2015-05-11 15:44:05 +0000
commit78860e68923c42d48dafe4a6d071473a6b56c7f9 (patch)
tree54dabe1f5a461f2853380706acf0d4756cd1a71c /dev-qt
parentVersion bump (diff)
downloadgentoo-2-78860e68923c42d48dafe4a6d071473a6b56c7f9.tar.gz
gentoo-2-78860e68923c42d48dafe4a6d071473a6b56c7f9.tar.bz2
gentoo-2-78860e68923c42d48dafe4a6d071473a6b56c7f9.zip
Fix regression in qtsinglecoreapplication.prf wrt bug 549176.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtsingleapplication/ChangeLog10
-rw-r--r--dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf6
-rw-r--r--dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.ebuild (renamed from dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild)2
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-qt/qtsingleapplication/ChangeLog b/dev-qt/qtsingleapplication/ChangeLog
index 2cbe55714dcd..ee8dab1a39b0 100644
--- a/dev-qt/qtsingleapplication/ChangeLog
+++ b/dev-qt/qtsingleapplication/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-qt/qtsingleapplication
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.16 2015/05/10 15:50:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/ChangeLog,v 1.17 2015/05/11 15:44:05 pesa Exp $
+
+*qtsingleapplication-2.6.1_p20130904-r4 (11 May 2015)
+
+ 11 May 2015; Davide Pesavento <pesa@gentoo.org>
+ +qtsingleapplication-2.6.1_p20130904-r4.ebuild,
+ -qtsingleapplication-2.6.1_p20130904-r3.ebuild,
+ files/qtsinglecoreapplication.prf:
+ Fix regression in qtsinglecoreapplication.prf wrt bug 549176.
10 May 2015; Davide Pesavento <pesa@gentoo.org>
qtsingleapplication-2.6.1_p20130904-r3.ebuild:
diff --git a/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
index fa3a171a35e4..87d2a9583dbd 100644
--- a/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
+++ b/dev-qt/qtsingleapplication/files/qtsinglecoreapplication.prf
@@ -1,8 +1,8 @@
INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
greaterThan(QT_MAJOR_VERSION, 4) {
-LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleCoreApplication-2.6
-QT *= widgets
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
} else {
-LIBS *= -lQtSolutions_SingleCoreApplication-2.6
+LIBS *= -lQtSolutions_SingleApplication-2.6
}
QT *= network
+CONFIG *= qtlockedfile
diff --git a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.ebuild
index 10d7b0f9dcbf..0a3b44ff9b15 100644
--- a/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild
+++ b/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r3.ebuild,v 1.3 2015/05/10 15:50:11 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.ebuild,v 1.1 2015/05/11 15:44:05 pesa Exp $
EAPI=5