* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/files/, sci-mathematics/rkward/
@ 2019-10-21 12:28 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2019-10-21 12:28 UTC (permalink / raw
To: gentoo-commits
commit: e0cecc84ef03cbd65782dfee4f5caec81ced0f1e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 12:26:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 12:28:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0cecc84
sci-mathematics/rkward: Fix build with Qt 5.13 (?)
Reported-by: Helmut Jarausch <jarausch <AT> igpm.rwth-aachen.de>
Closes: https://bugs.gentoo.org/698198
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../rkward/files/rkward-0.7.0b-qt-5.13-1.patch | 23 +++++++++++++++
.../rkward/files/rkward-0.7.0b-qt-5.13-2.patch | 23 +++++++++++++++
.../rkward/files/rkward-0.7.0b-qt-5.13-3.patch | 33 ++++++++++++++++++++++
sci-mathematics/rkward/rkward-0.7.0b.ebuild | 2 ++
4 files changed, 81 insertions(+)
diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch
new file mode 100644
index 00000000000..af45406a417
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch
@@ -0,0 +1,23 @@
+From b51802243f478d1d89120edc343bec7eb5ef8285 Mon Sep 17 00:00:00 2001
+From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
+Date: Wed, 24 Jul 2019 19:36:51 +0200
+Subject: Fix compilation
+
+---
+ rkward/windows/rkworkplace.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
+index 0dbf36a..94b3378 100644
+--- a/rkward/windows/rkworkplace.cpp
++++ b/rkward/windows/rkworkplace.cpp
+@@ -31,6 +31,7 @@
+ #include <QDir>
+ #include <QApplication>
+ #include <QMimeDatabase>
++#include <QLayout>
+
+ #include "detachedwindowcontainer.h"
+ #include "rkcommandeditorwindow.h"
+--
+cgit v1.1
diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch
new file mode 100644
index 00000000000..bbb07c1e8fc
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch
@@ -0,0 +1,23 @@
+From d713ce77e077b426d9d81a22f558f71dfa832615 Mon Sep 17 00:00:00 2001
+From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
+Date: Fri, 26 Jul 2019 22:32:42 +0200
+Subject: Another missing include file
+
+---
+ rkward/windows/rktoolwindowbar.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rkward/windows/rktoolwindowbar.cpp b/rkward/windows/rktoolwindowbar.cpp
+index a8f5cbd..03c405e 100644
+--- a/rkward/windows/rktoolwindowbar.cpp
++++ b/rkward/windows/rktoolwindowbar.cpp
+@@ -27,6 +27,7 @@
+
+ #include <QSplitter>
+ #include <QContextMenuEvent>
++#include <QHBoxLayout>
+
+ #include "rkworkplace.h"
+ #include "rkworkplaceview.h"
+--
+cgit v1.1
diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch
new file mode 100644
index 00000000000..e907f2877ce
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch
@@ -0,0 +1,33 @@
+From 394128e8d58b58bbd7cef9a4523ae346f94cd456 Mon Sep 17 00:00:00 2001
+From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
+Date: Sat, 27 Jul 2019 11:12:34 +0200
+Subject: Another include file fix
+
+---
+ rkward/rkward.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
+index 1a4a7e3..bb2f69c 100644
+--- a/rkward/rkward.cpp
++++ b/rkward/rkward.cpp
+@@ -26,6 +26,9 @@
+ #include <QMenuBar>
+ #include <QStatusBar>
+ #include <QInputDialog>
++#include <QVBoxLayout>
++#include <QHBoxLayout>
++#include <QIcon>
+
+ // include files for KDE
+ #include <kmessagebox.h>
+@@ -41,7 +44,6 @@
+ #include <krecentfilesaction.h>
+ #include <ktoolbar.h>
+ #include <kactionmenu.h>
+-#include <QIcon>
+ #include <KSharedConfig>
+ #include <KConfigGroup>
+
+--
+cgit v1.1
diff --git a/sci-mathematics/rkward/rkward-0.7.0b.ebuild b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
index 4c651729fa1..ea892c6968a 100644
--- a/sci-mathematics/rkward/rkward-0.7.0b.ebuild
+++ b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
@@ -48,3 +48,5 @@ RDEPEND="${DEPEND}
virtual/libintl
!sci-mathematics/rkward:4
"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.13-{1,2,3}.patch)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/files/, sci-mathematics/rkward/
@ 2025-04-24 21:52 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2025-04-24 21:52 UTC (permalink / raw
To: gentoo-commits
commit: fdb37fdac033080c8429de66220cca6ec465ab20
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 21:52:44 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 21:52:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb37fda
sci-mathematics/rkward: drop 0.8.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-mathematics/rkward/Manifest | 1 -
...rkward-0.8.0-unbundle-kdsingleapplication.patch | 57 --------------------
sci-mathematics/rkward/rkward-0.8.0.ebuild | 62 ----------------------
3 files changed, 120 deletions(-)
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 4dd8789ad41b..9dbfefdd1f90 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,2 +1 @@
-DIST rkward-0.8.0.tar.gz 8614382 BLAKE2B e44dd1c9ae5df02160ac47a14409a2fbf88dbc085369af22e64c80a59740f25305129e166402e944f85978cabde4d273a08f7f473eb46fdb31145ff8d886f46a SHA512 07070189e05fe1bdd65372fb3f90c027c693b93e3dc80a17bc30f90c983ca0bc777f30ea81ef99343ebdc90f463f47721d03f26d116145567c8ef6ca4ffdff27
DIST rkward-0.8.1.tar.gz 9054303 BLAKE2B fa0519abd9d77161691371ab43d58bd202c7fdacec8596711b399a32634d977040a4f102e704eedac7c5e4a83ce997a96687634599f33082ab55d0c2410ef99c SHA512 36e55ac086f57707f8ddd509dc62d8fa5ef549eece430281b47b680e72bf7b14a211eab8fcbcd6c83d58ba8b28a01674844354defe7c6f8026b85548f3398867
diff --git a/sci-mathematics/rkward/files/rkward-0.8.0-unbundle-kdsingleapplication.patch b/sci-mathematics/rkward/files/rkward-0.8.0-unbundle-kdsingleapplication.patch
deleted file mode 100644
index 0340987c517b..000000000000
--- a/sci-mathematics/rkward/files/rkward-0.8.0-unbundle-kdsingleapplication.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 997c8a7280fe0f99a29465f67b56fd001cdac4e1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 22 Jul 2024 22:20:26 +0200
-Subject: [PATCH] Make it possible to build against system kdsingleapplication
-
-Bundling must be avoided wherever possible.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 10 +++++++++-
- rkward/main.cpp | 2 +-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b9833164..1af6cd172 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,15 @@ FIND_PACKAGE(Qt6 6.6 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Qml Pri
- FIND_PACKAGE(KF6 6.0.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem Archive BreezeIcons OPTIONAL_COMPONENTS Crash)
- FIND_PACKAGE(Gettext REQUIRED)
-
-+FIND_PACKAGE(KDSingleApplication-qt6 1.1.0 QUIET)
-+if(KDSingleApplication-qt6_FOUND)
-+ message(STATUS "Using system KDSingleApplication")
-+else()
-+ message(STATUS "Using bundled KDSingleApplication")
-+ add_subdirectory(3rdparty/KDSingleApplication)
-+ add_definitions(-DKDSINGLEAPPLICATION_STATIC_BUILD)
-+endif()
-+
- IF(FORCE_PRETTY_MAKEFILE)
- SET(CMAKE_VERBOSE_MAKEFILE OFF)
- ENDIF(FORCE_PRETTY_MAKEFILE)
-@@ -37,7 +46,6 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) # TODO remove to compley to KDECompi
- #uncomment the line below to save ~250-350kB in object size
- #ADD_DEFINITIONS(-DRKWARD_NO_TRACE)
-
--ADD_SUBDIRECTORY(3rdparty/KDSingleApplication)
- ADD_SUBDIRECTORY(rkward)
- ADD_SUBDIRECTORY(doc)
- ADD_SUBDIRECTORY(tests)
-diff --git a/rkward/main.cpp b/rkward/main.cpp
-index 2804e99d8..df959ba82 100644
---- a/rkward/main.cpp
-+++ b/rkward/main.cpp
-@@ -72,7 +72,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
- #include "rbackend/rksessionvars.h"
- #include "windows/rkdebugmessagewindow.h"
- #include "misc/rkcommonfunctions.h"
--#include "../3rdparty/KDSingleApplication/kdsingleapplication.h"
-+#include "kdsingleapplication.h"
- #include "misc/rkcommandlineargs.h"
-
- #ifdef Q_OS_WIN
---
-GitLab
-
diff --git a/sci-mathematics/rkward/rkward-0.8.0.ebuild b/sci-mathematics/rkward/rkward-0.8.0.ebuild
deleted file mode 100644
index a6333ecdd210..000000000000
--- a/sci-mathematics/rkward/rkward-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="IDE for the R-project"
-HOMEPAGE="https://rkward.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~amd64-linux"
-fi
-
-LICENSE="GPL-2+ LGPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-lang/R
- dev-libs/kdsingleapplication[qt6(+)]
- >=dev-qt/qt5compat-${QTMIN}:6
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
- >=dev-qt/qtdeclarative-${QTMIN}:6
- >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
- >=kde-frameworks/breeze-icons-${KFMIN}:6
- >=kde-frameworks/karchive-${KFMIN}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kjobwidgets-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/kparts-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/ktexteditor-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kwindowsystem-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5
-"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}/${P}-unbundle-kdsingleapplication.patch" )
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "kate plugins support" "kde-apps/kate-addons:6"
- optfeature "prendering (or previewing) R markdown (.Rmd) files" "app-text/pandoc"
- optfeature "managing citations while writing articles" "app-text/kbibtex"
- fi
- ecm_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-04-24 21:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-21 12:28 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/files/, sci-mathematics/rkward/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-04-24 21:52 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox