From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F916139694 for ; Sun, 26 Mar 2017 09:25:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95E0D23403C; Sun, 26 Mar 2017 09:25:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 663E323403C for ; Sun, 26 Mar 2017 09:25:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56B9D3414C1 for ; Sun, 26 Mar 2017 09:25:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8CD673DB for ; Sun, 26 Mar 2017 09:25:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1490520273.c61e8ac69f13196253142b90d46346c28c57c67f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/psi/, net-im/psi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/psi/files/psi-0.15-qconf-2.patch net-im/psi/psi-0.15.ebuild X-VCS-Directories: net-im/psi/files/ net-im/psi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c61e8ac69f13196253142b90d46346c28c57c67f X-VCS-Branch: master Date: Sun, 26 Mar 2017 09:25:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b752d9d4-cefb-4223-96d9-24edccb6f36e X-Archives-Hash: 6b38b068817f3393553415a4d5e5663e commit: c61e8ac69f13196253142b90d46346c28c57c67f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 26 09:20:39 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 26 09:24:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61e8ac6 net-im/psi: Fix configure w/ >=qconf-2.0 Thanks-to: Rion gmail.com> Gentoo-bug: 607644 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-im/psi/files/psi-0.15-qconf-2.patch | 87 +++++++++++++++++++++++++++++++++ net-im/psi/psi-0.15.ebuild | 3 +- 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/net-im/psi/files/psi-0.15-qconf-2.patch b/net-im/psi/files/psi-0.15-qconf-2.patch new file mode 100644 index 00000000000..fb62e66f726 --- /dev/null +++ b/net-im/psi/files/psi-0.15-qconf-2.patch @@ -0,0 +1,87 @@ +--- a/qcm/recursiveprl.qcm ++++ a/qcm/recursiveprl.qcm +@@ -39,10 +39,11 @@ public: + return false; + } + ++ QFileInfo fi(qc_getenv("QC_COMMAND")); + QStringList args; + args += "-prl"; + args += "-r"; +- args += qc_getenv("QC_PROFILE"); ++ args += fi.dir().filePath(qc_getenv("QC_PROFILE")); + if(conf->doCommand(conf->qmake_path, args) != 0) + { + success = false; +@@ -91,9 +92,9 @@ public: + if(!conf->DEFINES.isEmpty()) + str += "DEFINES += " + conf->DEFINES + '\n'; + if(!conf->INCLUDEPATH.isEmpty()) +- str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n'; ++ str += "INCLUDEPATH += " + conf->escapedIncludes() + '\n'; + if(!conf->LIBS.isEmpty()) +- str += "LIBS += " + conf->LIBS + '\n'; ++ str += "LIBS += " + conf->escapedLibs() + '\n'; + if(!conf->extra.isEmpty()) + str += conf->extra; + str += '\n'; +--- a/qcm/zlib.qcm ++++ a/qcm/zlib.qcm +@@ -21,6 +21,8 @@ public: + QStringList incs; + QString version, libs, other; + QString s; ++ ++ + + if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) { + +@@ -33,21 +35,37 @@ public: + if(!conf->findHeader("zlib.h", QStringList(), &s)) + return false; + } +- incs.append(s.replace("\\\", "\\\\\\\")); + +- s = conf->getenv("QC_WITH_ZLIB_LIB"); +- if(!s.isEmpty()) { +- if(!conf->checkLibrary(s, "z")) +- return false; +- } +- else { +- if(!conf->findLibrary("z", &s)) +- return false; ++ QStringList libNames = QStringList() << "z"; ++ QString libName; ++#ifdef Q_OS_WIN ++ libNames << (qc_buildmode_debug? "zlibd" : "zlib"); ++#endif ++ for (;;) { ++ s = conf->getenv("QC_WITH_ZLIB_LIB"); ++ if(!s.isEmpty()) { ++ foreach (const QString l, libNames) ++ if(conf->checkLibrary(s, l)) { ++ libName = l; ++ break; ++ } ++ } else { ++ foreach (const QString l, libNames) ++ if(conf->findLibrary(l, &s)) { ++ libName = l; ++ break; ++ } ++ } ++ ++ if(!libName.isEmpty()) ++ break; ++ ++ return false; + } + if (!s.isEmpty()) { +- libs = QString("-L%1 -lz").arg(s.replace("\\\", "\\\\\\\")); ++ libs = QString("-L%1 -l%2").arg(s, libName); + } else { +- libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s); ++ libs = s.isEmpty()? QString("-l")+libName : QString("-L%1 -l%2").arg(s, libName); + } + } + diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild index 17f983d8341..2c60b4f0e87 100644 --- a/net-im/psi/psi-0.15.ebuild +++ b/net-im/psi/psi-0.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -51,6 +51,7 @@ FORCE_PRINT_ELOG=1 src_prepare() { epatch "${FILESDIR}/${PN}-0.14-drop-debug-cflags.patch" + epatch "${FILESDIR}/${P}-qconf-2.patch" epatch_user qconf || die "Failed to create ./configure."