texstudio: update to 4.8.9
This commit is contained in:
parent
9314e76d93
commit
e1e67b341c
@ -1,37 +1,31 @@
|
||||
diff --git a/src/configmanager.cpp b/src/configmanager.cpp
|
||||
index fba59a912..8204bc293 100644
|
||||
--- a/src/configmanager.cpp
|
||||
+++ b/src/configmanager.cpp
|
||||
@@ -895,9 +895,9 @@ QSettings *ConfigManager::readSettings(bool reread)
|
||||
#define PREFIX
|
||||
@@ -916,9 +916,9 @@
|
||||
#endif
|
||||
fallBackPaths << PREFIX"/share/hunspell" << PREFIX"/share/myspell"
|
||||
- << "/usr/share/hunspell" << "/usr/share/myspell"
|
||||
- << parseDir("[txs-app-dir]/../share/texstudio") ;
|
||||
+ << "/usr/share/hunspell" << "/usr/share/myspell";
|
||||
<< "/usr/share/hunspell" << "/usr/share/myspell"
|
||||
- << parseDir("[txs-app-dir]/../share/texstudio")
|
||||
<< parseDir("[txs-app-dir]/../usr/share/texstudio") ;
|
||||
#endif
|
||||
+ fallBackPaths << parseDir("[txs-app-dir]/../share/texstudio");
|
||||
#ifdef Q_OS_MAC
|
||||
fallBackPaths << parseDir("[txs-app-dir]/Contents/Resources") << "/Applications/texstudio.app/Contents/Resources";
|
||||
fallBackPaths << parseDir("[txs-app-dir]/../Resources") << "/Applications/texstudio.app/Contents/Resources";
|
||||
#endif
|
||||
@@ -935,8 +935,10 @@ QSettings *ConfigManager::readSettings(bool reread)
|
||||
QStringList preferredPaths = QStringList() << parseDir("[txs-settings-dir]/dictionaries");
|
||||
@@ -957,8 +957,10 @@
|
||||
QStringList fallBackPaths;
|
||||
#ifdef Q_OS_LINUX
|
||||
- fallBackPaths << PREFIX"/share/mythes" << "/usr/share/mythes"
|
||||
- << parseDir("[txs-app-dir]/../share/texstudio") ;
|
||||
+ fallBackPaths << PREFIX"/share/mythes" << "/usr/share/mythes";
|
||||
fallBackPaths << PREFIX"/share/mythes" << "/usr/share/mythes"
|
||||
- << parseDir("[txs-app-dir]/../share/texstudio")
|
||||
<< parseDir("[txs-app-dir]/../usr/share/texstudio") ;
|
||||
+#endif
|
||||
+#if defined(Q_OS_LINUX) || defined(Q_OS_WIN32)
|
||||
+ fallBackPaths << parseDir("[txs-app-dir]/../share/texstudio");
|
||||
#endif
|
||||
thesaurus_database = findResourceFile("th_" + QString(QLocale::system().name()) + "_v2.dat", true, preferredPaths, fallBackPaths);
|
||||
if (thesaurus_database == "") thesaurus_database = findResourceFile("th_en_US_v2.dat", true, preferredPaths, fallBackPaths);
|
||||
diff --git a/src/templatemanager.cpp b/src/templatemanager.cpp
|
||||
index 0eeafb90d..1ad1a9954 100644
|
||||
--- a/src/templatemanager.cpp
|
||||
+++ b/src/templatemanager.cpp
|
||||
@@ -26,7 +26,11 @@ QString TemplateManager::builtinTemplateDir()
|
||||
@@ -27,7 +27,11 @@ QString TemplateManager::builtinTemplateDir()
|
||||
return fn;
|
||||
#endif
|
||||
#ifdef Q_OS_WIN
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
diff --git a/src/bidiextender.cpp b/src/bidiextender.cpp
|
||||
index 0e3794e5f..583cb805f 100644
|
||||
--- a/src/bidiextender.cpp
|
||||
+++ b/src/bidiextender.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
#if defined( Q_OS_WIN )
|
||||
#include "windows.h"
|
||||
+#include <cstdint>
|
||||
#else
|
||||
typedef int HKL;
|
||||
#endif
|
||||
@@ -43,7 +44,7 @@ HKL getCurrentLanguage()
|
||||
}
|
||||
|
||||
#if defined( Q_OS_WIN )
|
||||
-bool isProbablyLTRLanguageRaw(int id)
|
||||
+bool isProbablyLTRLanguageRaw(uintptr_t id)
|
||||
{
|
||||
//checks primary language symbol, e.g. LANG_ENGLISH would be ltr
|
||||
return id != LANG_PERSIAN && id != LANG_ARABIC && id != LANG_HEBREW && id != LANG_URDU;
|
||||
@@ -59,7 +60,7 @@ bool isProbablyLTRLanguageRaw(const std::string &symb)
|
||||
bool isProbablyLTRLanguageCode(HKL id)
|
||||
{
|
||||
#if defined( Q_OS_WIN )
|
||||
- return isProbablyLTRLanguageRaw(((int) id) & 0x000000FF);
|
||||
+ return isProbablyLTRLanguageRaw(((uintptr_t) id) & 0x000000FF);
|
||||
#elif defined( WS_X11 )
|
||||
try {
|
||||
kb::XKeyboard xkb;
|
||||
@@ -98,7 +99,7 @@ void initializeLanguages()
|
||||
|
||||
HKL bestLTR = 0;
|
||||
for (int i = 0; i < count; ++i) {
|
||||
- int id = (int)langs[i] & 0x000000FF;
|
||||
+ uintptr_t id = (uintptr_t)langs[i] & 0x000000FF;
|
||||
if (id == LANG_ENGLISH) bestLTR = langs[i];
|
||||
if (isProbablyLTRLanguageRaw(id)) {
|
||||
if (!bestLTR) bestLTR = langs[i];
|
||||
@ -3,13 +3,14 @@
|
||||
_realname=texstudio
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=4.8.7
|
||||
pkgver=4.8.9
|
||||
pkgrel=1
|
||||
pkgdesc="Integrated writing environment for creating LaTeX documents (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
|
||||
url="https://texstudio.sourceforge.net/"
|
||||
msys2_repository_url='https://github.com/texstudio-org/texstudio'
|
||||
msys2_changelog_url='https://texstudio-org.github.io/CHANGELOG.html'
|
||||
license=('spdx:GPL-3.0-or-later')
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
|
||||
"${MINGW_PACKAGE_PREFIX}-hunspell"
|
||||
@ -29,12 +30,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
optdepends=("${MINGW_PACKAGE_PREFIX}-evince: pdf reader")
|
||||
source=("${msys2_repository_url}/archive/${pkgver}/${_realname}-$pkgver.tar.gz"
|
||||
'0001-install-extra-files-on-mingw.patch'
|
||||
'0002-texstudio-4.2.2-fallbackpaths-win32-as-unix.patch'
|
||||
'0003-texstudio-4.2.3-fix-cast-to-smaller-type.patch')
|
||||
sha256sums=('b8272bc6a067b7132805f8877aad9bee077e80970728cdb889edef2bb23e3b70'
|
||||
'0002-texstudio-4.2.2-fallbackpaths-win32-as-unix.patch')
|
||||
sha256sums=('4d7e04fe076ae01da5773b5ae6e9386345a1cc2bf95dee8648e7bb2faa4adeea'
|
||||
'b89f798f910e54dc6618edc09ab2834537897b5b18e0590fcb75c3530d4796fb'
|
||||
'50695b93a29f9d0078d9a46e281a2366cae36d78d4ebd54e835151041fe7d359'
|
||||
'ee2a685c006f21312700ed9ea8fee5d93f22695540375c69ede13d83a2e03407')
|
||||
'a9f1dfadf40aa434b687e6a5738f7a61a1dabe258abc9b8f34f181987b25cf81')
|
||||
|
||||
apply_patch_with_msg() {
|
||||
for _patch in "$@"
|
||||
@ -49,8 +48,7 @@ prepare() {
|
||||
|
||||
apply_patch_with_msg \
|
||||
0001-install-extra-files-on-mingw.patch \
|
||||
0002-texstudio-4.2.2-fallbackpaths-win32-as-unix.patch \
|
||||
0003-texstudio-4.2.3-fix-cast-to-smaller-type.patch
|
||||
0002-texstudio-4.2.2-fallbackpaths-win32-as-unix.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user