From 0b6fa0e0b60bcebaa68ca285900a9321f839b15a Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Sun, 5 Jan 2025 14:49:39 +0000 Subject: automatic import of qscintilla --- qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch | 11 +++++++++++ qscintilla-2.11.6-add-qtwidgets.patch | 11 ----------- qscintilla.spec | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch delete mode 100644 qscintilla-2.11.6-add-qtwidgets.patch diff --git a/qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch b/qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch new file mode 100644 index 0000000..01e2fab --- /dev/null +++ b/qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch @@ -0,0 +1,11 @@ +--- qscintilla-2.11.6/Python/configure.py.orig 2025-01-05 22:31:31.638132600 +0800 ++++ qscintilla-2.11.6/Python/configure.py 2025-01-05 22:33:20.803805600 +0800 +@@ -1469,6 +1469,8 @@ + if qt: + pro.write('QT += %s\n' % qt) + ++ pro.write('QT += widgets printsupport\n') ++ + pro.write('CONFIG += %s\n' % ('debug' if target_config.debug else 'release')) + pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin plugin_bundle')) + diff --git a/qscintilla-2.11.6-add-qtwidgets.patch b/qscintilla-2.11.6-add-qtwidgets.patch deleted file mode 100644 index 55f7ae4..0000000 --- a/qscintilla-2.11.6-add-qtwidgets.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qscintilla-2.11.6/Python/configure.py.orig 2025-01-05 22:31:31.638132600 +0800 -+++ qscintilla-2.11.6/Python/configure.py 2025-01-05 22:33:20.803805600 +0800 -@@ -1469,6 +1469,8 @@ - if qt: - pro.write('QT += %s\n' % qt) - -+ pro.write('QT += widgets\n') -+ - pro.write('CONFIG += %s\n' % ('debug' if target_config.debug else 'release')) - pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin plugin_bundle')) - diff --git a/qscintilla.spec b/qscintilla.spec index 307c161..6afb180 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -12,7 +12,7 @@ Source0: https://github.com/opencor/qscintilla/archive/refs/tags/v%{ Patch100: QScintilla_gpl-2_10_7-sip_check.patch Patch101: QScintilla_gpl-2_11-QUrl.patch Patch102: fix-build-error.patch -Patch103: qscintilla-2.11.6-add-qtwidgets.patch +Patch103: qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(Qt5Designer) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) Provides: bundled(scintilla) = %{scintilla_ver} -- cgit v1.2.3