commit: 9dfe0d262344cf04c192e311e6a7d650b4d15f2e Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> AuthorDate: Mon Nov 29 10:16:10 2021 +0000 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> CommitDate: Tue Nov 30 09:04:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfe0d26
sci-geosciences/opencpn-plugin-dr: added 4.0.0 Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org> sci-geosciences/opencpn-plugin-dr/Manifest | 1 + .../opencpn-plugin-dr/files/cmake.patch | 41 ++++++++++++++++++++++ ...-9999.ebuild => opencpn-plugin-dr-4.0.0.ebuild} | 10 ++++-- .../opencpn-plugin-dr-9999.ebuild | 10 ++++-- 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/sci-geosciences/opencpn-plugin-dr/Manifest b/sci-geosciences/opencpn-plugin-dr/Manifest index e6b0099358e1..fd552525ad35 100644 --- a/sci-geosciences/opencpn-plugin-dr/Manifest +++ b/sci-geosciences/opencpn-plugin-dr/Manifest @@ -1 +1,2 @@ DIST opencpn-plugin-dr-1.1.tar.gz 133693 BLAKE2B 3d3356d43ca263c117511be4b4b873038f1a0493ab9b9ec4d0811da4360a38a2ec4ee2a31b54ce18741fc9ae0e3daf1a0a24b1c62493087c747b9e8720ee5a07 SHA512 2a953c7a8a491975c2b14e877364cfa736d2c410ea77bb4e0b18cf3bb3b04b19c2fcbc9debd513182f95002b483e689c4e21c30d87474e319bae7d2d840254f1 +DIST opencpn-plugin-dr-4.0.0.tar.gz 2010328 BLAKE2B 7b3d9e93edb52e6c039e759a5a4f8f85145c89c68b6c9d33ecf8fa376e4150bfe34a516bb9f278ef820fb880c2c45b13a446151c46bd9220e303c1b352010601 SHA512 0cbb87b66569451510f813a7766ca7e7e5c120861046c93b0adb0e71b90528ae83b12201635ec0e3a9286c470e0a93015c4a5a99cbc13979c894fa4be36ce71f diff --git a/sci-geosciences/opencpn-plugin-dr/files/cmake.patch b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch new file mode 100644 index 000000000000..ab0bb813c321 --- /dev/null +++ b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch @@ -0,0 +1,41 @@ +diff -ur DR_pi-4.0.0.orig/CMakeLists.txt DR_pi-4.0.0/CMakeLists.txt +--- DR_pi-4.0.0.orig/CMakeLists.txt 2021-11-04 00:32:44.000000000 -1000 ++++ DR_pi-4.0.0/CMakeLists.txt 2021-11-29 00:11:03.998266321 -1000 +@@ -61,9 +61,10 @@ + ) + include(Targets) + create_targets(${FLATPAK_MANIFEST}) +-if ("${BUILD_TYPE}" STREQUAL "") +- return () +-endif () ++#if ("${BUILD_TYPE}" STREQUAL "") ++# return () ++#endif () ++include(PluginLibs) + + if (NOT ${BUILD_TYPE} STREQUAL "flatpak") + # Build package as required (flatpak already dealt with). +diff -ur DR_pi-4.0.0.orig/cmake/PluginInstall.cmake DR_pi-4.0.0/cmake/PluginInstall.cmake +--- DR_pi-4.0.0.orig/cmake/PluginInstall.cmake 2021-11-04 00:32:44.000000000 -1000 ++++ DR_pi-4.0.0/cmake/PluginInstall.cmake 2021-11-29 00:10:04.241099544 -1000 +@@ -11,7 +11,7 @@ + # the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + +-include(Metadata) ++#include(Metadata) + + if (APPLE) + install( +diff -ur DR_pi-4.0.0.orig/cmake/Targets.cmake DR_pi-4.0.0/cmake/Targets.cmake +--- DR_pi-4.0.0.orig/cmake/Targets.cmake 2021-11-04 00:32:44.000000000 -1000 ++++ DR_pi-4.0.0/cmake/Targets.cmake 2021-11-29 00:10:18.954386822 -1000 +@@ -19,7 +19,7 @@ + return() + endif () + +-include(Metadata) ++#include(Metadata) + + if (UNIX AND NOT APPLE AND NOT QT_ANDROID) + set(_LINUX ON) diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild similarity index 80% copy from sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild copy to sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild index 96bb44ad6eeb..f8093a00ebdc 100644 --- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -WX_GTK_VER="3.0" +WX_GTK_VER="3.0-gtk3" inherit cmake wxwidgets MY_PN="DR_pi" @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git" else - SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" @@ -25,10 +25,14 @@ SLOT="0" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" BDEPEND="sys-devel/gettext" +PATCHES=( + "${FILESDIR}/cmake.patch" +) + src_configure() { setup-wxwidgets unicode cmake_src_configure diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild index 96bb44ad6eeb..f8093a00ebdc 100644 --- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild +++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -WX_GTK_VER="3.0" +WX_GTK_VER="3.0-gtk3" inherit cmake wxwidgets MY_PN="DR_pi" @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git" else - SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" @@ -25,10 +25,14 @@ SLOT="0" RDEPEND=" x11-libs/wxGTK:${WX_GTK_VER} - >=sci-geosciences/opencpn-4.2.0" + sci-geosciences/opencpn:=" DEPEND="${RDEPEND}" BDEPEND="sys-devel/gettext" +PATCHES=( + "${FILESDIR}/cmake.patch" +) + src_configure() { setup-wxwidgets unicode cmake_src_configure