[neon/extras/ktechlab/Neon/release] debian: update the patches
Pino Toscano
null at kde.org
Mon Sep 2 16:55:54 BST 2024
Git commit 8952fb8445e8b09e9c343563a8f524ce37af5837 by Pino Toscano.
Committed on 31/03/2023 at 06:14.
Pushed by jriddell into branch 'Neon/release'.
update the patches
- upstream_process-chain-keep-temporary-files-live-longer.patch: drop,
backported from upstream
- upstream_Fix-selecting-files-as-properties.patch: drop, backported
from upstream
- upstream_cmake-build-test_ktechlab-only-if-testing-is-enabled.patch:
drop, backported from upstream
M +7 -0 debian/changelog
D +0 -3 debian/patches/series
D +0 -24 debian/patches/upstream_Fix-selecting-files-as-properties.patch
D +0 -51 debian/patches/upstream_cmake-build-test_ktechlab-only-if-testing-is-enabled.patch
D +0 -37 debian/patches/upstream_process-chain-keep-temporary-files-live-longer.patch
https://invent.kde.org/neon/extras/ktechlab/-/commit/8952fb8445e8b09e9c343563a8f524ce37af5837
diff --git a/debian/changelog b/debian/changelog
index fa5b3b2..ca3f160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ ktechlab (0.51.0-0r1) UNRELEASED; urgency=medium
2.
* Set upstream metadata fields: Bug-Database, Bug-Submit.
* Update standards version to 4.6.2, no changes needed.
+ * Update the patches:
+ - upstream_process-chain-keep-temporary-files-live-longer.patch: drop,
+ backported from upstream
+ - upstream_Fix-selecting-files-as-properties.patch: drop, backported from
+ upstream
+ - upstream_cmake-build-test_ktechlab-only-if-testing-is-enabled.patch:
+ drop, backported from upstream
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Fri, 31 Mar 2023 08:09:46 +0200
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index db58132..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream_process-chain-keep-temporary-files-live-longer.patch
-upstream_Fix-selecting-files-as-properties.patch
-upstream_cmake-build-test_ktechlab-only-if-testing-is-enabled.patch
diff --git a/debian/patches/upstream_Fix-selecting-files-as-properties.patch b/debian/patches/upstream_Fix-selecting-files-as-properties.patch
deleted file mode 100644
index dd64fea..0000000
--- a/debian/patches/upstream_Fix-selecting-files-as-properties.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e303b80756770069526ef16e0a81d343c2e9ca13 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Fri, 30 Oct 2020 17:29:48 +0100
-Subject: [PATCH] Fix selecting files as properties
-
-When the file selector is cancelled the returned path is empty, so fix
-the check.
-
-Fixes commit d1fb957dd215e57e0232ff6061b2a5c37b0f32aa
----
- src/gui/itemeditor/propertyeditorfile.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/gui/itemeditor/propertyeditorfile.cpp
-+++ b/src/gui/itemeditor/propertyeditorfile.cpp
-@@ -52,7 +52,7 @@ void PropertyEditorFile::selectFile()
- {
- const QString filePath = QFileDialog::getOpenFileName(this, i18n("Choose File"), QString(), m_property->filter());
- qDebug() << Q_FUNC_INFO << "got QString: " << filePath;
-- if (!filePath.isEmpty()) {
-+ if (filePath.isEmpty()) {
- qDebug() << Q_FUNC_INFO << "url is not valid, not setting it";
- return;
- }
diff --git a/debian/patches/upstream_cmake-build-test_ktechlab-only-if-testing-is-enabled.patch b/debian/patches/upstream_cmake-build-test_ktechlab-only-if-testing-is-enabled.patch
deleted file mode 100644
index a5f5683..0000000
--- a/debian/patches/upstream_cmake-build-test_ktechlab-only-if-testing-is-enabled.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f3a754ddcbc8a086ca48920bd33e96082cef699c Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Mon, 2 Nov 2020 13:10:45 +0100
-Subject: [PATCH] cmake: build test_ktechlab only if testing is enabled
-
-The test_ktechlab static library basically builds almost all the
-ktechlab sources, resulting in a "double build" in case testing is
-enabled. Considering that is used only by test binaries built only
-when testing is enabled, then limit its build accordingly.
----
- src/CMakeLists.txt | 28 ++++++++++++++++------------
- 1 file changed, 16 insertions(+), 12 deletions(-)
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -379,19 +379,23 @@ install(TARGETS ktechlab ${INSTALL_TARGE
-
- # for helping testing
-
--add_library(test_ktechlab STATIC ${ktechlab_SRCS})
-+if(BUILD_TESTING)
-
--target_link_libraries(test_ktechlab
-- KF5::TextEditor
-- KF5::IconThemes
-- KF5::Parts
-- KF5::KHtml
-- KF5::WidgetsAddons
-- KF5::WindowSystem
--
-- Qt5::Widgets
-- Qt5::PrintSupport
--)
-+ add_library(test_ktechlab STATIC ${ktechlab_SRCS})
-+
-+ target_link_libraries(test_ktechlab
-+ KF5::TextEditor
-+ KF5::IconThemes
-+ KF5::Parts
-+ KF5::KHtml
-+ KF5::WidgetsAddons
-+ KF5::WindowSystem
-+
-+ Qt5::Widgets
-+ Qt5::PrintSupport
-+ )
-+
-+endif()
-
- ########### install files ###############
-
diff --git a/debian/patches/upstream_process-chain-keep-temporary-files-live-longer.patch b/debian/patches/upstream_process-chain-keep-temporary-files-live-longer.patch
deleted file mode 100644
index 681694d..0000000
--- a/debian/patches/upstream_process-chain-keep-temporary-files-live-longer.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a24dc9737462662390c9b0f37ce66774283df69c Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Thu, 29 Oct 2020 23:39:00 +0100
-Subject: [PATCH] process chain: keep temporary files live longer
-
-A QTemporaryFile on the stack is created just to get a temporary file
-name; by default QTemporaryFile autodeletes the temporary file on
-removal, so a step after an indirect one fails because the result of the
-previous step does not exist anymore.
-
-While setting setAutoRemove(false) would solve the problem, it has the
-side effect of leaving the temporary file around. As a better solution,
-create the QTemporaryFile on the heap, parenting it to the processor
-class: as the processor is removed only when the process chain ends,
-the temporary file will be around during the whole chain processing,
-being removed at the end.
----
- src/languages/processchain.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/src/languages/processchain.cpp
-+++ b/src/languages/processchain.cpp
-@@ -103,10 +103,10 @@ void ProcessChain::compile()
- #define INDIRECT_PROCESS( path, processor, extension ) \
- case ProcessOptions::ProcessPath::path: \
- { \
-- QTemporaryFile f(QDir::tempPath() + QLatin1String("/ktechlab_XXXXXX") + QLatin1String(extension)); \
-- f.open(); \
-- f.close(); \
-- m_processOptions.setIntermediaryOutput( f.fileName() ); \
-+ QTemporaryFile *f = new QTemporaryFile(QDir::tempPath() + QLatin1String("/ktechlab_XXXXXX") + QLatin1String(extension), processor()); \
-+ f->open(); \
-+ f->close(); \
-+ m_processOptions.setIntermediaryOutput( f->fileName() ); \
- processor()->processInput(m_processOptions); \
- break; \
- }
More information about the Neon-commits
mailing list