summaryrefslogtreecommitdiff
path: root/sci-geosciences/opencpn-plugin-logbookkonni
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
commit2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
treec8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sci-geosciences/opencpn-plugin-logbookkonni
parente9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
gentoo resync : 05.12.2021
Diffstat (limited to 'sci-geosciences/opencpn-plugin-logbookkonni')
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/Manifest8
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch57
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild (renamed from sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild)28
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild28
4 files changed, 83 insertions, 38 deletions
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
index a484cc7cb26c..bb6d22d39195 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
@@ -1,5 +1,5 @@
-DIST opencpn-plugin-logbookkonni-1.3002.tar.gz 3810133 BLAKE2B e22d4fe15e54ce914d97bfb0c660210dddec26ba7e6867708489f042e18b04f2e4832275a7a96a31e5a4f1bc25faca1f8343ce66114751d1c37b525e749f8d15 SHA512 a539e8d01f9e81f859826477c1abbdafeacc1bd0a1e734777698eb471ddf0a1356bcd321b4b3aa27f9593e0d412e52fb8791248a0dfbc20daa7c9214152e8030
-DIST opencpn-plugin-logbookkonni-1.3002_Layouts.zip 1722887 BLAKE2B ba2b966def65930f544aabe1a617c5cc3aac69f578ffb3360388724c78d4c793719d50e577b0571933168f7f5cc55a27dcbb2e5616b90c17d0257052fd052d9f SHA512 f493d9af822a960f3b9a5d557d46b73e89c8179bfbc4d260d133c972e22d4ce5753e64b2d8ced321589a11a0a32efe1c34b574ed850af0673768896cdbb3d9c5
-EBUILD opencpn-plugin-logbookkonni-1.3002.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
-EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
+AUX cmake.patch 1742 BLAKE2B c20810c649f7cd65bf035530c9066582bbd8f41f1b4af6bae78ae8f1d444e5f3c987d16ca788dcac8698cb4c8ed926029e53f15054d1db315b479e478cf077b5 SHA512 ca875d26c9bb42b77684e18be71002a6ba0d168fb0c17c0ff50734a9765a41c506af7973a84e6f84ed1814279ce0131fd74959ce1550171338771f007a946c03
+DIST opencpn-plugin-logbookkonni-1.4.22.0.tar.gz 8595300 BLAKE2B ce4f1d87613ca4e5f4e4b6ea336b642ec780912395e855af5a88db0b8290b3aed796b54207c5a7776643dfa63dcdf93db711b63e5e9f95a4903c1e7e6874fbf3 SHA512 f3f50e8a7b24aca049b9495d1f3a5a303447df2fa1dc2e3c79a86a1d2be4a8b4f71e4b2ee596e721d3c2a0c9bb7138d9aed6bd28198cc91223233fa9440b827e
+EBUILD opencpn-plugin-logbookkonni-1.4.22.0.ebuild 1223 BLAKE2B 3c26ee0084fce65ee65776920d4def66773c4a5ca099cdcb1782c0f49946b712bf9b776ddaaf9451bcf50ed321e8706212fa521cc3b042493e7e422b3d92aede SHA512 caf04d7978be48930875108289acb6858998d9b66e7ce11aed39531850cac893054918b6d216c71e794ad286ce84194da77e1b72b8235fe49dfec8d0c0f51406
+EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1223 BLAKE2B 3c26ee0084fce65ee65776920d4def66773c4a5ca099cdcb1782c0f49946b712bf9b776ddaaf9451bcf50ed321e8706212fa521cc3b042493e7e422b3d92aede SHA512 caf04d7978be48930875108289acb6858998d9b66e7ce11aed39531850cac893054918b6d216c71e794ad286ce84194da77e1b72b8235fe49dfec8d0c0f51406
MISC metadata.xml 473 BLAKE2B b6e8e9c836c0380ba26e480125e61085bc812d18d21b130559bf856ea90c271c6f62826ae4bec77557523be70c76f9019e99fdaa546402cf90320a33116ffa42 SHA512 320d668c560b2e4abc2f1747355c8b5263b51af5bd8cd19ecee7a2d8995cae6502bce58221bc1ade840db156bbce8e343e960185ef2205d195da044089f31b57
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch
new file mode 100644
index 000000000000..4221ce9f82cd
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch
@@ -0,0 +1,57 @@
+diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake
+--- LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake 2021-10-30 07:35:43.000000000 -1000
++++ LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake 2021-11-29 22:31:48.755156001 -1000
+@@ -6,7 +6,7 @@
+ # Installation items and layout.
+ # ~~~
+
+-include(Metadata)
++#include(Metadata)
+
+ if (APPLE)
+ install(
+diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake
+--- LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake 2021-10-30 07:35:43.000000000 -1000
++++ LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake 2021-11-29 22:31:48.756156018 -1000
+@@ -8,7 +8,7 @@
+ return()
+ endif ()
+
+-include(Metadata)
++#include(Metadata)
+
+ if (UNIX AND NOT APPLE AND NOT QT_ANDROID)
+ set(_LINUX ON)
+diff -urN LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt LogbookKonni_pi-1.4.22.0/CMakeLists.txt
+--- LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt 2021-10-30 07:35:43.000000000 -1000
++++ LogbookKonni_pi-1.4.22.0/CMakeLists.txt 2021-11-29 22:42:03.398496368 -1000
+@@ -27,6 +27,7 @@
+ endif ()
+ message(STATUS "Cmake version: ${CMAKE_VERSION}.")
+
++set(BUILD_TYPE "tarball")
+
+ # -------- Build setup (mostly in PluginCompiler) --------
+ #
+@@ -57,6 +58,7 @@
+
+ option(PLUGIN_USE_SVG "Use SVG graphics" ON)
+
++
+ include(PluginOptions)
+
+ #
+@@ -135,9 +137,10 @@
+ create_targets(
+ ${PROJECT_SOURCE_DIR}/flatpak/org.opencpn.OpenCPN.Plugin.logbook.yaml
+ )
+-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 --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild
index 88643bb432bf..37b7e7554be5 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild
@@ -3,56 +3,50 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
-MY_PN="LogbookKonni-1.2"
+MY_PN="LogbookKonni_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="
- https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="Logbook Plugin for OpenCPN"
-HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
+HOMEPAGE="https://github.com/rgleason/LogbookKonni_pi"
LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0
+ sci-geosciences/opencpn:=
sys-devel/gettext"
DEPEND="${RDEPEND}"
BDEPEND="
app-arch/zip
sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}/cmake.patch"
+)
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
}
-src_install() {
- # install layouts as zip
- cmake_src_install
-
- cd "${WORKDIR}" || die
- zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
-}
-
pkg_postinst() {
elog "Installation of logbook layouts"
elog "*******************************"
elog
elog "The default layouts zip file has been installed to:"
- elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+ elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/Layouts.zip"
elog
elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
elog "click the install button and choose the above mentioned zip file"
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
index 88643bb432bf..37b7e7554be5 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
@@ -3,56 +3,50 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
-MY_PN="LogbookKonni-1.2"
+MY_PN="LogbookKonni_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="
- https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="Logbook Plugin for OpenCPN"
-HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
+HOMEPAGE="https://github.com/rgleason/LogbookKonni_pi"
LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0
+ sci-geosciences/opencpn:=
sys-devel/gettext"
DEPEND="${RDEPEND}"
BDEPEND="
app-arch/zip
sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}/cmake.patch"
+)
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
}
-src_install() {
- # install layouts as zip
- cmake_src_install
-
- cd "${WORKDIR}" || die
- zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
-}
-
pkg_postinst() {
elog "Installation of logbook layouts"
elog "*******************************"
elog
elog "The default layouts zip file has been installed to:"
- elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+ elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/Layouts.zip"
elog
elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
elog "click the install button and choose the above mentioned zip file"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 03:37:46 +0000