diff options
| author | CoprDistGit <infra@openeuler.org> | 2025-01-05 14:40:08 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2025-01-05 14:40:08 +0000 |
| commit | 5da9295291b689e177d6a0de4c5679a8496fe921 (patch) | |
| tree | 3451b289f0f1ec036927a1aefb7b298a868bca96 | |
| parent | 519942f8506e7bb04556825d344ff6d607ce3f8c (diff) | |
automatic import of qscintilla
| -rw-r--r-- | qscintilla-2.11.6-add-qtwidgets.patch | 11 | ||||
| -rw-r--r-- | qscintilla.spec | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/qscintilla-2.11.6-add-qtwidgets.patch b/qscintilla-2.11.6-add-qtwidgets.patch new file mode 100644 index 0000000..55f7ae4 --- /dev/null +++ b/qscintilla-2.11.6-add-qtwidgets.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\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 93c6857..307c161 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -12,6 +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 BuildRequires: gcc-c++ BuildRequires: pkgconfig(Qt5Designer) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) Provides: bundled(scintilla) = %{scintilla_ver} @@ -83,8 +84,6 @@ make sub-Qsci-qmake_all sed -i \ -e '#^CXXFLAGS#s#$# %{build_cxxflags}#' \ -e '#^LFLAGS#s#$# %{build_ldflags}#'\ - -e '/^INCPATH/s/$/ -I%{_qt5_includedir}\/QtWidgets/' \ - -e '/^LIBS/s/$/ %{_qt5_libdir}\/libQt5Widgets.so/'\ Qsci/Makefile cat Qsci/Makefile %make_build |