summaryrefslogtreecommitdiff
path: root/sci-calculators
diff options
context:
space:
mode:
Diffstat (limited to 'sci-calculators')
-rw-r--r--sci-calculators/speedcrunch/Manifest2
-rw-r--r--sci-calculators/speedcrunch/files/speedcrunch-0.12.0-appdata.patch26
-rw-r--r--sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qhash.patch37
-rw-r--r--sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qsignalmapper.patch30
-rw-r--r--sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild40
-rw-r--r--sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild34
6 files changed, 102 insertions, 67 deletions
diff --git a/sci-calculators/speedcrunch/Manifest b/sci-calculators/speedcrunch/Manifest
index a7a05bd77518..9cf7548606a5 100644
--- a/sci-calculators/speedcrunch/Manifest
+++ b/sci-calculators/speedcrunch/Manifest
@@ -1 +1 @@
-DIST speedcrunch-0.12.0.tar.gz 3667420 BLAKE2B d983c22cbed9f3496bf7cadf670db3e7af4461a37e5fe151094ecaf6077cabffea84e4530c9b18145a220f09336d70567c96509b99c3b6a18f967aa97051d66e SHA512 9f93936311e227ed0aff374adae408f212e6d63174154931ecb19a31f1a6f360b9548989bbdc5988d03a7600f2d3e466ef18bf5f071002b99f22b22e773143eb
+DIST speedcrunch-0.12.0_p20241202-3c1b4c18ccb2.tar.bz2 3206297 BLAKE2B 7364d154644a567696ec382a7245ab558272626e528ebcc16ba7dc29bbdeb3dfb5e78849100575615fd34d6982a14c44eb9f9fae37675a30a3ed127ddc5c67ff SHA512 e3691bfabbdc5d913353281db307a38d18a6d49cdee26f46b95de2e70daf638974b2654de4faedfe64c0b92977390784d235f2b888afbbbf30de062b1864efb3
diff --git a/sci-calculators/speedcrunch/files/speedcrunch-0.12.0-appdata.patch b/sci-calculators/speedcrunch/files/speedcrunch-0.12.0-appdata.patch
deleted file mode 100644
index cf312944f907..000000000000
--- a/sci-calculators/speedcrunch/files/speedcrunch-0.12.0-appdata.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3caeaa7eec01f64e769351355dff0fedd95a25fd Mon Sep 17 00:00:00 2001
-From: Felix Krull <f_krull@gmx.de>
-Date: Mon, 7 Aug 2017 16:19:22 +0200
-Subject: [PATCH] Install appdata file into new metadata path.
-
-*asturm 2021-02-28: Backported to 0.12.0.
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fa32ac..fb333f4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,7 +113,7 @@
- if(NOT WIN32)
- set(SHAREDIR "share/")
- set(MENUDIR "${SHAREDIR}/applications/")
-- set(APPDATADIR "${SHAREDIR}/appdata/")
-+ set(APPDATADIR "${SHAREDIR}/metainfo/")
- set(ICONDIR "${SHAREDIR}/pixmaps/")
- set(BINDIR "bin")
- else(NOT WIN32)
---
-2.10.5
diff --git a/sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qhash.patch b/sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qhash.patch
new file mode 100644
index 000000000000..3eba5557417e
--- /dev/null
+++ b/sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qhash.patch
@@ -0,0 +1,37 @@
+Source: https://bitbucket.org/heldercorreia/speedcrunch/pull-requests/140
+
+From a52be1f46d86d2af8cf44633f06137d976556fe8 Mon Sep 17 00:00:00 2001
+From: Ronald Wright <logiconcepts819@gmail.com>
+Date: Sat, 7 Jun 2025 18:33:09 -0500
+Subject: [PATCH] Fix additional Qt6 build errors
+
+---
+ src/math/rational.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/math/rational.h b/src/math/rational.h
+index dfda4438..bbef00a3 100644
+--- a/src/math/rational.h
++++ b/src/math/rational.h
+@@ -19,6 +19,8 @@
+ #ifndef RATIONAL_H
+ #define RATIONAL_H
+
++#include <QHash>
++
+ class HNumber;
+ class QString;
+
+@@ -64,6 +66,10 @@ public:
+ QString toString() const;
+ HNumber toHNumber( )const;
+ double toDouble() const;
++
++ friend size_t qHash(const Rational &r, size_t seed = 0) {
++ return qHashMulti(seed, r.m_num, r.m_denom, r.m_valid);
++ }
+ };
+
+ #endif // RATIONAL_H
+--
+2.51.0
diff --git a/sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qsignalmapper.patch b/sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qsignalmapper.patch
new file mode 100644
index 000000000000..aba91b85928d
--- /dev/null
+++ b/sci-calculators/speedcrunch/files/speedcrunch-0.12.0_p20241202-qsignalmapper.patch
@@ -0,0 +1,30 @@
+Source: https://bitbucket.org/heldercorreia/speedcrunch/pull-requests/127
+
+From 579fe071c6229f2d26571b4cbc88afc46ad20943 Mon Sep 17 00:00:00 2001
+From: Oktay Imanzade <imanov.computer@gmail.com>
+Date: Mon, 18 Mar 2024 17:08:15 +0000
+Subject: [PATCH] Fix keypad for Qt6
+
+---
+ src/gui/keypad.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gui/keypad.cpp b/src/gui/keypad.cpp
+index d206c76c..b252c85d 100644
+--- a/src/gui/keypad.cpp
++++ b/src/gui/keypad.cpp
+@@ -82,7 +82,11 @@ Keypad::Keypad(QWidget* parent)
+ setButtonTooltips();
+ disableButtonFocus();
+ setLayoutDirection(Qt::LeftToRight);
++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
++ connect(&mapper, SIGNAL(mappedInt(int)), SLOT(emitButtonPressed(int)));
++#else
+ connect(&mapper, SIGNAL(mapped(int)), SLOT(emitButtonPressed(int)));
++#endif
+ }
+
+ void Keypad::handleRadixCharacterChange()
+--
+2.51.0
+
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
deleted file mode 100644
index bc2e41ba3485..000000000000
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="Fast and usable calculator for power users"
-HOMEPAGE="https://speedcrunch.org/"
-SRC_URI="https://bitbucket.org/heldercorreia/${PN}/get/release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/heldercorreia-speedcrunch-ea93b21f9498/src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-appdata.patch" )
-
-src_install() {
- use doc && local HTML_DOCS=( ../doc/build_html_embedded/. )
- cmake_src_install
- doicon -s scalable ../gfx/speedcrunch.svg
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild
new file mode 100644
index 000000000000..29ddfe9faba7
--- /dev/null
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.0_p20241202.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=3c1b4c18ccb275eb2891f9d8ff36a9205c0f566b
+inherit cmake desktop xdg
+
+DESCRIPTION="Fast and usable calculator for power users"
+HOMEPAGE="https://heldercorreia.bitbucket.io/speedcrunch/"
+SRC_URI="https://bitbucket.org/heldercorreia/speedcrunch/get/${COMMIT}.tar.bz2 -> ${P}-${COMMIT:0:12}.tar.bz2"
+S="${WORKDIR}/heldercorreia-${PN}-${COMMIT:0:12}"
+CMAKE_USE_DIR="${S}/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+ dev-qt/qtbase:6[gui,widgets]
+ dev-qt/qttools:6[assistant]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-qhash.patch"
+ "${FILESDIR}/${P}-qsignalmapper.patch"
+)
+
+src_install() {
+ local HTML_DOCS=( "${S}"/doc/build_html_embedded/. )
+ cmake_src_install
+ doicon -s scalable gfx/speedcrunch.svg
+}