[packages/ka5-cantor] - build fixes: python 3.9, qt 5.15, shebangs
baggins
baggins at pld-linux.org
Thu Mar 11 21:48:58 CET 2021
commit d135a611c839c8d663ea360efcd06ed91e901755
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Mar 11 21:48:34 2021 +0100
- build fixes: python 3.9, qt 5.15, shebangs
ka5-cantor.spec | 5 +++++
python-3.8.patch | 2 +-
qt5.15.patch | 12 ++++++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/ka5-cantor.spec b/ka5-cantor.spec
index c6695df..b6e2b03 100644
--- a/ka5-cantor.spec
+++ b/ka5-cantor.spec
@@ -19,6 +19,7 @@ Group: X11/Libraries
Source0: http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
# Source0-md5: 0a2d78da9b7a785adeddd1094e9bbe67
Patch0: python-3.8.patch
+Patch1: qt5.15.patch
URL: http://www.kde.org/
BuildRequires: Qt5Core-devel >= %{qtver}
BuildRequires: Qt5Gui-devel
@@ -94,6 +95,10 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
%prep
%setup -q -n %{kaname}-%{version}
%patch0 -p1
+%patch1 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
+ src/backends/sage/cantor-execsage
%build
install -d build
diff --git a/python-3.8.patch b/python-3.8.patch
index 2de8f0a..794eaf4 100644
--- a/python-3.8.patch
+++ b/python-3.8.patch
@@ -5,7 +5,7 @@
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
++ 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
new file mode 100644
index 0000000..9a75adf
--- /dev/null
+++ b/qt5.15.patch
@@ -0,0 +1,12 @@
+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/d135a611c839c8d663ea360efcd06ed91e901755
More information about the pld-cvs-commit
mailing list