From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sci-geosciences/opencpn/Manifest | 4 +- .../opencpn/files/5.0.0-CMakeLists.txt.patch | 79 -------------------- .../opencpn/files/opencpn-5.0.0-cmake.patch | 86 ++++++++++++++++++++++ sci-geosciences/opencpn/opencpn-5.0.0.ebuild | 39 ++++------ 4 files changed, 104 insertions(+), 104 deletions(-) delete mode 100644 sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch create mode 100644 sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch (limited to 'sci-geosciences/opencpn') diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest index 76b76cf510cf..49ba8f38ddd1 100644 --- a/sci-geosciences/opencpn/Manifest +++ b/sci-geosciences/opencpn/Manifest @@ -1,5 +1,5 @@ -AUX 5.0.0-CMakeLists.txt.patch 3104 BLAKE2B 33fbedd5960805b783867bc30bc66efe81ce9f0fd839544d23ccbab9b7d50892d8ca6311d01c30bdef83310e8c17210a3564874bf2297832975192cd56e4ddcd SHA512 32e97327c76a5d6028de2026e081b79db279deca45cc3394faf15c632e1567d0bf708f3c81f6d2c0b2d69edd82fd217cf5d0f4970dd27d64d4936c8109eba6ae +AUX opencpn-5.0.0-cmake.patch 3076 BLAKE2B 09a42b94abf3d8674ba8c82ba0ad2e001c40354646237095d34fd24c712f4ff915e5d5a26bf222fab9a3f8c522dd4b06d4daeaa8fa0adab8a7665d6ae703094f SHA512 c2ceba554e228649529e104df79854873b021d661c8879b2b1c1137750b8c23aa793d3c56840a13fe1e7e73776180f5267af9a5a4c0b1c8d9b4e99804483ac85 DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb -EBUILD opencpn-5.0.0.ebuild 1335 BLAKE2B 4e9092ecbd69861a21e16ed83fc8363dbd1efc962653a3f15817ba453729b3079a34f9c0e2891aef66d2f9f5c25f5bf8a0e8eeaaea13e49e9efbbd9ba51c2d5a SHA512 8927a11687c646b349a695cd6060985cb915cdf3e93e164112d69ce69ea5747ab15affcd94e93426f9c16da7c9e51c8a48c4b4169dab8a5eaae012a674faf87b +EBUILD opencpn-5.0.0.ebuild 1293 BLAKE2B 2a394e596e4bd0be608f3c291ebdf9870a432662903f08b869995ec0277dc05c761ed5f1dc874c4752e9a22074e4c1cfa56981aee4efa6635b47b63804e96f3d SHA512 f5505b80f37846fcf77985b6f8504aa80ae29c516ea243e10b423f0283c1ae9105941432567f8af90b089029450112404626da0b6006e41548db4892664d1e49 MISC metadata.xml 531 BLAKE2B 4c2d7950160138cc8a789d259beb3050af12f9406d376afb70465af18f1a9e979f45e4d6b2bbdb14a9670a936b087b772f29e2dc60289f4ef9e47911e3753e8d SHA512 4315299e7a239d5bdc7edfb6c377217908372e59fe187fe071948fb594100b29bc85116fa458a00233411f47d22780d9c1efeec07cbda6bc3b404a94cab35e3f diff --git a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch b/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch deleted file mode 100644 index aca98fe9f01b..000000000000 --- a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fcec1191a..8df2a9e21 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -408,9 +408,9 @@ IF((_wx_selected_config MATCHES "qt-armv7")) - ENDIF() - - IF((_wx_selected_config MATCHES "qt-armv7")) -- SET(wxWidgets_USE_LIBS base core xml html adv aui) -+ SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui) - ELSE() -- SET(wxWidgets_USE_LIBS net xml html adv aui core base webview) -+ SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview) - ENDIF() - - OPTION (USE_GL "Enable OpenGL support" ON) -@@ -436,7 +436,7 @@ IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Li - SET(OPENGLES_FOUND "YES") - SET(OPENGL_FOUND "YES") - -- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl ) -+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl ) - add_subdirectory(src/glshim) - - SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm" ) -@@ -455,7 +455,7 @@ IF(QT_ANDROID) - SET(OPENGLES_FOUND "YES") - SET(OPENGL_FOUND "YES") - -- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl ) -+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl ) - add_subdirectory(src/glshim) - ENDIF(QT_ANDROID) - -@@ -468,7 +468,7 @@ IF ((NOT OPENGLES_FOUND) AND (NOT QT_ANDROID)) - ENDIF(USE_GL) - - IF(OPENGL_FOUND) -- SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} ) -+ SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} ) - INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) - - MESSAGE (STATUS "Found OpenGL...." ) -@@ -529,14 +529,14 @@ IF(NOT QT_ANDROID) - ENDIF(MSVC) - - IF(WIN32 OR APPLE OR QT_ANDROID) -- FIND_PACKAGE(wxWidgets) -+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - if (wxWidgets_FOUND) - message(STATUS "Found wxWidgets webview add-on") - add_definitions(-DOCPN_USE_WEBVIEW) - else () -- list(REMOVE_ITEM wxWidgets_USE_LIBS webview) -+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview) - message(STATUS "Could not find wxWidgets webview add-on") -- FIND_PACKAGE(wxWidgets REQUIRED) -+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - endif () - IF(MSYS) - # this is to convert msys to windows paths, and handle the missing /usr -@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID) - set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3) - MESSAGE(STATUS "Building against GTK3...") - ENDIF(GTK2_FOUND) -- FIND_PACKAGE(wxWidgets) -+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - if (wxWidgets_FOUND) - message(STATUS "Found wxWidgets webview add-on") - add_definitions(-DOCPN_USE_WEBVIEW) - else () -- list(REMOVE_ITEM wxWidgets_USE_LIBS webview) -+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview) - message(STATUS "Could not find wxWidgets webview add-on") -- FIND_PACKAGE(wxWidgets REQUIRED) -+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS}) - endif () - MESSAGE (STATUS "Found wxWidgets..." ) - MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}") diff --git a/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch new file mode 100644 index 000000000000..ebd354bd826b --- /dev/null +++ b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch @@ -0,0 +1,86 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -408,9 +408,9 @@ + ENDIF() + + IF((_wx_selected_config MATCHES "qt-armv7")) +- SET(wxWidgets_USE_LIBS base core xml html adv aui) ++ SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui) + ELSE() +- SET(wxWidgets_USE_LIBS net xml html adv aui core base webview) ++ SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview) + ENDIF() + + OPTION (USE_GL "Enable OpenGL support" ON) +@@ -436,7 +436,7 @@ + SET(OPENGLES_FOUND "YES") + SET(OPENGL_FOUND "YES") + +- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl ) ++ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl ) + add_subdirectory(src/glshim) + + SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm" ) +@@ -455,7 +455,7 @@ + SET(OPENGLES_FOUND "YES") + SET(OPENGL_FOUND "YES") + +- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl ) ++ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl ) + add_subdirectory(src/glshim) + ENDIF(QT_ANDROID) + +@@ -468,7 +468,7 @@ + ENDIF(USE_GL) + + IF(OPENGL_FOUND) +- SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} ) ++ SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} ) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) + + MESSAGE (STATUS "Found OpenGL...." ) +@@ -529,14 +529,14 @@ + ENDIF(MSVC) + + IF(WIN32 OR APPLE OR QT_ANDROID) +- FIND_PACKAGE(wxWidgets) ++ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS}) + if (wxWidgets_FOUND) + message(STATUS "Found wxWidgets webview add-on") + add_definitions(-DOCPN_USE_WEBVIEW) + else () +- list(REMOVE_ITEM wxWidgets_USE_LIBS webview) ++ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview) + message(STATUS "Could not find wxWidgets webview add-on") +- FIND_PACKAGE(wxWidgets REQUIRED) ++ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS}) + endif () + IF(MSYS) + # this is to convert msys to windows paths, and handle the missing /usr +@@ -725,7 +725,7 @@ + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/serial/include) + + ## Add serial library +- add_library(SERIAL ${serial_SRCS}) ++ add_library(SERIAL STATIC ${serial_SRCS}) + if(APPLE) + target_link_libraries(SERIAL ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) + elseif(UNIX) +@@ -1053,14 +1053,14 @@ + set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3) + MESSAGE(STATUS "Building against GTK3...") + ENDIF(GTK2_FOUND) +- FIND_PACKAGE(wxWidgets) ++ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS}) + if (wxWidgets_FOUND) + message(STATUS "Found wxWidgets webview add-on") + add_definitions(-DOCPN_USE_WEBVIEW) + else () +- list(REMOVE_ITEM wxWidgets_USE_LIBS webview) ++ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview) + message(STATUS "Could not find wxWidgets webview add-on") +- FIND_PACKAGE(wxWidgets REQUIRED) ++ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS}) + endif () + MESSAGE (STATUS "Found wxWidgets..." ) + MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}") diff --git a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild index 4ae2fe2e75a1..84e09c9f1e65 100644 --- a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild +++ b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 WX_GTK_VER="3.0" -inherit cmake-utils wxwidgets +inherit wxwidgets xdg cmake DOC_VERSION="4.8.2.0" DESCRIPTION="a free, open source software for marine navigation" HOMEPAGE="https://opencpn.org/" -SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz -doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz ) -" +SRC_URI=" + https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz + doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )" +S="${WORKDIR}/OpenCPN-${PV}" LICENSE="GPL-2+" SLOT="0" @@ -30,18 +31,15 @@ RDEPEND=" opengl? ( virtual/opengl ) x11-libs/gtk+:2 x11-libs/wxGTK:${WX_GTK_VER}[X] - !sci-geosciences/opencpn-plugin-wmm -" -DEPEND="${RDEPEND} - sys-devel/gettext" - -S="${WORKDIR}/OpenCPN-${PV}" + !sci-geosciences/opencpn-plugin-wmm" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" -PATCHES=( - "${FILESDIR}/${PV}-CMakeLists.txt.patch" -) +PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) src_configure() { + use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. ) + setup-wxwidgets local mycmakeargs=( -DUSE_S57=ON @@ -50,17 +48,12 @@ src_configure() { -DBUNDLE_TCDATA=ON ) - cmake-utils_src_configure -} - -src_install() { - if use doc; then - dohtml -r "${S}"/../${PN}/doc/* - fi - cmake-utils_src_install + cmake_src_configure } pkg_postinst() { + xdg_pkg_postinst + if use doc; then einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html" fi -- cgit v1.2.3