summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--0001-tests-readWrite-Fix-memory-leak.patch36
-rw-r--r--chr.spec20
-rw-r--r--sources2
4 files changed, 49 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 19ea511..71c39cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
*.rpm
/results_chr
-/editor-*.tar.gz
+/chr-*.tar.gz
diff --git a/0001-tests-readWrite-Fix-memory-leak.patch b/0001-tests-readWrite-Fix-memory-leak.patch
new file mode 100644
index 0000000..9f73480
--- /dev/null
+++ b/0001-tests-readWrite-Fix-memory-leak.patch
@@ -0,0 +1,36 @@
+From 9657fd3ad95536c19c8b3f68987614d81b04845c Mon Sep 17 00:00:00 2001
+From: Martin Hostettler <textshell@uchuujin.de>
+Date: Sun, 6 Sep 2026 13:42:25 +0200
+Subject: [PATCH] tests: readWrite: Fix memory leak.
+
+Additionally when the File instance is kept alive, it might later
+reference the text metrics now internally bound to a now destructed
+terminal in a later event loop iteration.
+---
+ src/tests/tests.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
+index 2b170c8..efb2107 100644
+--- a/src/tests/tests.cpp
++++ b/src/tests/tests.cpp
+@@ -39,11 +39,11 @@ void readWrite(QString in) {
+ Tui::ZTerminal terminal(of);
+
+ QString out = in + "_dub";
+- File *f = new File(terminal.textMetrics(), nullptr);
+- //f->setFilename(in);
+- CHECK(f->openText(in));
+- f->setFilename(out);
+- CHECK(f->saveText());
++ File f(terminal.textMetrics(), nullptr);
++ //f.setFilename(in);
++ CHECK(f.openText(in));
++ f.setFilename(out);
++ CHECK(f.saveText());
+
+ CHECK(fileChecksum(in) == fileChecksum(out));
+
+--
+2.55.0
+
diff --git a/chr.spec b/chr.spec
index 5109014..1002a2d 100644
--- a/chr.spec
+++ b/chr.spec
@@ -1,21 +1,23 @@
Name: chr
-Version: 0.1.78
+Version: 0.1.81
Release: %autorelease
-Summary: Terminal editor is inspired by the Turbo Pascal editor
+Summary: Terminal editor inspired by the Turbo Pascal editor
-%global forgeurl https://github.com/istoph/editor
+%global forgeurl https://github.com/chr-editor/chr
%forgemeta
License: Boost
URL: %{forgeurl}
-Source0: %{forgeurl}/releases/download/%{version}/editor-%{version}.tar.gz
+Source0: %{forgeurl}/releases/download/%{version}/chr-%{version}.tar.gz
+
+Patch0: 0001-tests-readWrite-Fix-memory-leak.patch
BuildRequires: meson
BuildRequires: gcc-c++
-BuildRequires: qt5-qtbase-devel
-BuildRequires: pkgconfig(TuiWidgets)
-BuildRequires: pkgconfig(PosixSignalManager)
-BuildRequires: cmake(KF5SyntaxHighlighting)
+BuildRequires: pkgconfig(Qt6Core) pkgconfig(Qt6Concurrent)
+BuildRequires: pkgconfig(TuiWidgetsQt6)
+BuildRequires: pkgconfig(PosixSignalManagerQt6)
+BuildRequires: cmake(KF6SyntaxHighlighting)
BuildRequires: pkgconfig(catch2)
@@ -31,7 +33,7 @@ rm -rf third-party/catch2
%build
-%meson -Dsystem-catch2=enabled -Dsyntax_highlighting=true
+%meson -Dsystem-catch2=enabled -Dsyntax_highlighting=true -Dqt=qt6
%meson_build
diff --git a/sources b/sources
index db000ba..ea0595c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (editor-0.1.78.tar.gz) = 15548c93520e7c51b675fb3a7681f226d04f05701195fabb9a43f7e10a4b37ffa92c75ed67b8ec724ac9674a2babb423ccec2a6ca0f1be4247b63981aba4991d
+SHA512 (chr-0.1.81.tar.gz) = 1d5175009520eec79968a41f98ba60a68546582fbfd5d53a7c56fc6f7660b896b2e1711ff8132eb34ddfb105c56b9c790c99c57b9dfec96aa13b46df922a851e