* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/, media-radio/wsjtx/files/
@ 2020-04-12 15:35 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2020-04-12 15:35 UTC (permalink / raw
To: gentoo-commits
commit: 92dd380339eac1492a43989776cd5ff861d0e078
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 15:35:17 2020 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 15:35:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92dd3803
media-radio/wsjtx: Fix build with QT_VERSION >= 5.14
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/files/wsjtx-2.1.2-qt_helpers.patch | 20 ++++++++++++++++++++
media-radio/wsjtx/wsjtx-2.1.2.ebuild | 5 +++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/media-radio/wsjtx/files/wsjtx-2.1.2-qt_helpers.patch b/media-radio/wsjtx/files/wsjtx-2.1.2-qt_helpers.patch
new file mode 100644
index 00000000000..553a3bcb650
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.1.2-qt_helpers.patch
@@ -0,0 +1,20 @@
+# build with newer qt-5.14
+# patch provided by nrdufour at the wsjtx mailing list
+--- a/qt_helpers.hpp 2019-11-26 09:22:32.000000000 -0500
++++ b/qt_helpers.hpp 2020-02-03 11:30:07.488214336 -0500
+@@ -83,6 +83,7 @@
+ // std::hash<> specialization for QString based on the dbj2
+ // algorithm <http://www.cse.yorku.ca/~oz/hash.html> because qHash()
+ // is poor on 64-bit platforms due to being a 32-bit hash value
++ #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+ template<>
+ struct hash<QString>
+ {
+@@ -96,6 +97,7 @@
+ return hash;
+ }
+ };
++#endif
+ }
+
+ // Register some useful Qt types with QMetaType
diff --git a/media-radio/wsjtx/wsjtx-2.1.2.ebuild b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
index 15c7d5cf22d..b1d82d5b375 100644
--- a/media-radio/wsjtx/wsjtx-2.1.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -39,7 +39,8 @@ S=${WORKDIR}/wsjtx
PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
"${FILESDIR}/${PN}-fix-unicode.patch"
- "${FILESDIR}/${PN}-drop-docs.patch" )
+ "${FILESDIR}/${PN}-drop-docs.patch"
+ "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch" )
DOCS=( AUTHORS BUGS NEWS README THANKS )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/, media-radio/wsjtx/files/
@ 2020-07-09 11:08 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2020-07-09 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 2032bdda0376fdaea0fee4ffd62525b635e5a4ee
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 9 11:06:51 2020 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Jul 9 11:07:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2032bdda
media-radio/wsjtx: Fix build error on unstable system
Drop '-Werror' flag which aborts build due to reported 'deprecated'
funcntions in >= qt5.15
CLOSES: https://bugs.gentoo.org/731648
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/files/wsjtx-2.2.0-werror.patch | 11 +++++++++++
media-radio/wsjtx/wsjtx-2.2.0.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/media-radio/wsjtx/files/wsjtx-2.2.0-werror.patch b/media-radio/wsjtx/files/wsjtx-2.2.0-werror.patch
new file mode 100644
index 00000000000..dcde5b18a07
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.2.0-werror.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2020-07-09 12:52:57.776437846 +0200
++++ b/CMakeLists.txt 2020-07-09 12:53:16.607083283 +0200
+@@ -921,7 +921,7 @@
+ #
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
+
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -fexceptions -frtti")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fexceptions -frtti")
+
+ if (NOT APPLE)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
diff --git a/media-radio/wsjtx/wsjtx-2.2.0.ebuild b/media-radio/wsjtx/wsjtx-2.2.0.ebuild
index 3abba8aeac2..dca5c443676 100644
--- a/media-radio/wsjtx/wsjtx-2.2.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.2.0.ebuild
@@ -40,7 +40,8 @@ S=${WORKDIR}/wsjtx
PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
"${FILESDIR}/${PN}-fix-unicode.patch"
"${FILESDIR}/${PN}-drop-docs.patch"
- "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch" )
+ "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
+ "${FILESDIR}/${PN}-2.2.0-werror.patch" )
DOCS=( AUTHORS BUGS NEWS README THANKS )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/, media-radio/wsjtx/files/
@ 2021-03-01 16:41 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2021-03-01 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 1355df3aebfceb0222c9e7b5b4e562f9914bbe1a
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 1 16:40:36 2021 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 16:40:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1355df3a
media-radio/wsjtx: Add missing dependencies
Closes: https://bugs.gentoo.org/771204
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
.../wsjtx/files/wsjtx-2.3.0-drop-docs.patch | 33 ++++++++++++++++++++++
media-radio/wsjtx/wsjtx-2.3.0.ebuild | 11 ++++++--
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch b/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch
new file mode 100644
index 00000000000..3654fda2f8f
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f92d3a6..c5fb9b4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1497,10 +1497,6 @@ if (UNIX)
+ add_subdirectory (manpages)
+ add_dependencies (wsjtx manpages)
+ endif (NOT WSJT_SKIP_MANPAGES)
+- if (NOT APPLE)
+- add_subdirectory (debian)
+- add_dependencies (wsjtx debian)
+- endif (NOT APPLE)
+ endif (UNIX)
+
+ #
+@@ -1567,17 +1563,6 @@ install (PROGRAMS
+ RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
+ )
+
+-install (FILES
+- README
+- COPYING
+- AUTHORS
+- THANKS
+- NEWS
+- BUGS
+- DESTINATION ${CMAKE_INSTALL_DOCDIR}
+- #COMPONENT runtime
+- )
+-
+ install (FILES
+ cty.dat
+ cty.dat_copyright.txt
diff --git a/media-radio/wsjtx/wsjtx-2.3.0.ebuild b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
index a76c66850fd..65a0022c8f6 100644
--- a/media-radio/wsjtx/wsjtx-2.3.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake
+inherit cmake flag-o-matic
MY_P=${P/_/-}
@@ -15,7 +15,9 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
-RDEPEND="dev-qt/qtcore:5
+RDEPEND="
+ dev-libs/boost[python]
+ dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
@@ -23,9 +25,10 @@ RDEPEND="dev-qt/qtcore:5
dev-qt/qtconcurrent:5
dev-qt/qtserialport:5
dev-qt/qtsql:5
+ dev-qt/qttest:5
dev-qt/qtprintsupport:5
virtual/libusb:1
- media-libs/hamlib
+ >=media-libs/hamlib-4.0
media-libs/portaudio
sci-libs/fftw:3.0[threads,fortran]
virtual/fortran
@@ -38,6 +41,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/wsjtx
PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
+ "${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
"${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
"${FILESDIR}/${PN}-2.2.0-werror.patch"
"${FILESDIR}/${PN}-clang.patch" )
@@ -61,6 +65,7 @@ src_configure() {
-DWSJT_GENERATE_DOCS="$(usex doc)"
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
)
+ append-ldflags -no-pie
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-01 16:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-12 15:35 [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/, media-radio/wsjtx/files/ Thomas Beierlein
-- strict thread matches above, loose matches on Subject: below --
2020-07-09 11:08 Thomas Beierlein
2021-03-01 16:41 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox