New upstream version 0.2.3; switch to qt6HEADrawhide

5 files changed, 19 insertions, 31 deletions

diff --git a/.gitignore b/.gitignore
index 55fa1a1..4143ea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *.rpm
 /results_tuiwidgets
-/tuiwidgets-0.2.1.tar.gz
+/tuiwidgets-*.tar.gz
diff --git a/doc-font-path.patch b/doc-font-path.patch
deleted file mode 100644
index 1a721b1..0000000
--- a/doc-font-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/doc/tpi2png.py b/doc/tpi2png.py
-index 78c3cc3..879b4db 100755
---- a/doc/tpi2png.py
-+++ b/doc/tpi2png.py
-@@ -12,11 +12,11 @@ import PIL.ImageColor
- import freetype
- 
- conf_dict = {
--    'font_path': '/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf',
--    'font_bold_path': '/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf',
--    'font_italic_path': '/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Oblique.ttf',
--    'font_bold_italic_path': '/usr/share/fonts/truetype/dejavu/DejaVuSansMono-BoldOblique.ttf',
--    'font_fallback_path': '/usr/share/fonts/truetype/unifont/unifont.ttf',
-+    'font_path': '/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono.ttf',
-+    'font_bold_path': '/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono-Bold.ttf',
-+    'font_italic_path': '/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono-Oblique.ttf',
-+    'font_bold_italic_path': '/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono-BoldOblique.ttf',
-+    'font_fallback_path': '/usr/share/fonts/unifont/unifont.ttf',
- }
- 
- conf_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'tpi2png.conf')
diff --git a/sources b/sources
index 7dc1073..d9597ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tuiwidgets-0.2.1.tar.gz) = ca47316aa91d9b9b7e751efb0de4f4568a42f76f1fc963a89d5d724ad948e426e24afed7eb455e95cfe674d6a74669ea576de2188a93c9ac22333a85cff7d044
+SHA512 (tuiwidgets-0.2.3.tar.gz) = 45fa4ab114d4d6a66810626d06ec7a16ae87044fbdd7a5e0b1b8c50287e752499e9ada9db75bacfe83f1b78a2980cc94c6a2690d86b17f60c0ab90480c1b26a4
diff --git a/tpi2png.conf b/tpi2png.conf
new file mode 100644
index 0000000..a0da04b
--- /dev/null
+++ b/tpi2png.conf
@@ -0,0 +1,7 @@
+{
+   "font_path": "/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono.ttf",
+   "font_bold_path": "/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono-Bold.ttf",
+   "font_italic_path": "/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono-Oblique.ttf",
+   "font_bold_italic_path": "/usr/share/fonts/dejavu-sans-mono-fonts/DejaVuSansMono-BoldOblique.ttf",
+   "font_fallback_path": "/usr/share/fonts/unifont/unifont.ttf"
+}
diff --git a/tuiwidgets.spec b/tuiwidgets.spec
index 0e016e2..58eb2d8 100644
--- a/tuiwidgets.spec
+++ b/tuiwidgets.spec
@@ -1,5 +1,5 @@
 Name: tuiwidgets
-Version: 0.2.1
+Version: 0.2.3
 Release: %autorelease
 Summary: High-level widget based toolkit for terminal applications
 
@@ -9,17 +9,18 @@ Summary: High-level widget based toolkit for terminal applications
 License: Boost
 URL: %{forgeurl}
 Source0: %{forgeurl}/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source1: tpi2png.conf
 
 Patch0: 0003-doc-Remove-usage-of-sphinxcontrib.image.patch
-Patch1: doc-font-path.patch
 
 BuildRequires: meson
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: pkgconfig(termpaint)
 BuildRequires: pkgconfig(termpaint_image)
-BuildRequires: pkgconfig(PosixSignalManager)
-BuildRequires: qt5-qtbase-devel
+BuildRequires: pkgconfig(PosixSignalManagerQt6)
+BuildRequires: qt6-qtbase-devel
+BuildRequires: qt6-qt5compat-devel
 BuildRequires: pkgconfig(catch2)
 BuildRequires: python3-sphinx
 BuildRequires: python3-beautifulsoup4
@@ -47,10 +48,11 @@ software using tuiwidgets, as well as the documentation.
 %prep
 %forgeautosetup -p1
 rm -rf third-party/catch2
+cp %{SOURCE1} doc/
 
 
 %build
-%meson -Dsystem-catch2=enabled -Dsystem-posixsignalmanager=enabled
+%meson -Dsystem-catch2=enabled -Dsystem-posixsignalmanager=enabled -Dqt=qt6
 %meson_build
 pushd doc
 python3 ./qt5.inv.py
@@ -73,11 +75,11 @@ rm -f %{buildroot}%{_pkgdocdir}/html/.buildinfo
 %files
 %doc README.md NEWS.md
 %license COPYING AUTHORS
-%{_libdir}/libtuiwidgets.so.0a
+%{_libdir}/libtuiwidgets-qt6.so.0a
 
 %files devel
-%{_libdir}/libtuiwidgets.so
-%{_libdir}/pkgconfig/TuiWidgets.pc
+%{_libdir}/libtuiwidgets-qt6.so
+%{_libdir}/pkgconfig/TuiWidgetsQt6.pc
 %{_includedir}/Tui
 %{_pkgdocdir}/html