From 07410140eda522b3089ff018141879cd257742e6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 07 2018 18:02:32 +0000 Subject: qscintilla-2.10.3 BR: gcc-c++, use %make_build --- diff --git a/.gitignore b/.gitignore index f2925de..c9d2d74 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /QScintilla_gpl-2.10.2.tar.gz +/QScintilla_gpl-2.10.3.tar.gz diff --git a/QScintilla_gpl-2.10.3-qt4_accessibility.patch b/QScintilla_gpl-2.10.3-qt4_accessibility.patch new file mode 100644 index 0000000..29b2661 --- /dev/null +++ b/QScintilla_gpl-2.10.3-qt4_accessibility.patch @@ -0,0 +1,75 @@ +diff -up QScintilla_gpl-2.10.3/Qt4Qt5/qsciscintillabase.cpp.qt4 QScintilla_gpl-2.10.3/Qt4Qt5/qsciscintillabase.cpp +--- QScintilla_gpl-2.10.3/Qt4Qt5/qsciscintillabase.cpp.qt4 2018-02-27 04:50:56.000000000 -0600 ++++ QScintilla_gpl-2.10.3/Qt4Qt5/qsciscintillabase.cpp 2018-03-07 11:51:50.579557114 -0600 +@@ -90,7 +90,7 @@ QsciScintillaBase::QsciScintillaBase(QWi + , clickCausedFocus(false) + #endif + { +-#if !defined(QT_NO_ACCESSIBILITY) ++#if QT_VERSION >= 0x050000 && !defined(QT_NO_ACCESSIBILITY) + QsciAccessibleScintillaBase::initialise(); + #endif + +diff -up QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.cpp.qt4 QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.cpp +--- QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.cpp.qt4 2018-02-27 04:50:56.000000000 -0600 ++++ QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.cpp 2018-03-07 11:52:18.119754724 -0600 +@@ -20,7 +20,7 @@ + + #include + +-#if !defined(QT_NO_ACCESSIBILITY) ++#if QT_VERSION >= 0x050000 && !defined(QT_NO_ACCESSIBILITY) + + #include "SciAccessibility.h" + +diff -up QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.h.qt4 QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.h +--- QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.h.qt4 2018-02-27 04:50:56.000000000 -0600 ++++ QScintilla_gpl-2.10.3/Qt4Qt5/SciAccessibility.h 2018-03-07 11:50:12.151850861 -0600 +@@ -23,7 +23,7 @@ + + #include + +-#if !defined(QT_NO_ACCESSIBILITY) ++#if QT_VERSION >= 0x050000 && !defined(QT_NO_ACCESSIBILITY) + + #include + #include +diff -up QScintilla_gpl-2.10.3/Qt4Qt5/ScintillaQt.cpp.qt4 QScintilla_gpl-2.10.3/Qt4Qt5/ScintillaQt.cpp +--- QScintilla_gpl-2.10.3/Qt4Qt5/ScintillaQt.cpp.qt4 2018-02-27 04:50:56.000000000 -0600 ++++ QScintilla_gpl-2.10.3/Qt4Qt5/ScintillaQt.cpp 2018-03-07 11:51:07.429247496 -0600 +@@ -31,7 +31,7 @@ + + #include "Qsci/qsciscintillabase.h" + #include "ScintillaQt.h" +-#if !defined(QT_NO_ACCESSIBILITY) ++#if QT_VERSION >= 0x050000 && !defined(QT_NO_ACCESSIBILITY) + #include "SciAccessibility.h" + #endif + #include "SciClasses.h" +@@ -386,7 +386,7 @@ void QsciScintillaQt::NotifyParent(SCNot + { + char *text; + +-#if !defined(QT_NO_ACCESSIBILITY) ++#if QT_VERSION >= 0x050000 && !defined(QT_NO_ACCESSIBILITY) + if ((scn.modificationType & SC_MOD_INSERTTEXT) != 0) + QsciAccessibleScintillaBase::textInserted(qsb, scn.position, + scn.text, scn.length); +@@ -442,7 +442,7 @@ void QsciScintillaQt::NotifyParent(SCNot + break; + + case SCN_UPDATEUI: +-#if !defined(QT_NO_ACCESSIBILITY) ++#if QT_VERSION >= 0x050000 && !defined(QT_NO_ACCESSIBILITY) + QsciAccessibleScintillaBase::updated(qsb); + #endif + emit qsb->SCN_UPDATEUI(scn.updated); +@@ -582,7 +582,7 @@ void QsciScintillaQt::ClaimSelection() + else + primarySelection = false; + +-#if !defined(QT_NO_ACCESSIBILITY) ++#if QT_VERSION >= 0x050000 && !defined(QT_NO_ACCESSIBILITY) + QsciAccessibleScintillaBase::selectionChanged(qsb, isSel); + #endif + diff --git a/qscintilla.spec b/qscintilla.spec index 59c6c85..51f36c2 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -9,12 +9,13 @@ %global python2 1 %global python3 1 %endif +%global qt4 1 %global qt5 1 Summary: A Scintilla port to Qt Name: qscintilla -Version: 2.10.2 -Release: 3%{?dist} +Version: 2.10.3 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/qscintilla/ @@ -24,6 +25,10 @@ Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintil Source0: http://downloads.sf.net/pyqt/QScintilla_gpl-%{version}.tar.gz %endif +# FTBFS building against qt4, enable QAccessible support only on Qt5 +Patch1: QScintilla_gpl-2.10.3-qt4_accessibility.patch + +BuildRequires: gcc-c++ BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml) %if 0%{?qt5} BuildRequires: pkgconfig(Qt5Designer) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets) @@ -153,14 +158,17 @@ BuildArch: noarch %prep %setup -q -n QScintilla_gpl-%{version}%{?snap:-snapshot-%{snap}} +%patch1 -p1 + %build PATH=%{_qt4_bindir}:$PATH; export PATH +%if 0%{?qt4} cp -a Qt4Qt5 Qt4/ pushd Qt4 %{qmake_qt4} qscintilla.pro -make %{?_smp_mflags} +%make_build popd # set QMAKEFEATURES to ensure just built lib/feature is found @@ -169,7 +177,7 @@ QMAKEFEATURES=`pwd`/Qt4/features; export QMAKEFEATURES cp -a designer-Qt4Qt5 designer-Qt4/ pushd designer-Qt4 %{qmake_qt4} designer.pro INCLUDEPATH+=../Qt4 LIBS+=-L../Qt4 -make %{?_smp_mflags} +%make_build popd %if 0%{?python2} @@ -179,7 +187,7 @@ pushd Python2-qt4 configure.py \ --qsci-incdir=../Qt4 --qsci-libdir=../Qt4 -make %{?_smp_mflags} +%make_build popd %endif @@ -192,9 +200,10 @@ pushd Python3-qt4 --qsci-incdir=../Qt4 --qsci-libdir=../Qt4 \ --sip=/usr/bin/python3-sip -make %{?_smp_mflags} +%make_build popd %endif +%endif %if 0%{?qt5} PATH=%{_qt5_bindir}:$PATH; export PATH @@ -202,7 +211,7 @@ PATH=%{_qt5_bindir}:$PATH; export PATH cp -a Qt4Qt5 Qt5/ pushd Qt5 %{qmake_qt5} qscintilla.pro -make %{?_smp_mflags} +%make_build popd # set QMAKEFEATURES to ensure just built lib/feature is found @@ -211,7 +220,7 @@ QMAKEFEATURES=`pwd`/Qt5/features; export QMAKEFEATURES cp -a designer-Qt4Qt5 designer-Qt5/ pushd designer-Qt5 %{qmake_qt5} designer.pro INCLUDEPATH+=../Qt5 LIBS+=-L../Qt5 -make %{?_smp_mflags} +%make_build popd %if 0%{?python2} @@ -224,7 +233,7 @@ pushd Python2-qt5 --qsci-incdir=../Qt5 --qsci-libdir=../Qt5 \ --sip=/usr/bin/sip -make %{?_smp_mflags} +%make_build popd %endif @@ -238,7 +247,7 @@ pushd Python3-qt5 --qsci-incdir=../Qt5 --qsci-libdir=../Qt5 \ --sip=/usr/bin/python3-sip -make %{?_smp_mflags} +%make_build popd %endif @@ -246,6 +255,7 @@ popd %install +%if 0%{?qt4} make -C Qt4 install INSTALL_ROOT=%{buildroot} # compat symlink ln -s libqscintilla2_qt4.so %{buildroot}%{_qt4_libdir}/libqscintilla2.so @@ -260,6 +270,7 @@ make -C Python3-qt4 install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} test -x %{buildroot}%{python3_sitearch}/PyQt4/Qsci.so || \ chmod a+x %{buildroot}%{python3_sitearch}/PyQt4/Qsci.so %endif +%endif %if 0%{?qt5} make -C Qt5 install INSTALL_ROOT=%{buildroot} @@ -304,8 +315,8 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so %endif -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%if 0%{?qt4} +%ldconfig_scriptlets %files -f qscintilla-qt4.lang %doc NEWS README @@ -338,8 +349,11 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so %files -n python3-qscintilla-devel %{_datadir}/python3-sip/PyQt4/Qsci/ %endif +%endif %if 0%{?qt5} +%ldconfig_scriptlets qt5 + %files qt5 -f qscintilla-qt5.lang %doc NEWS README %license LICENSE @@ -352,7 +366,7 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so %{_qt5_libdir}/libqscintilla2_qt5.so %{_qt5_archdatadir}/mkspecs/features/qscintilla2.prf # compat symlink -%{_qt4_libdir}/libqscintilla2-qt5.so +%{_qt5_libdir}/libqscintilla2-qt5.so %if 0%{?python2} %files -n python2-qscintilla-qt5 @@ -375,6 +389,10 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so %changelog +* Wed Mar 07 2018 Rex Dieter - 2.10.3-1 +- qscintilla-2.10.3 +- BR: gcc-c++, use %%make_build + * Fri Feb 09 2018 Fedora Release Engineering - 2.10.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 5c328e4..6b3ce7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (QScintilla_gpl-2.10.2.tar.gz) = 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972 +SHA512 (QScintilla_gpl-2.10.3.tar.gz) = a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6