diff options
Diffstat (limited to 'sci-geosciences/qmapshack')
| -rw-r--r-- | sci-geosciences/qmapshack/Manifest | 7 | ||||
| -rw-r--r-- | sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch | 28 | ||||
| -rw-r--r-- | sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild | 2 | ||||
| -rw-r--r-- | sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild (renamed from sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild) | 21 |
4 files changed, 8 insertions, 50 deletions
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index a8b73dc8b49c..53ee68929cb0 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,6 +1,5 @@ -AUX qmapshack-1.15.2-no-hacks-kthxbye.patch 1369 BLAKE2B 01a896d00a15553dbf027d957ebb813f8f211f00e885e80f0cebf34f314fbfab5de0bd601a6a82297ac3ef746d5f2a91903b26cae692c00156409deff6df13cd SHA512 86319948c6f3c7f9e32a19ab88c2de9cd8acc858a7c8c7f02f612d5fb343cae5dbf36f27266e09481cfe5024c91b8e6985b84d83828cb275d0ac27e6deebecee -DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637787201bed1763bad026f866060d60a756f18858e76d95ea2420a3183f36147f2c72d151f377e8f2bc9108832266ff4 SHA512 536ba1c2fb3516560307c18eb76ef2b86fecaa1bc0fa4bcef25c8eb2e6c6dee5c3a9a81d6a9d05a147234df7c703937fd9e841696316c350694b0494705f885c DIST qmapshack-1.16.0.tar.gz 54233332 BLAKE2B 8507018e65072856455e500aae59db146f68b7a1cf5eb2311ee3526044f8fafcec0034ac4f7a473c95ac71bcad8eb057bfc6724f3c80caff51aadba9e16fc412 SHA512 768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4 -EBUILD qmapshack-1.15.2-r2.ebuild 1282 BLAKE2B c149bdc91387d706c25c341088ac5663a7a536247a9d7662c2b29b5a621e4bfe3fa331ee045b7397a6c45a66a72f4a02225fd91c5d07eb05fb7f4d2265c2d293 SHA512 b4161a42a97ae5c6c285d4c381462753cd17cd79fe6b72e023a871405531de4964a9c1aedf985d08839f4637b61720bbb88c148881c3056318c434904a170ba3 -EBUILD qmapshack-1.16.0.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6 +DIST qmapshack-1.16.1.tar.gz 54433326 BLAKE2B 58d3fff752187418552cba1d89b3ebd0082af379204b3c0b79cb8f8096cd422d3a9d347f7b91379868b37092469c5ef6187e67bfb7d0c3c07e18a65df0b488f1 SHA512 cd6c1818c2468a4654222d165bfa7278dea01890d4065a359942ce16ee1c643b54f86a94a30632bc414a1ec22e04ea340109fc89ca6c340eb717f8e86468e281 +EBUILD qmapshack-1.16.0.ebuild 967 BLAKE2B 86b7bf4ab46ca6c1a5d4fd923c09574464dea8c6a3d8ed4e45d660b295e93af3ab34274da97570ba622b63e541c5a732042ec9096f8e86462af9a83ca5b9fab5 SHA512 ad24da0b305c408af1bc7b3feade6b31db7088bbb54fd04d88c15b171cece3b18320cad2c3d4ada436d00b0ed63b18f92d0cdcb2045f95b85272ce034e863ee6 +EBUILD qmapshack-1.16.1.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6 MISC metadata.xml 832 BLAKE2B d5194f18fd470325a3c98e268794bc01c4adc951a88f7548a52291cafbf010ded0e71beec3b902021e4b318eb5d21b35d2397475df948acec8f5683d003c576a SHA512 d5c8cc820bba367ace5ac27c714b735c22b456d71248cce2a4ed5c67eb80033c3690127887cb3a181628a836dc42c322508058363ec57b06ae823b43aaf63f2f 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 deleted file mode 100644 index 99a55d694fb5..000000000000 --- a/sci-geosciences/qmapshack/files/qmapshack-1.15.2-no-hacks-kthxbye.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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.16.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild index 6c1736186d87..a9b713177f55 100644 --- a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild +++ b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild @@ -11,7 +11,7 @@ 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=" diff --git a/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild index 233c124fc27e..6c1736186d87 100644 --- a/sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild +++ b/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild @@ -11,7 +11,7 @@ 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=" @@ -26,30 +26,17 @@ RDEPEND=" dev-qt/qtwebengine:5[widgets] >=sci-geosciences/routino-3.1.1 sci-libs/alglib - sci-libs/gdal - <sci-libs/proj-8:= + sci-libs/gdal:= + >=sci-libs/proj-8:= " DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" S="${WORKDIR}"/${PN}-V_${PV} -PATCHES=( - "${S}"/FindPROJ4.patch - "${FILESDIR}"/${P}-no-hacks-kthxbye.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 + xdg_src_prepare } src_install() { |