diff options
| author | CoprDistGit <infra@openeuler.org> | 2025-01-05 15:05:40 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2025-01-05 15:05:40 +0000 |
| commit | 76635737295af8218995c6c4a64473f57ef05233 (patch) | |
| tree | e07cb05bd858db1ebd9da215f6aad718160b4668 | |
| parent | 0b6fa0e0b60bcebaa68ca285900a9321f839b15a (diff) | |
automatic import of qscintillaopeneuler24.03_LTS
| -rw-r--r-- | qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch | 11 | ||||
| -rw-r--r-- | qscintilla.spec | 13 |
2 files changed, 4 insertions, 20 deletions
diff --git a/qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch b/qscintilla-2.11.6-add-qtwidgets-and-printsupport.patch deleted file mode 100644 index 01e2fab..0000000 --- a/qscintilla-2.11.6-add-qtwidgets-and-printsupport.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 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.spec b/qscintilla.spec index 6afb180..2c8869b 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -12,7 +12,6 @@ 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-and-printsupport.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(Qt5Designer) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) Provides: bundled(scintilla) = %{scintilla_ver} @@ -66,7 +65,7 @@ pushd Qt4Qt5 %make_build popd -QMAKEFEATURES=`pwd`/Qt5/features; export QMAKEFEATURES +QMAKEFEATURES=`pwd`/Qt4Qt5/features; export QMAKEFEATURES pushd designer-Qt4Qt5 %{qmake_qt5} designer.pro INCLUDEPATH+=../Qt4Qt5 LIBS+=-L../Qt4Qt5 %make_build @@ -79,13 +78,9 @@ pushd Python --sip=/usr/bin/sip-pyqt5 \ --qsci-incdir=../Qt4Qt5 --qsci-libdir=../Qt4Qt5 -cat Qsci/Qsci.pro -make sub-Qsci-qmake_all -sed -i \ - -e '#^CXXFLAGS#s#$# %{build_cxxflags}#' \ - -e '#^LFLAGS#s#$# %{build_ldflags}#'\ - Qsci/Makefile -cat Qsci/Makefile +pushd Qsci +%{qmake_qt5} Qsci.pro -o Makefile +popd %make_build popd |