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 5AB551382C5 for ; Tue, 23 Feb 2021 19:53:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B57A8E087C; Tue, 23 Feb 2021 19:53:35 +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 7C376E087C for ; Tue, 23 Feb 2021 19:53:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 192A2340DF7 for ; Tue, 23 Feb 2021 19:53:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3DFE573 for ; Tue, 23 Feb 2021 19:53:29 +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: <1614109952.35c6154f29bf195c123fa5918658bd79be1b38c0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild X-VCS-Directories: sci-geosciences/qmapshack/ sci-geosciences/qmapshack/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 35c6154f29bf195c123fa5918658bd79be1b38c0 X-VCS-Branch: master Date: Tue, 23 Feb 2021 19:53:29 +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: 0f76614a-3ee9-4db7-b1e5-babf19bef80c X-Archives-Hash: 3ab720d6fcc927105d809118639d0f19 commit: 35c6154f29bf195c123fa5918658bd79be1b38c0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 20 19:50:55 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 23 19:52:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c6154f sci-geosciences/qmapshack: Support build with >=dev-libs/quazip-1.0 Closes: https://bugs.gentoo.org/770877 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qmapshack-1.15.2-no-hacks-kthxbye.patch | 28 +++++++++++ .../qmapshack/qmapshack-1.15.2-r2.ebuild | 56 ++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch b/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch new file mode 100644 index 00000000000..99a55d694fb --- /dev/null +++ b/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt 2020-12-07 17:13:38.000000000 +0100 ++++ b/CMakeLists.txt 2021-02-20 20:01:41.706789439 +0100 +@@ -18,25 +18,6 @@ + endif() + + ############################################################################################### +-# Do distribution dependent stuff +-############################################################################################### +-string(TIMESTAMP YEAR "%Y") +-set(EXPIRE_YEAR "2021") +-set(DEBIAN_RELEASE_INFO "/etc/debian_version") +- +-if(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE) +- message( STATUS "Apply patches to fix build system on Debian") +- execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindPROJ4.patch" +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_QUIET) +- execute_process(COMMAND bash "-c" "patch --quiet -p1 < FindQuaZip5.patch" +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_QUIET) +-endif(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APPLE) +- +- +- +-############################################################################################### + # Define project name and version tags + ############################################################################################### + # this is not only the QMS version it will be the package version, too. diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild new file mode 100644 index 00000000000..b940212b752 --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="GPS mapping utility" +HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" +SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/quazip:0= + dev-qt/designer:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5[widgets] + dev-qt/qthelp:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtwebengine:5[widgets] + >=sci-geosciences/routino-3.1.1 + sci-libs/alglib + sci-libs/gdal + >=sci-libs/proj-6.0.0:= +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +S="${WORKDIR}"/${PN}-V_${PV} + +PATCHES=( "${S}"/FindPROJ4.patch ) + +src_prepare() { + cmake_src_prepare + + # TODO: upstream + if has_version ">=dev-libs/quazip-1.0"; then + sed -e "/^find_package(QuaZip5/s/5 /-Qt5 CONFIG/" \ + -i CMakeLists.txt || die + + sed -e "s/\${QUAZIP_LIBRARIES}/QuaZip::QuaZip/" \ + -i src/qmapshack/CMakeLists.txt || die + fi +} + +src_install() { + docompress -x /usr/share/doc/${PF}/html + cmake_src_install + mv "${D}"/usr/share/doc/HTML "${D}"/usr/share/doc/${PF}/html || die "mv Qt help failed" +}