commit 9b1245069d17e0a462f1f692125c07b8a09927f0
Author: Jan Palus <[email protected]>
Date: Fri Apr 8 11:04:04 2022 +0200
pass path to in-tree features directory for proper linking; rel 2
makes qt5 patch obsolete since feature file is proper source of
widgets/printsupport linking info
qscintilla2-qt5.patch | 12 ------------
qscintilla2.spec | 7 +++----
2 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/qscintilla2.spec b/qscintilla2.spec
index c09098f..1d247f4 100644
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -16,14 +16,13 @@ Summary: QScintilla2 - a port to Qt of the Scintilla
editing component
Summary(pl.UTF-8): QScintilla2 - port komponentu edytora Scintilla dla
biblioteki Qt
Name: qscintilla2
Version: 2.11.6
-Release: 1
+Release: 2
License: GPL v3
Group: X11/Libraries
Source0:
https://www.riverbankcomputing.com/static/Downloads/QScintilla/%{version}/QScintilla-%{version}.tar.gz
# Source0-md5: 343cd0c2c8b425518df2e51eb994fbc6
Patch0: %{name}-internal_build.patch
Patch3: %{name}-outoftree.patch
-Patch4: %{name}-qt5.patch
Patch5: py-config.patch
Patch6: python-install.patch
Patch7: sip-check.patch
@@ -290,7 +289,6 @@ Wiązania Pythona 3 dla komponentu QScintilla2 (wersja dla
PyQt5).
%setup -q -n QScintilla-%{version}
%patch0 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@@ -334,7 +332,8 @@ PATH=%{_libdir}/${qt}/bin:$PATH \
-n ../../Qt4Qt5 \
-o ../Qt4Qt5 \
--apidir=%{_datadir}/${qt}/qsci \
- --pyqt=PyQt${qt#qt}
+ --pyqt=PyQt${qt#qt} \
+ --qsci-featuresdir=../../Qt4Qt5/features
%{__make}
cd ..
%endif
diff --git a/qscintilla2-qt5.patch b/qscintilla2-qt5.patch
deleted file mode 100644
index 92926a2..0000000
--- a/qscintilla2-qt5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp -x '*.orig' QScintilla_gpl-2.11.2.org/Python/configure.py
QScintilla_gpl-2.11.2/Python/configure.py
---- QScintilla_gpl-2.11.2.org/Python/configure.py 2021-03-05
20:11:27.443448932 +0100
-+++ QScintilla_gpl-2.11.2/Python/configure.py 2021-03-05 20:11:27.536781714
+0100
-@@ -306,7 +306,7 @@ class ModuleConfiguration(object):
- version of Qt. target_configuration is the target configuration.
- """
-
-- qmake = {'CONFIG': 'qscintilla2'}
-+ qmake = {'CONFIG': 'qscintilla2', 'Qt5:QT': 'widgets printsupport'}
-
- if target_configuration.qsci_inc_dir is not None:
- qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qscintilla2.git/commitdiff/9147b9610c5ef96a79f91673a4d076f1d50316c4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
