[neon/extras/rkward/Neon/release] debian/patches: remove patches now in release

[Jonathan Riddell]

Git commit 0e9223a071eb5eaab180660e7cca6d0d235f8153 by Jonathan Riddell.
Committed on 02/09/2024 at 15:00.
Pushed by jriddell into branch 'Neon/release'.

remove patches now in release

D  +0    -2    debian/patches/series
D  +0    -38   debian/patches/upstream_Fix-compilation.patch
D  +0    -38   debian/patches/upstream_Fix-not-a-string-literal-compile-error.patch

https://invent.kde.org/neon/extras/rkward/-/commit/0e9223a071eb5eaab180660e7cca6d0d235f8153

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 682de50..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-upstream_Fix-not-a-string-literal-compile-error.patch
-upstream_Fix-compilation.patch
diff --git a/debian/patches/upstream_Fix-compilation.patch b/debian/patches/upstream_Fix-compilation.patch
deleted file mode 100644
index 4b049bb..0000000
--- a/debian/patches/upstream_Fix-compilation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ded0472b90c398adc05a7fed1b6446417789ba58 Mon Sep 17 00:00:00 2001
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>
-Date: Sat, 4 May 2024 22:45:27 +0200
-Subject: [PATCH] Fix compilation
-
----
- rkward/rbackend/rkrbackend.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
-index 3166aa6ec..ed570ba9a 100644
---- a/rkward/rbackend/rkrbackend.cpp
-+++ b/rkward/rbackend/rkrbackend.cpp
-@@ -944,8 +944,8 @@ SEXP doSubstackCall (SEXP _call, SEXP _args) {
- 
- 	// For now, for simplicity, assume args are always strings, although possibly nested in lists
- 	auto ret = RKRBackend::this_pointer->handleRequestWithSubcommands(call, RKRSupport::SEXPToNestedStrings(_args));
--	if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning));  // print warnings, first, as errors will cause a stop
--	if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error));
-+	if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning).constData());  // print warnings, first, as errors will cause a stop
-+	if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error).constData());
- 
- 	return RKRSupport::QVariantToSEXP(ret.ret);
- }
-@@ -956,8 +956,8 @@ SEXP doPlainGenericRequest (SEXP call, SEXP synchronous) {
- 	R_CheckUserInterrupt ();
- 
- 	auto ret = RKRBackend::this_pointer->handlePlainGenericRequest(RKRSupport::SEXPToStringList(call), RKRSupport::SEXPToInt(synchronous));
--	if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning));  // print warnings, first, as errors will cause a stop
--	if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error));
-+	if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning).constData());  // print warnings, first, as errors will cause a stop
-+	if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error).constData());
- 
- 	return RKRSupport::QVariantToSEXP(ret.ret);
- }
--- 
-2.43.0
-
diff --git a/debian/patches/upstream_Fix-not-a-string-literal-compile-error.patch b/debian/patches/upstream_Fix-not-a-string-literal-compile-error.patch
deleted file mode 100644
index f7f4308..0000000
--- a/debian/patches/upstream_Fix-not-a-string-literal-compile-error.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b53d754f18bef786e92f266f576afdbe5fd7d00b Mon Sep 17 00:00:00 2001
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>
-Date: Sat, 4 May 2024 09:31:19 +0200
-Subject: [PATCH] Fix 'not a string literal' compile error
-
----
- rkward/rbackend/rkrbackend.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
-index 01dfa9ab9..3166aa6ec 100644
---- a/rkward/rbackend/rkrbackend.cpp
-+++ b/rkward/rbackend/rkrbackend.cpp
-@@ -944,8 +944,8 @@ SEXP doSubstackCall (SEXP _call, SEXP _args) {
- 
- 	// For now, for simplicity, assume args are always strings, although possibly nested in lists
- 	auto ret = RKRBackend::this_pointer->handleRequestWithSubcommands(call, RKRSupport::SEXPToNestedStrings(_args));
--	if (!ret.warning.isEmpty()) Rf_warning(RKRBackend::fromUtf8(ret.warning));  // print warnings, first, as errors will cause a stop
--	if (!ret.error.isEmpty()) Rf_error(RKRBackend::fromUtf8(ret.error));
-+	if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning));  // print warnings, first, as errors will cause a stop
-+	if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error));
- 
- 	return RKRSupport::QVariantToSEXP(ret.ret);
- }
-@@ -956,8 +956,8 @@ SEXP doPlainGenericRequest (SEXP call, SEXP synchronous) {
- 	R_CheckUserInterrupt ();
- 
- 	auto ret = RKRBackend::this_pointer->handlePlainGenericRequest(RKRSupport::SEXPToStringList(call), RKRSupport::SEXPToInt(synchronous));
--	if (!ret.warning.isEmpty()) Rf_warning(RKRBackend::fromUtf8(ret.warning));  // print warnings, first, as errors will cause a stop
--	if (!ret.error.isEmpty()) Rf_error(RKRBackend::fromUtf8(ret.error));
-+	if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning));  // print warnings, first, as errors will cause a stop
-+	if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error));
- 
- 	return RKRSupport::QVariantToSEXP(ret.ret);
- }
--- 
-2.43.0
-