dooble: update to 2024.08.20.

Closes: #51913 [via git-merge-pr]
This commit is contained in:
Eloi Torrents 2024-08-19 16:16:40 +02:00 committed by classabbyamp
parent 6d097b0ec3
commit 5bfbaf040a
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
4 changed files with 21 additions and 21 deletions

View File

@ -1,11 +1,11 @@
--- a/Source/dooble_settings.cc --- a/Source/dooble_settings.cc
+++ b/Source/dooble_settings.cc +++ b/Source/dooble_settings.cc
@@ -2271,7 +2271,7 @@ void dooble_settings::show_qtwebengine_dictionaries_warning_label(void) @@ -2307,7 +2307,7 @@ void dooble_settings::show_qtwebengine_dictionaries_warning_label(void)
if(bytes.trimmed().isEmpty()) if(bytes.trimmed().isEmpty())
{ {
- bytes = "qtwebengine_dictionaries"; auto const directory
+ bytes = "/usr/share/qt6/qtwebengine_dictionaries"; - (QDir::currentPath() + QDir::separator() + "qtwebengine_dictionaries");
+ ("/usr/share/qt6/qtwebengine_dictionaries");
if(!QFileInfo(bytes).isReadable()) m_ui.qtwebengine_dictionaries_warning_label->setText
{ (tr("<b>Warning!</b> "

View File

@ -1,20 +1,20 @@
--- a/Source/dooble_application.cc --- a/Source/dooble_application.cc
+++ b/Source/dooble_application.cc +++ b/Source/dooble_application.cc
@@ -76,16 +76,13 @@ void dooble_application::install_translator(void) @@ -75,16 +75,13 @@ void dooble_application::install_translator(void)
if(dooble_settings::setting("language_index").toInt() == 1) // System if(dooble_settings::setting("language_index").toInt() == 1) // System
{ {
- QString path(""); - QString path("");
+ QString path("/usr/share/translations/"); + QString path("/usr/share/translations/");
auto name(QLocale::system().name()); auto const name(QLocale::system().name());
auto variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed()); auto const variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
if(!variable.isEmpty()) if(!variable.isEmpty())
path = QString::fromLocal8Bit(variable.constData()); path = QString::fromLocal8Bit(variable.constData());
- if(path.isEmpty()) - if(path.isEmpty())
- path = QDir::currentPath() + QDir::separator() + "Translations"; - path = QDir::currentPath() + QDir::separator() + "Translations";
- -
m_translator = new QTranslator(this); m_translator = new QTranslator(this);
if(m_translator->load("dooble_" + name, path)) if(m_translator->load("dooble_" + name, path))

View File

@ -1,13 +1,13 @@
--- a/Source/dooble_settings.cc --- a/Source/dooble_settings.cc
+++ b/Source/dooble_settings.cc +++ b/Source/dooble_settings.cc
@@ -188,17 +188,11 @@ dooble_settings::dooble_settings(void):dooble_main_window() @@ -205,17 +205,11 @@ dooble_settings::dooble_settings(void):dooble_main_window()
} }
else else
{ {
- QString path(""); - QString path("");
+ QString path("/usr/share/dooble/translations/"); + QString path("/usr/share/dooble/translations/");
auto variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed()); auto const variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
if(!variable.isEmpty()) if(!variable.isEmpty())
path = QString::fromLocal8Bit(variable.constData()); path = QString::fromLocal8Bit(variable.constData());
- else - else
@ -16,6 +16,6 @@
- path.append(QDir::separator()); - path.append(QDir::separator());
- path.append("Translations"); - path.append("Translations");
- } - }
if(!path.endsWith(QDir::separator())) if(!path.endsWith(QDir::separator()))
path.append(QDir::separator()); path.append(QDir::separator());

View File

@ -1,7 +1,7 @@
# Template file for 'dooble' # Template file for 'dooble'
pkgname=dooble pkgname=dooble
version=2024.01.25 version=2024.08.20
revision=2 revision=1
archs="x86_64* aarch64*" archs="x86_64* aarch64*"
build_style=qmake build_style=qmake
configure_args="dooble.pro" configure_args="dooble.pro"
@ -11,11 +11,11 @@ makedepends="qt6-charts-private-devel qt6-webengine-devel qt6-webchannel-devel
qt6-location-devel qt6-wayland-devel python3-QtPy" qt6-location-devel qt6-wayland-devel python3-QtPy"
depends="qt6-plugin-sqlite" depends="qt6-plugin-sqlite"
short_desc="Dooble, the scientific browser. Minimal, cute, and unusually stable" short_desc="Dooble, the scientific browser. Minimal, cute, and unusually stable"
maintainer="Eloi Torrents <eloitor@disroot.org>" maintainer="Eloi Torrents <eloitor@duck.com>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://textbrowser.github.io/dooble/" homepage="https://textbrowser.github.io/dooble/"
distfiles="https://github.com/textbrowser/dooble/archive/refs/tags/${version}.tar.gz" distfiles="https://github.com/textbrowser/dooble/archive/refs/tags/${version}.tar.gz"
checksum=56f320170f612fed37ccec0452c3cccdb84583e3f7751550e9b1eee3d9a24281 checksum=dbacd6adf762964983a1943496cd435ea9e4cf269568141d85a3c12d67acbc1e
post_patch() { post_patch() {
vsed -i -e 's/Wzero-as-null-pointer-constant/Wno-zero-as-null-pointer-constant/' \ vsed -i -e 's/Wzero-as-null-pointer-constant/Wno-zero-as-null-pointer-constant/' \