* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/files/, media-radio/wsjtx/
@ 2019-04-10 14:14 Thomas Beierlein
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Beierlein @ 2019-04-10 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 7cc80f8970d2e9d0792b6bf6a5ae9b9e846a4583
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 14:13:01 2019 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 14:14:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc80f89
media-radio/wsjtx: Version bump
Closes: https://bugs.gentoo.org/679652
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/Manifest | 1 +
media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch | 12 +++++
media-radio/wsjtx/wsjtx-2.0.1.ebuild | 63 ++++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 626c423eabb..71680b062d6 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,3 +1,4 @@
DIST wsjtx-1.8.0.tgz 29041865 BLAKE2B 3eb3d4e2711443a9e895c1b5771ae6378b13cccbe9b50dce97e9551218700a4e22ae10b618e346b52d2037ee26c5d41f1cf2376d8cc19d143d263db5c683a482 SHA512 793e88604661b03e2e6d5a910ea4045f800b9c59174af3286fd8afdaf65d8a3ca7d1aeae557c6afc66d9bbe398be8c7030950dda03d6bc6279061c3a3107beaa
DIST wsjtx-1.9.1.tgz 29264406 BLAKE2B 0eb00737851a7877d894a21218c6a408eac30caa4114a0edd69400701f0c8c702d4c373adc5c9f7896a4d8f96c338a92e0a997e0270240917b5e236db36c9aa0 SHA512 16c84e7bb8cf9e6eff288b74ee1f9083e0133ff69fdefca7fbc986c912663f744a75db353242024fe8c64ff9e6e8558fd825b9b106abf02cdd4b43be91680557
DIST wsjtx-2.0.0.tgz 42090145 BLAKE2B 8a439dc37daaa7e989dc1cbe007a9493268e2590282f1d88781f8f8bc40690511533a0c668654ada81a0504af880eb7d361b305ca523fc432603eafdcccc88eb SHA512 9cbda699345c4e18ae450415701700f19219f81b75080abf04a9136e40017d7113dd099bdff44414a1f0060c8687e46d6df2dd5cd15730c98eed36f9765ef82d
+DIST wsjtx-2.0.1.tgz 43779157 BLAKE2B ecebc4020ff6d095f550aafda59ab1b7de197dbbec2c0278fa00a3f30cb63bd41ebfe135ed4f2583953e4d895b2a93ae3fb474977945bec5922650c0bfc060c2 SHA512 c49a2148b009c1f485fb0a775708f248a7d3b7c0d240879fbd0ffd18e0181c6573b63dec96137ab6643314ff0e0b10661914400c877901475b0ebaba4569b297
diff --git a/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch b/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch
new file mode 100644
index 00000000000..88fcc08f658
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch
@@ -0,0 +1,12 @@
+# use only installed hamlib version
+--- a/CMakeLists.txt 2019-04-10 15:47:58.372519159 +0200
++++ b/CMakeLists.txt 2019-04-10 15:48:07.576949145 +0200
+@@ -848,7 +848,7 @@
+ find_package (hamlib 3 REQUIRED)
+ find_program (RIGCTL_EXE rigctl)
+ find_program (RIGCTLD_EXE rigctld)
+-find_program (RIGCTLCOM_EXE rigctlcom)
++#find_program (RIGCTLCOM_EXE rigctlcom)
+
+ message (STATUS "hamlib_INCLUDE_DIRS: ${hamlib_INCLUDE_DIRS}")
+ message (STATUS "hamlib_LIBRARIES: ${hamlib_LIBRARIES}")
diff --git a/media-radio/wsjtx/wsjtx-2.0.1.ebuild b/media-radio/wsjtx/wsjtx-2.0.1.ebuild
new file mode 100644
index 00000000000..72bc67c88b1
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-2.0.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtserialport:5
+ dev-qt/qtsql:5
+ dev-qt/qtprintsupport:5
+ virtual/libusb:1
+ media-libs/hamlib
+ media-libs/portaudio
+ sci-libs/fftw:3.0[threads,fortran]
+ virtual/fortran
+ app-text/asciidoc
+ doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/wsjtx
+
+PATCHES=( "${FILESDIR}/${P}-hamlib.patch" )
+
+src_unpack() {
+ unpack ${A}
+ unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWSJT_GENERATE_DOCS="$(usex doc)"
+ -DWSJT_DOC_DESTINATION="/doc/${PF}"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
+ rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
+ rm "${D}"/usr/share/doc/WSJT-X -R || die
+
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/files/, media-radio/wsjtx/
@ 2019-07-24 14:57 Thomas Beierlein
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Beierlein @ 2019-07-24 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 0d52299907f1182bb2cfc2e8b44ed5a0f84b4213
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 14:55:43 2019 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 14:56:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d522999
media-radio/wsjtx: Fix build of documentation
- drop unicode characters from man pages source
- fix DOCDIR
- fix installation of DOCS
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/files/wsjtx-drop-docs.patch | 21 +++++++++++++++++++++
media-radio/wsjtx/files/wsjtx-fix-unicode.patch | 11 +++++++++++
media-radio/wsjtx/wsjtx-2.1.0.ebuild | 14 +++++++++-----
3 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/media-radio/wsjtx/files/wsjtx-drop-docs.patch b/media-radio/wsjtx/files/wsjtx-drop-docs.patch
new file mode 100644
index 00000000000..50bd9cc095b
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-drop-docs.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt 2019-07-24 16:42:07.128890166 +0200
++++ b/CMakeLists.txt 2019-07-24 16:42:40.001023963 +0200
+@@ -1493,18 +1493,6 @@
+ )
+
+ install (FILES
+- README
+- COPYING
+- AUTHORS
+- THANKS
+- NEWS
+- INSTALL
+- BUGS
+- DESTINATION ${CMAKE_INSTALL_DOCDIR}
+- #COMPONENT runtime
+- )
+-
+-install (FILES
+ contrib/Ephemeris/JPLEPH
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
+ #COMPONENT runtime
diff --git a/media-radio/wsjtx/files/wsjtx-fix-unicode.patch b/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
new file mode 100644
index 00000000000..925199863a1
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
@@ -0,0 +1,11 @@
+--- a/manpages/man1/jt65code.1.txt 2019-07-23 19:27:07.690602674 +0200
++++ b/manpages/man1/jt65code.1.txt 2019-07-23 19:27:22.098060819 +0200
+@@ -31,7 +31,7 @@
+
+ *jt65code*, *jt9code* and *jt4code* are utility programs that let you
+ explore the conversion of user-level messages into channel symbols or
+-“tone numbers.” These programs can be useful to someone designing a
++"tone numbers." These programs can be useful to someone designing a
+ beacon generator for JT9 or JT65, or for studying behavior of the
+ error-control codes for each of the protocols.
+
diff --git a/media-radio/wsjtx/wsjtx-2.1.0.ebuild b/media-radio/wsjtx/wsjtx-2.1.0.ebuild
index 36351332cfb..15c7d5cf22d 100644
--- a/media-radio/wsjtx/wsjtx-2.1.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.0.ebuild
@@ -37,7 +37,11 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/wsjtx
-PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
+ "${FILESDIR}/${PN}-fix-unicode.patch"
+ "${FILESDIR}/${PN}-drop-docs.patch" )
+
+DOCS=( AUTHORS BUGS NEWS README THANKS )
src_unpack() {
unpack ${A}
@@ -45,9 +49,11 @@ src_unpack() {
}
src_configure() {
+ cmake_comment_add_subdirectory debian
+
local mycmakeargs=(
-DWSJT_GENERATE_DOCS="$(usex doc)"
- -DWSJT_DOC_DESTINATION="/doc/${PF}"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
)
cmake-utils_src_configure
}
@@ -59,7 +65,5 @@ src_compile() {
src_install() {
cmake-utils_src_install
rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
- rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
- rm "${D}"/usr/share/doc/WSJT-X -R || die
-
+ rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/files/, media-radio/wsjtx/
@ 2020-09-08 15:00 Thomas Beierlein
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Beierlein @ 2020-09-08 15:00 UTC (permalink / raw
To: gentoo-commits
commit: 528ae0d10f4c2400dc82620c1c7ea866215b4325
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 14:59:27 2020 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 15:00:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528ae0d1
media-radio/wsjtx: Fix compiler flags for OpenMP
Due to the mixed compiler suite - clang/clang++ for c/c++ and gfortran
for fortran files - the ebuild needs different flag settings for OpenMP.
Unfortunately the build system has no clear distinction between the
different set of compiler flags. That gets fixed here.
Closes: https://bugs.gentoo.org/740292
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/files/wsjtx-clang.patch | 20 ++++++++++++++++++++
media-radio/wsjtx/wsjtx-2.2.2.ebuild | 3 ++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/media-radio/wsjtx/files/wsjtx-clang.patch b/media-radio/wsjtx/files/wsjtx-clang.patch
new file mode 100644
index 00000000000..bb6c97a538f
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-clang.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt 2020-09-08 10:36:55.770304108 +0200
++++ b/CMakeLists.txt 2020-09-08 10:37:28.346406308 +0200
+@@ -1193,7 +1193,7 @@
+ if (OpenMP_C_FLAGS)
+ set_target_properties (wsjt_fort_omp
+ PROPERTIES
+- COMPILE_FLAGS "${OpenMP_C_FLAGS}"
++ COMPILE_FLAGS "${OpenMP_Fortran_FLAGS}"
+ )
+ endif ()
+ set_target_properties (wsjt_fort_omp
+@@ -1260,7 +1260,7 @@
+ if (OpenMP_C_FLAGS)
+ set_target_properties (jt9
+ PROPERTIES
+- COMPILE_FLAGS "${OpenMP_C_FLAGS}"
++ COMPILE_FLAGS "${OpenMP_Fortran_FLAGS}"
+ LINK_FLAGS "${OpenMP_C_FLAGS}"
+ )
+ endif ()
diff --git a/media-radio/wsjtx/wsjtx-2.2.2.ebuild b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
index 01c2452f0a8..923305c594b 100644
--- a/media-radio/wsjtx/wsjtx-2.2.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
@@ -41,7 +41,8 @@ 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.2.0-werror.patch" )
+ "${FILESDIR}/${PN}-2.2.0-werror.patch"
+ "${FILESDIR}/${PN}-clang.patch" )
DOCS=( AUTHORS BUGS NEWS README THANKS )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/files/, media-radio/wsjtx/
@ 2021-05-25 16:14 Thomas Beierlein
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Beierlein @ 2021-05-25 16:14 UTC (permalink / raw
To: gentoo-commits
commit: e2f5136f6aefa25177ddff2879154c123518bd8a
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 16:13:41 2021 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue May 25 16:14:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f5136f
media-radio/wsjtx: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/Manifest | 1 -
media-radio/wsjtx/files/wsjtx-drop-docs.patch | 21 -------
media-radio/wsjtx/files/wsjtx-fix-unicode.patch | 11 ----
media-radio/wsjtx/wsjtx-2.2.2-r1.ebuild | 79 -------------------------
4 files changed, 112 deletions(-)
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 94b110e0efa..dcdba836599 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,2 +1 @@
-DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
DIST wsjtx-2.3.1.tgz 18040272 BLAKE2B 37b90842470d5565d49d5ed7b9d92207904216d29b8a9966dc38142303d48e92eb640901e4f0a80350f915963f725e36daa7c6fe8034743d30a253eeb02f9e1d SHA512 0a709ca605fb8d93f7583393ec4bdf6416b93233e2910e7e59942f4e40bdb9f2591e3e4b8e0822f49e104e74198a861ed2995cbb4976c7597ef1a1bd6fc43b44
diff --git a/media-radio/wsjtx/files/wsjtx-drop-docs.patch b/media-radio/wsjtx/files/wsjtx-drop-docs.patch
deleted file mode 100644
index 50bd9cc095b..00000000000
--- a/media-radio/wsjtx/files/wsjtx-drop-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt 2019-07-24 16:42:07.128890166 +0200
-+++ b/CMakeLists.txt 2019-07-24 16:42:40.001023963 +0200
-@@ -1493,18 +1493,6 @@
- )
-
- install (FILES
-- README
-- COPYING
-- AUTHORS
-- THANKS
-- NEWS
-- INSTALL
-- BUGS
-- DESTINATION ${CMAKE_INSTALL_DOCDIR}
-- #COMPONENT runtime
-- )
--
--install (FILES
- contrib/Ephemeris/JPLEPH
- DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
- #COMPONENT runtime
diff --git a/media-radio/wsjtx/files/wsjtx-fix-unicode.patch b/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
deleted file mode 100644
index 925199863a1..00000000000
--- a/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/manpages/man1/jt65code.1.txt 2019-07-23 19:27:07.690602674 +0200
-+++ b/manpages/man1/jt65code.1.txt 2019-07-23 19:27:22.098060819 +0200
-@@ -31,7 +31,7 @@
-
- *jt65code*, *jt9code* and *jt4code* are utility programs that let you
- explore the conversion of user-level messages into channel symbols or
--“tone numbers.” These programs can be useful to someone designing a
-+"tone numbers." These programs can be useful to someone designing a
- beacon generator for JT9 or JT65, or for studying behavior of the
- error-control codes for each of the protocols.
-
diff --git a/media-radio/wsjtx/wsjtx-2.2.2-r1.ebuild b/media-radio/wsjtx/wsjtx-2.2.2-r1.ebuild
deleted file mode 100644
index 84e70327f72..00000000000
--- a/media-radio/wsjtx/wsjtx-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
-SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtconcurrent:5
- dev-qt/qtserialport:5
- dev-qt/qtsql:5
- dev-qt/qtprintsupport:5
- virtual/libusb:1
- media-libs/hamlib:=
- media-libs/portaudio
- sci-libs/fftw:3.0[threads,fortran]
- virtual/fortran
- app-text/asciidoc
- doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools
- "
-
-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.2.0-werror.patch"
- "${FILESDIR}/${PN}-clang.patch" )
-
-DOCS=( AUTHORS BUGS NEWS README THANKS )
-
-src_unpack() {
- unpack ${A}
- unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
-}
-
-src_prepare() {
- sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/# COMMAND/" \
- manpages/CMakeLists.txt || die
- eapply_user
- cmake_src_prepare
-}
-
-src_configure() {
- cmake_comment_add_subdirectory debian
-
- local mycmakeargs=(
- -DWSJT_GENERATE_DOCS="$(usex doc)"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
- rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
- rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/files/, media-radio/wsjtx/
@ 2023-06-18 13:07 Thomas Beierlein
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Beierlein @ 2023-06-18 13:07 UTC (permalink / raw
To: gentoo-commits
commit: 082fa64be4668b30868b50870164dff7a8c4cba1
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 13:07:08 2023 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 13:07:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=082fa64b
media-radio/wsjtx: drop 2.5.4
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/Manifest | 1 -
media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch | 12 ----
.../wsjtx/files/wsjtx-2.1.2-qt_helpers.patch | 20 ------
media-radio/wsjtx/wsjtx-2.5.4.ebuild | 77 ----------------------
4 files changed, 110 deletions(-)
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 5ea6098a49dd..5709ec122aaa 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,2 +1 @@
-DIST wsjtx-2.5.4.tgz 25369854 BLAKE2B 674cb64f8f30114dd4e857181502e39d5a61fdb487ef503fd945d1e91853f8aab4dead7c2e9daf4ed2863b07b9760ceec3b6c79c30b64c0c2e3115efc1e20be6 SHA512 c4092d03af3346f0244d942c3db693f5d2c1ed7a2ec9077ded039b7d162e15abdaf09dcb9997d1833d25c366eb03a0dab6114313d423e7e2c9ff37d965261efc
DIST wsjtx-2.6.1.tgz 25624658 BLAKE2B 16181ea18611bf1bfaae78e4c5bf000d53cdb4401d1d07a7bd96a041c6da3bc385df71ddabb13a191fa32bd5579c7a330c2dff9a7b3e438222fd8a4ebb44412c SHA512 0f151c10b75798ab28a01604b08981f399d612135b7e9ddc3e66f9121fd49c97bb9508ce649e342791705ee5e1247f8e461a31afa871ddd46da1cf7fd5826c74
diff --git a/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch b/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch
deleted file mode 100644
index 88fcc08f6581..000000000000
--- a/media-radio/wsjtx/files/wsjtx-2.0.1-hamlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# use only installed hamlib version
---- a/CMakeLists.txt 2019-04-10 15:47:58.372519159 +0200
-+++ b/CMakeLists.txt 2019-04-10 15:48:07.576949145 +0200
-@@ -848,7 +848,7 @@
- find_package (hamlib 3 REQUIRED)
- find_program (RIGCTL_EXE rigctl)
- find_program (RIGCTLD_EXE rigctld)
--find_program (RIGCTLCOM_EXE rigctlcom)
-+#find_program (RIGCTLCOM_EXE rigctlcom)
-
- message (STATUS "hamlib_INCLUDE_DIRS: ${hamlib_INCLUDE_DIRS}")
- message (STATUS "hamlib_LIBRARIES: ${hamlib_LIBRARIES}")
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
deleted file mode 100644
index 553a3bcb650f..000000000000
--- a/media-radio/wsjtx/files/wsjtx-2.1.2-qt_helpers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.5.4.ebuild b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
deleted file mode 100644
index f029ad534868..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="https://physics.princeton.edu//pulsar/K1JT/wsjtx.html"
-SRC_URI="https://physics.princeton.edu/pulsar/k1jt/${P}.tgz"
-S=${WORKDIR}/wsjtx
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
- dev-libs/boost:=[nls,python]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets: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-4.0:=
- media-libs/portaudio
- sci-libs/fftw:3.0[threads,fortran]
- virtual/fortran
- app-text/asciidoc
- doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools"
-
-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"
-)
-
-DOCS=( AUTHORS BUGS NEWS README THANKS )
-
-src_unpack() {
- unpack ${A}
- unpack "${WORKDIR}/${P/_/-}/src/wsjtx.tgz"
-}
-
-src_prepare() {
- sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/# COMMAND/" \
- manpages/CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- # fails to complie with -flto (bug #860417)
- filter-lto
-
- local mycmakeargs=(
- -DWSJT_GENERATE_DOCS="$(usex doc)"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- )
- append-ldflags -no-pie
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
- rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/files/, media-radio/wsjtx/
@ 2024-06-15 5:11 Thomas Beierlein
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Beierlein @ 2024-06-15 5:11 UTC (permalink / raw
To: gentoo-commits
commit: c2e62325c1cc85dc35c3fc49c9fe6b060881fbc2
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 05:10:16 2024 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 05:10:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e62325
media-radio/wsjtx: Fix missing variable declaration
Closes: https://bugs.gentoo.org/934307
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/wsjtx/files/wsjtx-2.7.0_rc4-fix_NFFT.patch | 13 +++++++++++++
media-radio/wsjtx/wsjtx-2.7.0_rc4.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-radio/wsjtx/files/wsjtx-2.7.0_rc4-fix_NFFT.patch b/media-radio/wsjtx/files/wsjtx-2.7.0_rc4-fix_NFFT.patch
new file mode 100644
index 000000000000..83b3c779de26
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.7.0_rc4-fix_NFFT.patch
@@ -0,0 +1,13 @@
+# See https://sourceforge.net/p/wsjt/mailman/message/58778025/
+diff --git a/qmap/libqmap/decode0.f90 b/qmap/libqmap/decode0.f90
+index 55a58dc..ed58cd2 100755
+--- a/qmap/libqmap/decode0.f90
++++ b/qmap/libqmap/decode0.f90
+@@ -2,6 +2,7 @@ subroutine decode0(dd,ss,savg)
+
+ use timer_module, only: timer
+ parameter (NSMAX=60*96000)
++ parameter (NFFT=32768)
+
+ real*4 dd(2,NSMAX),ss(400,NFFT),savg(NFFT)
+ real*8 fcenter
diff --git a/media-radio/wsjtx/wsjtx-2.7.0_rc4.ebuild b/media-radio/wsjtx/wsjtx-2.7.0_rc4.ebuild
index 19392764677e..12a363f40cbf 100644
--- a/media-radio/wsjtx/wsjtx-2.7.0_rc4.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.7.0_rc4.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.0-werror.patch"
"${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
"${FILESDIR}/${PN}-clang.patch"
+ "${FILESDIR}/${P}-fix_NFFT.patch"
)
DOCS=( AUTHORS BUGS NEWS README THANKS )
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-15 5:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-15 5:11 [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/files/, media-radio/wsjtx/ Thomas Beierlein
-- strict thread matches above, loose matches on Subject: below --
2023-06-18 13:07 Thomas Beierlein
2021-05-25 16:14 Thomas Beierlein
2020-09-08 15:00 Thomas Beierlein
2019-07-24 14:57 Thomas Beierlein
2019-04-10 14:14 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox