rdnvndr
/
aurpkg
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update qtcreator13

This commit is contained in:
Andrey Rodionov 2024-03-27 21:22:46 +03:00
parent bc5d5a4ac9
commit d40bad6caf
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qtcreator/qtcreator-spellchecker-plugin/PKGBUILD
View File

@ -1,7 +1,7 @@
pkgname=qtcreator-spellchecker-plugin
pkgver=3.5.0
_commit=v3.5.0
pkgrel=1
pkgrel=2
pkgdesc="Spell Checker plugin for the Qt Creator IDE"
groups=('qt' 'qt6')
arch=('i686' 'x86_64')
@ -10,7 +10,7 @@ license=('GPL3')
depends=('qtcreator' 'hunspell')
makedepends=('git' 'qtcreator-devel')
source=("$pkgname"::git+https://github.com/CJCombrink/SpellChecker-Plugin.git
"qtc12.patch")
"qtc13.patch")
sha256sums=('SKIP' 'SKIP')
prepare() {
@ -19,7 +19,7 @@ prepare() {
cd "${srcdir}/${pkgname}"
git checkout ${_commit}
# patch -p1 < ../qtc12.patch
# patch -p1 < ../qtc13.patch
}
build() {

38
qtcreator/qtcreator-spellchecker-plugin/qtc13.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/src/Parsers/CppParser/cppdocumentparser.cpp b/src/Parsers/CppParser/cppdocumentparser.cpp
index 60bdb47e..76c7f205 100644
--- a/src/Parsers/CppParser/cppdocumentparser.cpp
+++ b/src/Parsers/CppParser/cppdocumentparser.cpp
@@ -37,7 +37,6 @@
#include <cppeditor/cppmodelmanager.h>
#include <cppeditor/cpptoolsreuse.h>
#include <projectexplorer/project.h>
-#include <texteditor/syntaxhighlighter.h>
#include <texteditor/texteditor.h>
#include <utils/algorithm.h>
#include <utils/mimeutils.h>
diff --git a/src/spellcheckquickfix.cpp b/src/spellcheckquickfix.cpp
index 6f0bf6c0..9c47c8e6 100644
--- a/src/spellcheckquickfix.cpp
+++ b/src/spellcheckquickfix.cpp
@@ -94,7 +94,7 @@ public:
} // namespace Internal
-void SpellCheckCppQuickFixFactory::match( const CppEditor::Internal::CppQuickFixInterface& interface, TextEditor::QuickFixOperations& result )
+void SpellCheckCppQuickFixFactory::doMatch( const CppEditor::Internal::CppQuickFixInterface& interface, TextEditor::QuickFixOperations& result )
{
Q_UNUSED( interface )
diff --git a/src/spellcheckquickfix.h b/src/spellcheckquickfix.h
index 1c77320b..8d4b5030 100644
--- a/src/spellcheckquickfix.h
+++ b/src/spellcheckquickfix.h
@@ -33,7 +33,7 @@ class SpellCheckCppQuickFixFactory
: public CppEditor::CppQuickFixFactory
{
public:
- void match( const CppEditor::Internal::CppQuickFixInterface& interface, TextEditor::QuickFixOperations& result ) Q_DECL_OVERRIDE;
+ void doMatch( const CppEditor::Internal::CppQuickFixInterface& interface, TextEditor::QuickFixOperations& result ) Q_DECL_OVERRIDE;
};
} // namespace SpellChecker

16
qtcreator/qtcreator13/PKGBUILD
View File

@ -49,15 +49,15 @@ groups=('modified')
prepare() {
cd $srcdir
git clone --branch ${_commit} --depth 1 --shallow-submodules git@github.com:qt-creator/qt-creator.git
cd qt-creator
git submodule update --init src/libs/3rdparty/googletest
git submodule update --init src/shared/qbs
git submodule update --init src/tools/perfparser
cd ..
# git clone --branch ${_commit} --depth 1 --shallow-submodules git@github.com:qt-creator/qt-creator.git
# cd qt-creator
# git submodule update --init src/libs/3rdparty/googletest
# git submodule update --init src/shared/qbs
# git submodule update --init src/tools/perfparser
# cd ..
# git clone --branch ${_commit} --depth 1 --shallow-submodules --recurse-submodules git@github.com:qt-creator/qt-creator.git
# rm -r qt-creator/src/libs/qlitehtml/src/3rdparty
git clone --branch ${_commit} --depth 1 --shallow-submodules --recurse-submodules git@github.com:qt-creator/qt-creator.git
rm -r qt-creator/src/libs/qlitehtml/src/3rdparty
patch -d qt-creator -p1 < projectmodels.patch
patch -d qt-creator -p1 < navigationwidget.patch