diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /sci-geosciences/qmapshack | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'sci-geosciences/qmapshack')
| -rw-r--r-- | sci-geosciences/qmapshack/Manifest | 3 | ||||
| -rw-r--r-- | sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch | 28 | ||||
| -rw-r--r-- | sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild (renamed from sci-geosciences/qmapshack/qmapshack-1.15.2-r1.ebuild) | 20 |
3 files changed, 46 insertions, 5 deletions
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 30262030ec65..669a5e0d66ec 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,5 +1,6 @@ +AUX qmapshack-1.15.2-no-hacks-kthxbye.patch 1369 BLAKE2B 01a896d00a15553dbf027d957ebb813f8f211f00e885e80f0cebf34f314fbfab5de0bd601a6a82297ac3ef746d5f2a91903b26cae692c00156409deff6df13cd SHA512 86319948c6f3c7f9e32a19ab88c2de9cd8acc858a7c8c7f02f612d5fb343cae5dbf36f27266e09481cfe5024c91b8e6985b84d83828cb275d0ac27e6deebecee DIST qmapshack-1.15.1.tar.gz 46265787 BLAKE2B b690d1e0ac698cee6969ef3cf35dd3b6102dd292993695fed81416a2bfe396e88bd8004b03a7eeb5df30c817331b83c55452f96200bd6c45145e86eb163ca988 SHA512 c01fc75fd6466a97e82b8f9822dfada87ededcec53e62a3dc42e36463c195ad4ba16c19a4748d48b26a0e957303f2724ec88eecb5d64676c74dbdaeebfadf17a DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637787201bed1763bad026f866060d60a756f18858e76d95ea2420a3183f36147f2c72d151f377e8f2bc9108832266ff4 SHA512 536ba1c2fb3516560307c18eb76ef2b86fecaa1bc0fa4bcef25c8eb2e6c6dee5c3a9a81d6a9d05a147234df7c703937fd9e841696316c350694b0494705f885c EBUILD qmapshack-1.15.1-r1.ebuild 1013 BLAKE2B 630d65db15e9c615d3fe533bac95f1e5730657027ff467324782fc5d90752daf6bcdc0e471e95dcc2f36baec93eb4eab65d272a0c4878e40094a2e906938baba SHA512 9972ce4a907d68d5d7bddf1af3b776cba41b0cb567ba386d6ee8a40dd75c34bb2e4853da6fc7d83320652cd9fe9f03ac63092d19e6051d4c5788ab1154a6b550 -EBUILD qmapshack-1.15.2-r1.ebuild 998 BLAKE2B 8ccf4b9926db3b894dde907519a04ba84926a2967fdbf8d0502226143749cdbb12349e667fb08dbeb09edd650075109ee3aa5ca58539b49ac9981839abdb38ec SHA512 0a84aece442231fae021dae156130ffb30a159efab9dff41a18c364c379490b85d57f5d50447b5a769e2e7791a57f5974ad211f93f6bd3219a0f6de8b404ba78 +EBUILD qmapshack-1.15.2-r2.ebuild 1287 BLAKE2B 3a3af85222de338c70600d6ebc6a02937e20c14ceb636f460b174bf29631f97b8f8cfc1ef64a40a00b0a53ad8125a15e96c61e44139c653a198fb58ef5762a85 SHA512 26389bd2aa043a1fb65c5cfa2f0ea0bac9afa0bee9873c5fa56b6b2723b4b6ec5a6a3e37de44e7f36136e68eb02df77fbcdc1ee14e8b106556926a526b7ee5e4 MISC metadata.xml 831 BLAKE2B 92b3728e320927f7988568ad8b0c7a7b56dc06e8d354e26960f7002652f0a34b6223631179da2d9213f531d135757f17c68589309a0e1736194231a3567df821 SHA512 d69f75e5c21d93c8f0569c8f7429b14f8c9972dead06ebc5bfedaf280c376029ddf4d5f68904472986a5b6f57d9e6a6ef2bdba1edbe440e21d3eca1c65072ba6 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 000000000000..99a55d694fb5 --- /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-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild index bb3db8f99574..5b54a225f831 100644 --- a/sci-geosciences/qmapshack/qmapshack-1.15.2-r1.ebuild +++ b/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild @@ -11,11 +11,11 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" - dev-libs/quazip + dev-libs/quazip:0= dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] @@ -34,10 +34,22 @@ BDEPEND="dev-qt/linguist-tools:5" S="${WORKDIR}"/${PN}-V_${PV} +PATCHES=( + "${S}"/FindPROJ4.patch + "${FILESDIR}"/${P}-no-hacks-kthxbye.patch +) + src_prepare() { - eapply FindPROJ4.patch cmake_src_prepare - xdg_environment_reset + + # 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() { |