[packages/ka5-cantor] - fix luajit detection, rel 4

[baggins]

commit a388610f69819fb264a5dbd8608f6392f0f7bc13
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Dec 26 00:46:28 2024 +0100

    - fix luajit detection, rel 4

 ka5-cantor.spec  |  4 +++-
 luajit-5.2.patch | 11 +++++++++++
 python-3.8.patch | 11 -----------
 qt5.15.patch     | 12 ------------
 4 files changed, 14 insertions(+), 24 deletions(-)
---
diff --git a/ka5-cantor.spec b/ka5-cantor.spec
index 65e53c2..5618874 100644
--- a/ka5-cantor.spec
+++ b/ka5-cantor.spec
@@ -14,11 +14,12 @@
 Summary:	Cantor
 Name:		ka5-%{kaname}
 Version:	23.08.5
-Release:	3
+Release:	4
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
 Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
 # Source0-md5:	b2579f3ac8b0618ebd14b21d3c1342a1
+Patch0:		luajit-5.2.patch
 URL:		https://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel
@@ -115,6 +116,7 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
 
 %prep
 %setup -q -n %{kaname}-%{version}
+%patch -P 0 -p1
 
 %build
 %cmake \
diff --git a/luajit-5.2.patch b/luajit-5.2.patch
new file mode 100644
index 0000000..54138d3
--- /dev/null
+++ b/luajit-5.2.patch
@@ -0,0 +1,11 @@
+--- cantor-23.08.5/cmake/FindLuaJIT.cmake~	2024-02-09 23:24:29.000000000 +0100
++++ cantor-23.08.5/cmake/FindLuaJIT.cmake	2024-12-26 00:43:41.846665581 +0100
+@@ -3,7 +3,7 @@
+ pkg_check_modules(LUAJIT QUIET luajit)
+ 
+ find_path(LUAJIT_INCLUDE_DIR lua.hpp HINTS ${LUAJIT_INCLUDEDIR} ${LUAJIT_INCLUDE_DIRS})
+-find_library(LUAJIT_LIBRARY NAMES luajit-5.1 luajit HINTS ${LUAJIT_LIBDIR} ${LUAJIT_LIBRARY_DIRS})
++find_library(LUAJIT_LIBRARY NAMES luajit-5.1 luajit-5.2 luajit HINTS ${LUAJIT_LIBDIR} ${LUAJIT_LIBRARY_DIRS})
+ 
+ set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
+ set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
diff --git a/python-3.8.patch b/python-3.8.patch
deleted file mode 100644
index 794eaf4..0000000
--- a/python-3.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cantor-19.04.1/cmake/FindPythonLibs3.cmake~	2019-05-02 22:14:10.000000000 +0200
-+++ cantor-19.04.1/cmake/FindPythonLibs3.cmake	2019-11-03 14:34:28.109784898 +0100
-@@ -6,7 +6,7 @@
-   find_library(PYTHONLIBS3_LIBRARY NAMES python32 python33 python34 python35 python36 python37
-                HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
- ELSE()
--  find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m
-+  find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m python3.8m python3.8 python3.9
-                HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
- ENDIF()
- 
diff --git a/qt5.15.patch b/qt5.15.patch
deleted file mode 100644
index 9a75adf..0000000
--- a/qt5.15.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cantor-19.04.1/src/cantor.h cantor-19.08.3/src/cantor.h
---- cantor-19.04.1/src/cantor.h	2019-05-02 22:14:10.000000000 +0200
-+++ cantor-19.08.3/src/cantor.h	2019-11-01 22:50:43.000000000 +0100
-@@ -25,6 +25,8 @@
- #include <KParts/MainWindow>
- 
- #include <QList>
-+#include <QStringList>
-+#include <QMap>
- 
- class QTabWidget;
- class KTextEdit;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-cantor.git/commitdiff/a388610f69819fb264a5dbd8608f6392f0f7bc13