Compare commits
3 commits
2fc3354fdb
...
4b2229312a
Author | SHA1 | Date | |
---|---|---|---|
4b2229312a | |||
c954dcaa32 | |||
4a06342686 |
6 changed files with 79 additions and 32 deletions
|
@ -1,10 +1,10 @@
|
|||
pkgbase = python-pdoc
|
||||
pkgdesc = A simple program and library to auto generate API documentation for Python modules.
|
||||
pkgver = 14.1.0
|
||||
pkgver = 14.7.0
|
||||
pkgrel = 1
|
||||
url = https://pdoc.dev/
|
||||
arch = any
|
||||
license = Unlicense
|
||||
license = MIT-0
|
||||
checkdepends = python-pytest
|
||||
checkdepends = python-pytest-timeout
|
||||
checkdepends = python-hypothesis
|
||||
|
@ -12,10 +12,11 @@ pkgbase = python-pdoc
|
|||
makedepends = python-setuptools
|
||||
makedepends = python-build
|
||||
makedepends = python-installer
|
||||
makedepends = python-wheel
|
||||
depends = python-jinja
|
||||
depends = python-pygments
|
||||
depends = python-markupsafe
|
||||
source = https://files.pythonhosted.org/packages/source/p/pdoc/pdoc-14.1.0.tar.gz
|
||||
sha256sums = 3a0bd921a05c39a82b1505089eb6dc99d857b71b856aa60d1aca4d9086d0e18c
|
||||
source = https://files.pythonhosted.org/packages/source/p/pdoc/pdoc-14.7.0.tar.gz
|
||||
sha256sums = 2d28af9c0acc39180744ad0543e4bbc3223ecba0d1302db315ec521c51f71f93
|
||||
|
||||
pkgname = python-pdoc
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
pkgname=python-pdoc
|
||||
_pypiname=${pkgname/python-/}
|
||||
pkgver=14.5.0
|
||||
pkgver=14.7.0
|
||||
pkgrel=1
|
||||
pkgdesc='A simple program and library to auto generate API documentation for Python modules.'
|
||||
arch=('any')
|
||||
url='https://pdoc.dev/'
|
||||
license=('Unlicense')
|
||||
license=('MIT-0')
|
||||
depends=('python-jinja' 'python-pygments' 'python-markupsafe')
|
||||
checkdepends=('python-pytest' 'python-pytest-timeout' 'python-hypothesis' 'nodejs')
|
||||
makedepends=('python-setuptools' 'python-build' 'python-installer')
|
||||
makedepends=('python-setuptools' 'python-build' 'python-installer' 'python-wheel')
|
||||
source=("https://files.pythonhosted.org/packages/source/${_pypiname::1}/${_pypiname}/${_pypiname}-${pkgver}.tar.gz")
|
||||
sha256sums=("SKIP")
|
||||
sha256sums=("2d28af9c0acc39180744ad0543e4bbc3223ecba0d1302db315ec521c51f71f93")
|
||||
|
||||
build() {
|
||||
cd $srcdir/${_pypiname}-${pkgver}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = python
|
||||
pkgdesc = The Python programming language
|
||||
pkgver = 3.12.3
|
||||
pkgver = 3.12.7
|
||||
pkgrel = 1
|
||||
url = https://www.python.org/
|
||||
arch = x86_64
|
||||
|
@ -22,14 +22,14 @@ pkgbase = python
|
|||
depends = zlib
|
||||
depends = tzdata
|
||||
depends = mpdecimal
|
||||
source = https://www.python.org/ftp/python/3.12.3/Python-3.12.3.tar.xz
|
||||
source = https://www.python.org/ftp/python/3.12.3/Python-3.12.3.tar.xz.asc
|
||||
source = https://www.python.org/ftp/python/3.12.7/Python-3.12.7.tar.xz
|
||||
source = https://www.python.org/ftp/python/3.12.7/Python-3.12.7.tar.xz.asc
|
||||
source = EXTERNALLY-MANAGED
|
||||
validpgpkeys = 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
|
||||
validpgpkeys = E3FF2839C048B25C084DEBE9B26995E310250568
|
||||
validpgpkeys = A035C8C19219BA821ECEA86B64E628F8D684696D
|
||||
validpgpkeys = 7169605F62C751356D054A26A821E680E5FA6305
|
||||
sha512sums = 4a2213b108e7f1f1525baa8348e68b2a2336d925e60d0a59f0225fc470768a2c8031edafc0b8243f94dbae18afda335ee5adf2785328c2218fd64cbb439f13a4
|
||||
sha512sums = 4a363d3f852ad8f4fd1484aa4cec35494a3811be48ef67fadb2bdf2e2489ed07dc78fad6ab475257db503ddd64d39f9800f23a1c94b6bbd15b7f632cff0c90ae
|
||||
sha512sums = SKIP
|
||||
sha512sums = 62a6fbfbaeaa3ba7c54e109d9c3b7f67e73bb21986da4c1fcc5d28cca83d71e0fcae28e1fc70ee8ddce7dea8cd0b64e18d1031dae3a2eae5eaa379c53efd53a0
|
||||
|
||||
|
|
5
python/.nvchecker.toml
Normal file
5
python/.nvchecker.toml
Normal file
|
@ -0,0 +1,5 @@
|
|||
[python]
|
||||
source = "git"
|
||||
git = "https://github.com/python/cpython.git"
|
||||
prefix = "v"
|
||||
exclude_regex = ".*(a|b|rc).*"
|
|
@ -9,7 +9,7 @@ shopt -s extglob
|
|||
|
||||
pkgbase=python
|
||||
pkgname=(python)
|
||||
pkgver=3.12.6
|
||||
pkgver=3.12.7
|
||||
pkgrel=1
|
||||
_pybasever=${pkgver%.*}
|
||||
pkgdesc="The Python programming language"
|
||||
|
@ -106,4 +106,4 @@ package_python() {
|
|||
# Split tests
|
||||
cd "$pkgdir"/usr/lib/python*/
|
||||
rm -r {test,idlelib/idle_test}
|
||||
}
|
||||
}
|
|
@ -12,31 +12,72 @@ index c71badad..b4b5a68c 100644
|
|||
"Vendor" : "Carel Combrink",
|
||||
"Copyright" : "(C) 2015 - 2024 Carel Combrink",
|
||||
"License" : [ "GNU Lesser General Public License Usage",
|
||||
diff --git a/src/spellcheckerconstants.h b/src/spellcheckerconstants.h
|
||||
index a83869d9..cf89e4e2 100644
|
||||
--- a/src/spellcheckerconstants.h
|
||||
+++ b/src/spellcheckerconstants.h
|
||||
@@ -19,6 +19,9 @@
|
||||
****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
+
|
||||
+#include <utils/id.h>
|
||||
+
|
||||
#include <QtGlobal>
|
||||
|
||||
namespace SpellChecker {
|
||||
@@ -26,17 +29,17 @@ namespace Constants {
|
||||
|
||||
const char SPELLCHECK_MISTAKE_ID[] = "SpellChecker.Spelling.Mistake";
|
||||
|
||||
-const char MENU_ID[] = "SpellChecker.Menu";
|
||||
-const char CONTEXT_MENU_ID[] = "SpellChecker.ContextMenu";
|
||||
-const char ACTION_SUGGEST_ID[] = "SpellChecker.ActionSuggest";
|
||||
-const char ACTION_IGNORE_ID[] = "SpellChecker.ActionIgnore";
|
||||
-const char ACTION_ADD_ID[] = "SpellChecker.ActionAdd";
|
||||
-const char ACTION_LUCKY_ID[] = "SpellChecker.ActionLucky";
|
||||
-const char ACTION_HOLDER1_ID[] = "SpellChecker.ActionHolder1";
|
||||
-const char ACTION_HOLDER2_ID[] = "SpellChecker.ActionHolder2";
|
||||
-const char ACTION_HOLDER3_ID[] = "SpellChecker.ActionHolder3";
|
||||
-const char ACTION_HOLDER4_ID[] = "SpellChecker.ActionHolder4";
|
||||
-const char ACTION_HOLDER5_ID[] = "SpellChecker.ActionHolder5";
|
||||
+const Utils::Id MENU_ID { "SpellChecker.Menu"};
|
||||
+const Utils::Id CONTEXT_MENU_ID { "SpellChecker.ContextMenu"};
|
||||
+const Utils::Id ACTION_SUGGEST_ID { "SpellChecker.ActionSuggest"};
|
||||
+const Utils::Id ACTION_IGNORE_ID { "SpellChecker.ActionIgnore"};
|
||||
+const Utils::Id ACTION_ADD_ID { "SpellChecker.ActionAdd"};
|
||||
+const Utils::Id ACTION_LUCKY_ID { "SpellChecker.ActionLucky"};
|
||||
+const Utils::Id ACTION_HOLDER1_ID { "SpellChecker.ActionHolder1"};
|
||||
+const Utils::Id ACTION_HOLDER2_ID { "SpellChecker.ActionHolder2"};
|
||||
+const Utils::Id ACTION_HOLDER3_ID { "SpellChecker.ActionHolder3"};
|
||||
+const Utils::Id ACTION_HOLDER4_ID { "SpellChecker.ActionHolder4"};
|
||||
+const Utils::Id ACTION_HOLDER5_ID { "SpellChecker.ActionHolder5"};
|
||||
|
||||
const char CORE_SETTINGS_GROUP[] = "SpellCheckerPlugin";
|
||||
const char CORE_SPELLCHECKERS_GROUP[] = "SpellCheckers";
|
||||
diff --git a/src/spellcheckercore.cpp b/src/spellcheckercore.cpp
|
||||
index c5d026b6..85d648f3 100644
|
||||
index c5d026b6..5cfdd741 100644
|
||||
--- a/src/spellcheckercore.cpp
|
||||
+++ b/src/spellcheckercore.cpp
|
||||
@@ -818,7 +818,8 @@ void SpellCheckerCore::updateContextMenu()
|
||||
QVector<const char*> holderActionIds { Constants::ACTION_HOLDER1_ID, Constants::ACTION_HOLDER2_ID, Constants::ACTION_HOLDER3_ID, Constants::ACTION_HOLDER4_ID, Constants::ACTION_HOLDER5_ID };
|
||||
@@ -815,7 +815,7 @@ void SpellCheckerCore::updateContextMenu()
|
||||
if( d->contextMenuHolderCommands.isEmpty() == true ) {
|
||||
/* Populate the internal vector with the holder actions to speed up the process
|
||||
* of updating the context menu when requested again. */
|
||||
- QVector<const char*> holderActionIds { Constants::ACTION_HOLDER1_ID, Constants::ACTION_HOLDER2_ID, Constants::ACTION_HOLDER3_ID, Constants::ACTION_HOLDER4_ID, Constants::ACTION_HOLDER5_ID };
|
||||
+ QVector<Utils::Id> holderActionIds { Constants::ACTION_HOLDER1_ID, Constants::ACTION_HOLDER2_ID, Constants::ACTION_HOLDER3_ID, Constants::ACTION_HOLDER4_ID, Constants::ACTION_HOLDER5_ID };
|
||||
/* Iterate the commands and */
|
||||
for( int count = 0; count < holderActionIds.size(); ++count ) {
|
||||
- Core::Command* cmd = Core::ActionManager::command( holderActionIds[count] );
|
||||
+ auto id = QString::fromLatin1(holderActionIds[count], strlen(holderActionIds[count]));
|
||||
+ Core::Command* cmd = Core::ActionManager::command( Utils::Id::fromString(id ));
|
||||
d->contextMenuHolderCommands.push_back( cmd );
|
||||
}
|
||||
}
|
||||
Core::Command* cmd = Core::ActionManager::command( holderActionIds[count] );
|
||||
diff --git a/src/spellcheckerplugin.cpp b/src/spellcheckerplugin.cpp
|
||||
index 58a7d81f..9f1396ee 100644
|
||||
index 58a7d81f..7767a8d1 100644
|
||||
--- a/src/spellcheckerplugin.cpp
|
||||
+++ b/src/spellcheckerplugin.cpp
|
||||
@@ -166,7 +166,8 @@ bool SpellCheckerPlugin::initialize( const QStringList& arguments, QString* erro
|
||||
QVector<const char*> holderActionIds { Constants::ACTION_HOLDER1_ID, Constants::ACTION_HOLDER2_ID, Constants::ACTION_HOLDER3_ID, Constants::ACTION_HOLDER4_ID, Constants::ACTION_HOLDER5_ID };
|
||||
@@ -163,7 +163,7 @@ bool SpellCheckerPlugin::initialize( const QStringList& arguments, QString* erro
|
||||
contextMenu->addSeparator();
|
||||
/* Add 5 dummy actions that will be used for spelling mistakes that can be fixed from the
|
||||
* context menu */
|
||||
- QVector<const char*> holderActionIds { Constants::ACTION_HOLDER1_ID, Constants::ACTION_HOLDER2_ID, Constants::ACTION_HOLDER3_ID, Constants::ACTION_HOLDER4_ID, Constants::ACTION_HOLDER5_ID };
|
||||
+ QVector<Utils::Id> holderActionIds { Constants::ACTION_HOLDER1_ID, Constants::ACTION_HOLDER2_ID, Constants::ACTION_HOLDER3_ID, Constants::ACTION_HOLDER4_ID, Constants::ACTION_HOLDER5_ID };
|
||||
for( int count = 0; count < holderActionIds.size(); ++count ) {
|
||||
QAction* actionHolder = new QAction( QStringLiteral( "" ), this );
|
||||
- Core::Command* cmdHolder = Core::ActionManager::registerAction( actionHolder, holderActionIds[count], textContext );
|
||||
+ auto id = QString::fromLatin1(holderActionIds[count], strlen(holderActionIds[count]));
|
||||
+ Core::Command* cmdHolder = Core::ActionManager::registerAction( actionHolder, Utils::Id::fromString(id), textContext );
|
||||
contextMenu->addAction( cmdHolder );
|
||||
}
|
||||
/* Set the right click context menu only enabled if the word under the cursor is a spelling
|
||||
Core::Command* cmdHolder = Core::ActionManager::registerAction( actionHolder, holderActionIds[count], textContext );
|
||||
|
|
Loading…
Reference in a new issue