* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/, sci-geosciences/opencpn/files/
@ 2021-04-04 14:08 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-04-04 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 548296ca551f32da30f3cd525595ccd393597ee2
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 14:08:01 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 14:08:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548296ca
sci-geosciences/opencpn: Port to EAPI 7
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...keLists.txt.patch => opencpn-5.0.0-cmake.patch} | 41 +++++++++++++---------
sci-geosciences/opencpn/opencpn-5.0.0.ebuild | 39 +++++++++-----------
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
similarity index 84%
rename from sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch
rename to sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
index aca98fe9f01..ebd354bd826 100644
--- a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch
+++ b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
@@ -1,10 +1,8 @@
-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"))
+@@ -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)
@@ -12,38 +10,38 @@ index fcec1191a..8df2a9e21 100644
- 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
+@@ -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 @@ IF(QT_ANDROID)
+@@ -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 @@ IF ((NOT OPENGLES_FOUND) AND (NOT 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 @@ IF(NOT QT_ANDROID)
+@@ -529,14 +529,14 @@
ENDIF(MSVC)
-
+
IF(WIN32 OR APPLE OR QT_ANDROID)
- FIND_PACKAGE(wxWidgets)
+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
@@ -59,7 +57,16 @@ index fcec1191a..8df2a9e21 100644
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)
+@@ -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)
diff --git a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
index 4ae2fe2e75a..84e09c9f1e6 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/, sci-geosciences/opencpn/files/
@ 2021-11-02 12:11 Marc Schiffbauer
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer @ 2021-11-02 12:11 UTC (permalink / raw
To: gentoo-commits
commit: c1289d6987c8bbb0a57d18c8dfae4f850a7bd3fe
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 2 12:10:05 2021 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Nov 2 12:11:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1289d69
sci-geosciences/opencpn: add 5.2.0
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
sci-geosciences/opencpn/Manifest | 1 +
.../opencpn/files/opencpn-5.2.0-cmake.patch | 14 +++++
sci-geosciences/opencpn/opencpn-5.2.0.ebuild | 59 ++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 59f7720f7ed..f728493696f 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,2 +1,3 @@
DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96
+DIST opencpn-5.2.0.tar.gz 78313969 BLAKE2B 46fc27c749f0a250502f7450c2b854b32320dc753ddc8011e05c93ad8a0752fdefa98b495ad901beea18e70b337de1d50a72eebac452c7d18a6237ee49313f42 SHA512 fcef47b21e5da9a8028972b30ac825be6486ae89398e9d91899621fe32c96f9fce93cfde67dbf07991d20406ce30333895539220a63df071125e2a4db79d5709
DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
diff --git a/sci-geosciences/opencpn/files/opencpn-5.2.0-cmake.patch b/sci-geosciences/opencpn/files/opencpn-5.2.0-cmake.patch
new file mode 100644
index 00000000000..4c2ea09ae15
--- /dev/null
+++ b/sci-geosciences/opencpn/files/opencpn-5.2.0-cmake.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt 2021-11-02 01:45:56.488999411 -1000
++++ b/CMakeLists.txt 2021-11-02 01:51:53.343219957 -1000
+@@ -756,9 +756,9 @@
+ # looked for them. This is a nasty fix which might fail miserably. Assumption:
+ # All builds using GTK uses unicode and wxWidgets 3.0
+ if (GTK3_FOUND)
+- list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_aui-3.0")
++ list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_aui-3.0-gtk3")
+ if (OPENGL_FOUND)
+- list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_gl-3.0")
++ list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_gl-3.0-gtk3")
+ endif ()
+ endif ()
+
diff --git a/sci-geosciences/opencpn/opencpn-5.2.0.ebuild b/sci-geosciences/opencpn/opencpn-5.2.0.ebuild
new file mode 100644
index 00000000000..6688d1f0e0d
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-5.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+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 )"
+S="${WORKDIR}/OpenCPN-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc lzma opengl"
+
+RDEPEND="
+ app-arch/bzip2
+ lzma? ( app-arch/xz-utils )
+ dev-libs/tinyxml
+ media-libs/freetype:2
+ media-libs/portaudio
+ net-misc/curl
+ sys-libs/zlib
+ opengl? ( virtual/opengl )
+ x11-libs/gtk+:3
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_configure() {
+ use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. )
+
+ setup-wxwidgets
+ local mycmakeargs=(
+ -DUSE_S57=ON
+ -DUSE_GARMINHOST=ON
+ -DBUNDLE_GSHHS=CRUDE
+ -DBUNDLE_TCDATA=ON
+ )
+
+ 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/, sci-geosciences/opencpn/files/
@ 2021-11-02 13:55 Marc Schiffbauer
0 siblings, 0 replies; 3+ messages in thread
From: Marc Schiffbauer @ 2021-11-02 13:55 UTC (permalink / raw
To: gentoo-commits
commit: bb6ed4b1b52bd1e31882c703fd78f93aeeff44c1
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 2 13:54:43 2021 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Nov 2 13:55:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6ed4b1
sci-geosciences/opencpn: add 5.2.4, drop 5.2.0
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
sci-geosciences/opencpn/Manifest | 2 +-
.../files/{opencpn-5.2.0-cmake.patch => opencpn-5.2.4-cmake.patch} | 0
sci-geosciences/opencpn/{opencpn-5.2.0.ebuild => opencpn-5.2.4.ebuild} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index f728493696f..90157fad583 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,3 +1,3 @@
DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96
-DIST opencpn-5.2.0.tar.gz 78313969 BLAKE2B 46fc27c749f0a250502f7450c2b854b32320dc753ddc8011e05c93ad8a0752fdefa98b495ad901beea18e70b337de1d50a72eebac452c7d18a6237ee49313f42 SHA512 fcef47b21e5da9a8028972b30ac825be6486ae89398e9d91899621fe32c96f9fce93cfde67dbf07991d20406ce30333895539220a63df071125e2a4db79d5709
+DIST opencpn-5.2.4.tar.gz 81226481 BLAKE2B 7c5bb1157e94d3271bce899740cdf6d9d5dc17c4406b3020fa8a91ae728ca3c0ddab799affa219b833df86e547de91b2e6ccd11fa57fff056550a440d9968fad SHA512 13543272fe4c68b911c42fdc19f0bd7842809edc8e91d73899030f70668e78c448474541a5742ad675d6e2b361240ca1a5d603b163f8b5107539720442ee19a0
DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
diff --git a/sci-geosciences/opencpn/files/opencpn-5.2.0-cmake.patch b/sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch
similarity index 100%
rename from sci-geosciences/opencpn/files/opencpn-5.2.0-cmake.patch
rename to sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch
diff --git a/sci-geosciences/opencpn/opencpn-5.2.0.ebuild b/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
similarity index 100%
rename from sci-geosciences/opencpn/opencpn-5.2.0.ebuild
rename to sci-geosciences/opencpn/opencpn-5.2.4.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-02 13:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-02 12:11 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/, sci-geosciences/opencpn/files/ Marc Schiffbauer
-- strict thread matches above, loose matches on Subject: below --
2021-11-02 13:55 Marc Schiffbauer
2021-04-04 14:08 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox