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 16E56138335 for ; Sun, 28 Apr 2019 15:27:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E325BE0933; Sun, 28 Apr 2019 15:27:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B88F4E0933 for ; Sun, 28 Apr 2019 15:27:12 +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 1C1C2342B7C for ; Sun, 28 Apr 2019 15:27:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A84C75CC for ; Sun, 28 Apr 2019 15:27:09 +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: <1556465203.89430661217c0394fa0a7c26c38d6984ee22d5e1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/qgis-9999.ebuild X-VCS-Directories: sci-geosciences/qgis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 89430661217c0394fa0a7c26c38d6984ee22d5e1 X-VCS-Branch: master Date: Sun, 28 Apr 2019 15:27:09 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c677ff7-3eff-471b-b118-2e196790af8c X-Archives-Hash: aaae6c0a9a223032770a5b73f8952f86 commit: 89430661217c0394fa0a7c26c38d6984ee22d5e1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 27 21:39:16 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 28 15:26:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89430661 sci-geosciences/qgis: Drop obsolete cmake hacks, fix icons install Upstream commit 618c3ce368a93aa614b534af7b1f867c25d7aabe Package-Manager: Portage-2.3.65, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/qgis/qgis-9999.ebuild | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 9a778816327..a1d962905d6 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -110,16 +110,6 @@ pkg_setup() { src_prepare() { cmake-utils_src_prepare - - sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \ - -i CMakeLists.txt || die "Failed to fix lrelease path" - - sed -e "/QT_LRELEASE_EXECUTABLE/d" \ - -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \ - -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \ - -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake" - - cd src/plugins || die } src_configure() { @@ -165,14 +155,14 @@ src_configure() { src_install() { cmake-utils_src_install - domenu debian/qgis.desktop + newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop local size type for size in 16 22 24 32 48 64 96 128 256; do - newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png - newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png + newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png + newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png for type in qgs qml qlr qpt; do - newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png + newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png done done newicon -s scalable images/icons/qgis_icon.svg qgis.svg