diff options
| -rw-r--r-- | media-radio/wsjtx_improved/Manifest | 1 | ||||
| -rw-r--r-- | media-radio/wsjtx_improved/files/wsjtx-2.8.0-qt691.patch | 40 | ||||
| -rw-r--r-- | media-radio/wsjtx_improved/files/wsjtx-fix-sound-dir.patch | 66 | ||||
| -rw-r--r-- | media-radio/wsjtx_improved/wsjtx_improved-2.8.0-r2.ebuild | 76 | ||||
| -rw-r--r-- | media-radio/wsjtx_improved/wsjtx_improved-3.0.0.ebuild | 75 | ||||
| -rw-r--r-- | net-wireless/inspectrum/Manifest | 1 | ||||
| -rw-r--r-- | net-wireless/inspectrum/inspectrum-0.3.1_p20251130.ebuild | 35 | ||||
| -rw-r--r-- | sci-ml/caffe2/caffe2-2.9.1-r1.ebuild | 1 | ||||
| -rw-r--r-- | sci-ml/caffe2/files/caffe2-2.9.1-CCCL31.patch | 34 |
9 files changed, 35 insertions, 294 deletions
diff --git a/media-radio/wsjtx_improved/Manifest b/media-radio/wsjtx_improved/Manifest index bc53ba114513..9c894dc1556c 100644 --- a/media-radio/wsjtx_improved/Manifest +++ b/media-radio/wsjtx_improved/Manifest @@ -1,2 +1 @@ -DIST wsjtx-2.8.0_improved_PLUS_250501_qt6.tgz 32956533 BLAKE2B d74f7daa52b1e950f12ee45c46d4e0f92b9e177a8e67156adb5961c44f1e7cf78fb25d5b1615cb446b5855f0c2af6fe17320b16a85e2e9f6cc0860f66bb853cd SHA512 ec9c9415c070da39251862dc4bf07d75c42d1c1e0ad76075a045b34966148aa423a596886ca6ae7d6a8c5621ab9f8dbeae0478b692b4a361d6aaf10b2f8ebafa DIST wsjtx-3.0.0_improved_PLUS_250924_qt6.tgz 35003895 BLAKE2B 6649bdac6cc390e966398a37d5854009d8b540ce951557c186803cbd81c90a0d5428f816593b22b44e73ea82f8dab6c2b91ff6581ddac87f6f90d43ec852e5db SHA512 70d34e9d6b03549d7445689709766fb2e1be50a56b3a54c405e3d489a93a72fd8038ad2d7e02ddfbca6a9794fbd3a8c3e3c914fd0bb4a5de02a12cc1311fe309 diff --git a/media-radio/wsjtx_improved/files/wsjtx-2.8.0-qt691.patch b/media-radio/wsjtx_improved/files/wsjtx-2.8.0-qt691.patch deleted file mode 100644 index 97e7d207834c..000000000000 --- a/media-radio/wsjtx_improved/files/wsjtx-2.8.0-qt691.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/widgets/logqso.cpp b/widgets/logqso.cpp -index 3f81b4d..eed2835 100755 ---- a/widgets/logqso.cpp -+++ b/widgets/logqso.cpp -@@ -176,7 +176,7 @@ void LogQSO::loadSettings () - QString comments_location; // load the content of comments.txt file to the comments combo box
- QDir dataPath {QStandardPaths::writableLocation (QStandardPaths::AppDataLocation)};
- comments_location = dataPath.exists("comments.txt") ? dataPath.absoluteFilePath("comments.txt") : m_config->data_dir ().absoluteFilePath ("comments.txt");
-- QFile file2 = {comments_location};
-+ QFile file2 {comments_location};
- QTextStream stream2(&file2);
- if(file2.open (QIODevice::ReadOnly | QIODevice::Text)) {
- while (!stream2.atEnd()) {
-@@ -538,7 +538,7 @@ void LogQSO::on_addButton_clicked() - if (m_comments_temp != "") {
- QString comments_location = m_config->writeable_data_dir().absoluteFilePath("comments.txt");
- if(QFileInfo::exists(m_config->writeable_data_dir().absoluteFilePath("comments.txt"))) {
-- QFile file2 = {comments_location};
-+ QFile file2 {comments_location};
- if (file2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) {
- QTextStream out(&file2);
- out << m_comments_temp // append new line to comments.txt
-@@ -555,7 +555,7 @@ void LogQSO::on_addButton_clicked() - "\"comments.txt\" from your log directory");
- }
- } else {
-- QFile file2 = {comments_location};
-+ QFile file2 {comments_location};
- if (file2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append)) {
- QTextStream out(&file2);
- out << ("\n" + m_comments_temp) // create file "comments.txt" and add a blank line
-@@ -573,7 +573,7 @@ void LogQSO::on_addButton_clicked() - }
- }
- ui->comments->clear(); // clear the comments combo box and reload updated content
-- QFile file2 = {comments_location};
-+ QFile file2 {comments_location};
- QTextStream stream2(&file2);
- if(file2.open (QIODevice::ReadOnly | QIODevice::Text)) {
- while (!stream2.atEnd()) {
diff --git a/media-radio/wsjtx_improved/files/wsjtx-fix-sound-dir.patch b/media-radio/wsjtx_improved/files/wsjtx-fix-sound-dir.patch deleted file mode 100644 index a51ec5431331..000000000000 --- a/media-radio/wsjtx_improved/files/wsjtx-fix-sound-dir.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4d37ad..aaf771e 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1733,7 +1733,7 @@ install (DIRECTORY - - install (DIRECTORY - ${PROJECT_SOURCE_DIR}/sounds -- DESTINATION ${CMAKE_INSTALL_BINDIR} -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME} - #COMPONENT runtime - ) - -diff --git a/widgets/displaytext.cpp b/widgets/displaytext.cpp -index 371e7b6..66d6b23 100755 ---- a/widgets/displaytext.cpp -+++ b/widgets/displaytext.cpp -@@ -917,7 +917,7 @@ void DisplayText::AudioAlerts() - {
- if(m_config->alert_Enabled()) {
- QAudioDevice info(QMediaDevices::defaultAudioOutput());
-- QString binPath = QCoreApplication::applicationDirPath();
-+ QString binPath = "/usr/share/wsjtx";
- QAudioFormat format;
- format.setSampleRate(48000);
- format.setChannelCount(1);
-diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp -index 04aadde..8ba7b4c 100755 ---- a/widgets/mainwindow.cpp -+++ b/widgets/mainwindow.cpp -@@ -2963,7 +2963,7 @@ void MainWindow::fastSink(qint64 frames) - QTimer::singleShot (100, [=] { // UR delete for versions without alerts
- if ((m_config.alert_Enabled()) && (m_config.alert_DXcall()) && (play_DXcall) && (m_hisCall!="")) {
- QAudioDevice info(QMediaDevices::defaultAudioOutput());
-- QString binPath = QCoreApplication::applicationDirPath();
-+ QString binPath = "/usr/share/wsjtx";
- QAudioFormat format;
- format.setSampleRate(48000);
- format.setChannelCount(1);
-@@ -6475,7 +6475,7 @@ void MainWindow::readFromStdout() //readFromStdout - QTimer::singleShot (100, [=] { // UR delete for versions without alerts
- if (m_config.alert_Enabled() && m_config.alert_DXcall() && play_DXcall && m_hisCall!="") {
- QAudioDevice info(QMediaDevices::defaultAudioOutput());
-- QString binPath = QCoreApplication::applicationDirPath();
-+ QString binPath = "/usr/share/wsjtx";
- QAudioFormat format;
- format.setSampleRate(48000);
- format.setChannelCount(1);
-@@ -9549,7 +9549,7 @@ void MainWindow::mousePressEvent(QMouseEvent *event) // mouse press events - // Testing the default audio device
- if (ui->pbBandHopping->hasFocus() && event->button() & Qt::RightButton) {
- QAudioDevice info(QMediaDevices::defaultAudioOutput());
-- QString binPath = QCoreApplication::applicationDirPath();
-+ QString binPath = "/usr/share/wsjtx";
- QAudioFormat format;
- format.setSampleRate(48000);
- format.setChannelCount(1);
-@@ -15768,7 +15768,7 @@ void MainWindow::remove_old_files(const QString &directoryPath, int daysOld) - void MainWindow::alertQSYmessage ()
- {
- QAudioDevice info(QMediaDevices::defaultAudioOutput());
-- QString binPath = QCoreApplication::applicationDirPath();
-+ QString binPath = "/usr/share/wsjtx";
- QAudioFormat format;
- format.setSampleRate(48000);
- format.setChannelCount(1);
diff --git a/media-radio/wsjtx_improved/wsjtx_improved-2.8.0-r2.ebuild b/media-radio/wsjtx_improved/wsjtx_improved-2.8.0-r2.ebuild deleted file mode 100644 index 0349b3729cd4..000000000000 --- a/media-radio/wsjtx_improved/wsjtx_improved-2.8.0-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake edos2unix flag-o-matic - -DESCRIPTION="Weak signal ham radio communication with improvements" -HOMEPAGE="https://wsjt-x-improved.sourceforge.io/" -SRC_URI="https://downloads.sourceforge.net/wsjt-x-improved/wsjtx-${PV}_improved_PLUS_250501_qt6.tgz" - -S=${WORKDIR}/wsjtx - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="doc" - -RDEPEND=" - !media-radio/wsjtx - dev-libs/boost:=[nls,python] - dev-qt/qtbase:6[concurrent,gui,network,sql,sqlite,widgets] - dev-qt/qtmultimedia:6 - dev-qt/qtserialport:6 - dev-qt/qtwebsockets:6 - virtual/libusb:1 - >=media-libs/hamlib-4.0:= - sci-libs/fftw:3.0=[threads,fortran] - virtual/fortran - app-text/asciidoc - doc? ( dev-ruby/asciidoctor )" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/qttools[linguist]" - -PATCHES=( - "${FILESDIR}/wsjtx-2.2.0-werror.patch" - "${FILESDIR}/wsjtx-2.3.0-drop-docs.patch" - "${FILESDIR}/wsjtx-clang.patch" - "${FILESDIR}/wsjtx-fix-sound-dir.patch" - "${FILESDIR}/wsjtx-2.8.0-qt691.patch" - "${FILESDIR}/wsjtx-2.8.0-qt692-audio.patch" -) - -DOCS=( AUTHORS BUGS NEWS README THANKS ) - -src_unpack() { - unpack ${A} - unpack "${WORKDIR}/wsjtx-2.8.0/src/wsjtx.tgz" -} - -src_prepare() { - edos2unix "${S}/message_aggregator.desktop" - edos2unix "${S}/wsjtx.desktop" - edos2unix "${S}/CMakeLists.txt" - sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/# COMMAND/" \ - manpages/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - # fails to compile 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,com}-wsjtx || die - rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die -} diff --git a/media-radio/wsjtx_improved/wsjtx_improved-3.0.0.ebuild b/media-radio/wsjtx_improved/wsjtx_improved-3.0.0.ebuild deleted file mode 100644 index c7042b317bf0..000000000000 --- a/media-radio/wsjtx_improved/wsjtx_improved-3.0.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake edos2unix flag-o-matic - -DESCRIPTION="Weak signal ham radio communication with improvements" -HOMEPAGE="https://wsjt-x-improved.sourceforge.io/" -SRC_URI="https://downloads.sourceforge.net/wsjt-x-improved/wsjtx-${PV}_improved_PLUS_250924_qt6.tgz" - -S=${WORKDIR}/wsjtx - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND=" - !media-radio/wsjtx - dev-libs/boost:=[nls,python] - dev-qt/qtbase:6[concurrent,gui,network,sql,sqlite,widgets] - dev-qt/qtmultimedia:6 - dev-qt/qtserialport:6 - dev-qt/qtwebsockets:6 - virtual/libusb:1 - >=media-libs/hamlib-4.0:= - sci-libs/fftw:3.0=[threads,fortran] - virtual/fortran - app-text/asciidoc - doc? ( dev-ruby/asciidoctor )" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/qttools[linguist]" - -PATCHES=( - "${FILESDIR}/wsjtx-2.2.0-werror.patch" - "${FILESDIR}/wsjtx-2.3.0-drop-docs.patch" - "${FILESDIR}/wsjtx-clang.patch" - "${FILESDIR}/wsjtx-3.0.0-fix-sound-dir.patch" - "${FILESDIR}/wsjtx-2.8.0-qt692-audio.patch" -) - -DOCS=( AUTHORS BUGS NEWS README THANKS ) - -src_unpack() { - unpack ${A} - unpack "${WORKDIR}/wsjtx-3.0.0/src/wsjtx.tgz" -} - -src_prepare() { - edos2unix "${S}/message_aggregator.desktop" - edos2unix "${S}/wsjtx.desktop" - edos2unix "${S}/CMakeLists.txt" - sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/# COMMAND/" \ - manpages/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - # fails to compile 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,com}-wsjtx || die - rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die -} diff --git a/net-wireless/inspectrum/Manifest b/net-wireless/inspectrum/Manifest index c47aec11a5f2..776dc57b9a3f 100644 --- a/net-wireless/inspectrum/Manifest +++ b/net-wireless/inspectrum/Manifest @@ -1,2 +1 @@ -DIST inspectrum-0.3.1_p20251130.tar.gz 112815 BLAKE2B 91d1099b7246c44041cac5cc8a574553162e5fe2024e04b10bd98125b9ce87bc4d16c23fce0d6442300d9308c3cab24538da136b6c5401c6402b28cd98219e4c SHA512 dc1df1ff18a0b9879a39fe9a07b1da8a7a2f4cad616ea0a7881b11a6c81c5fef4efc6ce54f438468e7628672099ea8dd9c4a1a3ea22b53a682f11876602eb282 DIST inspectrum-0.4.0.tar.gz 112782 BLAKE2B d3f44a06f596c8b6df098f42fc91f20068cac3d1349cdc80c6326a2d19335c85eb2de3c97d0aba89cd4bfc8f96943a894eafe549ca7e6a682333a653f51b65a4 SHA512 fba27cd3ae655739fecfc3e10983e012173e781e1fe4d57644dafd3f298116e96a0a13a72cf857e3b6ded400d58e986436ebfe7b6aff45a28c89a00ad6f5ae66 diff --git a/net-wireless/inspectrum/inspectrum-0.3.1_p20251130.ebuild b/net-wireless/inspectrum/inspectrum-0.3.1_p20251130.ebuild deleted file mode 100644 index b296a77deb12..000000000000 --- a/net-wireless/inspectrum/inspectrum-0.3.1_p20251130.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Tool for analysing captured signals from software-defined radio receivers" -HOMEPAGE="https://github.com/miek/inspectrum" - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/miek/inspectrum.git" - inherit git-r3 -else - # snapshot for Qt6 support - COMMIT="82f5779ee3b82fc2b4d6d1360d9106392a71d4ab" - SRC_URI="https://github.com/miek/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND=" - dev-qt/qtbase:6[concurrent,gui,widgets] - net-libs/liquid-dsp - sci-libs/fftw:3.0=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - sed -i -e "s/3.5/3.10/" CMakeLists.txt || die - cmake_src_prepare -} diff --git a/sci-ml/caffe2/caffe2-2.9.1-r1.ebuild b/sci-ml/caffe2/caffe2-2.9.1-r1.ebuild index 129aa0721e75..92cced9c2575 100644 --- a/sci-ml/caffe2/caffe2-2.9.1-r1.ebuild +++ b/sci-ml/caffe2/caffe2-2.9.1-r1.ebuild @@ -163,6 +163,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.0-rocm-minus-flash.patch "${FILESDIR}"/${PN}-2.9.0-cmake.patch "${FILESDIR}"/${PN}-2.9.0-rocm-distributed-link.patch + "${FILESDIR}"/${P}-CCCL31.patch ) src_prepare() { diff --git a/sci-ml/caffe2/files/caffe2-2.9.1-CCCL31.patch b/sci-ml/caffe2/files/caffe2-2.9.1-CCCL31.patch new file mode 100644 index 000000000000..08c1925b7a13 --- /dev/null +++ b/sci-ml/caffe2/files/caffe2-2.9.1-CCCL31.patch @@ -0,0 +1,34 @@ +From a20afb61007a94f5c28294e9ae20043657152ef6 Mon Sep 17 00:00:00 2001 +From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com> +Date: Wed, 15 Oct 2025 01:40:49 +0000 +Subject: [PATCH] Allow at::native::offset_t to be offset using `operator+=` + (#164570) + +This will be required by CCCL 3.1. +Pull Request resolved: https://github.com/pytorch/pytorch/pull/164570 +Approved by: https://github.com/Skylion007, https://github.com/eqy +--- + aten/src/ATen/native/cuda/SortStable.cu | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/aten/src/ATen/native/cuda/SortStable.cu b/aten/src/ATen/native/cuda/SortStable.cu +index 4d956616371de..8117eeeec558e 100644 +--- a/aten/src/ATen/native/cuda/SortStable.cu ++++ b/aten/src/ATen/native/cuda/SortStable.cu +@@ -21,9 +21,15 @@ namespace { + struct offset_t { + int stride; + int begin; +- __device__ int operator[](int i) { ++ __device__ int operator[](int i) const { + return stride * (begin + i); + } ++#if CCCL_VERSION >= 3001000 ++ __device__ offset_t& operator+=(int i) { ++ begin += i; ++ return *this; ++ } ++#endif + }; + // Segmented sort by full sort algorithm:. + // Say we are sorting a (2, 3) tensor. We have in flattened form: |
