* [PR PATCH] dooble: update to 2024.08.19.
@ 2024-08-19 14:18 Eloitor
2024-08-20 11:42 ` slymattz
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Eloitor @ 2024-08-19 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
There is a new pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages dooble
https://github.com/void-linux/void-packages/pull/51913
dooble: update to 2024.08.19.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51913.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dooble-51913.patch --]
[-- Type: text/x-diff, Size: 5025 bytes --]
From 94dc5aabf915b516dd926c3948b19106bd348c2d Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 19 Aug 2024 16:16:40 +0200
Subject: [PATCH] dooble: update to 2024.08.19.
---
srcpkgs/dooble/patches/dictionaries.patch | 12 ++++++------
.../patches/translations-dooble_application.patch | 14 +++++++-------
.../patches/translations-dooble_settings.patch | 8 ++++----
srcpkgs/dooble/template | 8 ++++----
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/dooble/patches/dictionaries.patch b/srcpkgs/dooble/patches/dictionaries.patch
index f8bf80ee34466b..c8cf113cc6c571 100644
--- a/srcpkgs/dooble/patches/dictionaries.patch
+++ b/srcpkgs/dooble/patches/dictionaries.patch
@@ -1,11 +1,11 @@
--- a/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())
{
-- bytes = "qtwebengine_dictionaries";
-+ bytes = "/usr/share/qt6/qtwebengine_dictionaries";
+ auto const directory
+- (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> "
diff --git a/srcpkgs/dooble/patches/translations-dooble_application.patch b/srcpkgs/dooble/patches/translations-dooble_application.patch
index 2072e9150e6727..af558d1a4c0b15 100644
--- a/srcpkgs/dooble/patches/translations-dooble_application.patch
+++ b/srcpkgs/dooble/patches/translations-dooble_application.patch
@@ -1,20 +1,20 @@
--- a/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
{
- QString path("");
+ QString path("/usr/share/translations/");
- auto name(QLocale::system().name());
- auto variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
-
+ auto const name(QLocale::system().name());
+ auto const variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
+
if(!variable.isEmpty())
path = QString::fromLocal8Bit(variable.constData());
-
+
- if(path.isEmpty())
- path = QDir::currentPath() + QDir::separator() + "Translations";
-
m_translator = new QTranslator(this);
-
+
if(m_translator->load("dooble_" + name, path))
\ No newline at end of file
diff --git a/srcpkgs/dooble/patches/translations-dooble_settings.patch b/srcpkgs/dooble/patches/translations-dooble_settings.patch
index 726a248105f537..02be5cfb1567a5 100644
--- a/srcpkgs/dooble/patches/translations-dooble_settings.patch
+++ b/srcpkgs/dooble/patches/translations-dooble_settings.patch
@@ -1,13 +1,13 @@
--- a/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
{
- QString path("");
+ QString path("/usr/share/dooble/translations/");
- auto variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
-
+ auto const variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
+
if(!variable.isEmpty())
path = QString::fromLocal8Bit(variable.constData());
- else
@@ -16,6 +16,6 @@
- path.append(QDir::separator());
- path.append("Translations");
- }
-
+
if(!path.endsWith(QDir::separator()))
path.append(QDir::separator());
\ No newline at end of file
diff --git a/srcpkgs/dooble/template b/srcpkgs/dooble/template
index 42b702d7b0db92..0f86bf5ec9aaf6 100644
--- a/srcpkgs/dooble/template
+++ b/srcpkgs/dooble/template
@@ -1,7 +1,7 @@
# Template file for 'dooble'
pkgname=dooble
-version=2024.01.25
-revision=2
+version=2024.08.19
+revision=1
archs="x86_64* aarch64*"
build_style=qmake
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"
depends="qt6-plugin-sqlite"
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"
homepage="https://textbrowser.github.io/dooble/"
distfiles="https://github.com/textbrowser/dooble/archive/refs/tags/${version}.tar.gz"
-checksum=56f320170f612fed37ccec0452c3cccdb84583e3f7751550e9b1eee3d9a24281
+checksum=bb5268ec3ceb036587fb3cc2fec33accbe05c57b5904fd45359bc84eb4616209
post_patch() {
vsed -i -e 's/Wzero-as-null-pointer-constant/Wno-zero-as-null-pointer-constant/' \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dooble: update to 2024.08.19.
2024-08-19 14:18 [PR PATCH] dooble: update to 2024.08.19 Eloitor
@ 2024-08-20 11:42 ` slymattz
2024-08-20 12:05 ` slymattz
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: slymattz @ 2024-08-20 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51913#issuecomment-2298652968
Comment:
Hi! Is arch restriction the way to go here or should _broken_ get populated after a proper host-target wordsize check? https://github.com/void-linux/void-packages/pull/51071#discussion_r1694265191
I'm asking in terms of the potential introduction of a new architecture in the future.
@sgn @classabbyamp
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dooble: update to 2024.08.19.
2024-08-19 14:18 [PR PATCH] dooble: update to 2024.08.19 Eloitor
2024-08-20 11:42 ` slymattz
@ 2024-08-20 12:05 ` slymattz
2024-08-21 7:56 ` [PR PATCH] [Updated] " Eloitor
2024-09-24 21:02 ` [PR PATCH] [Closed]: dooble: update to 2024.08.20 classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: slymattz @ 2024-08-20 12:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51913#issuecomment-2298652968
Comment:
Hi! Is arch restriction the way to go here or should _broken_ get populated after a proper host-target wordsize check? https://github.com/void-linux/void-packages/pull/51071#discussion_r1694265191
I'm asking in terms of consistency sake.
@sgn @classabbyamp
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] dooble: update to 2024.08.19.
2024-08-19 14:18 [PR PATCH] dooble: update to 2024.08.19 Eloitor
2024-08-20 11:42 ` slymattz
2024-08-20 12:05 ` slymattz
@ 2024-08-21 7:56 ` Eloitor
2024-09-24 21:02 ` [PR PATCH] [Closed]: dooble: update to 2024.08.20 classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: Eloitor @ 2024-08-21 7:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
There is an updated pull request by Eloitor against master on the void-packages repository
https://github.com/Eloitor/void-packages dooble
https://github.com/void-linux/void-packages/pull/51913
dooble: update to 2024.08.19.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51913.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dooble-51913.patch --]
[-- Type: text/x-diff, Size: 5025 bytes --]
From 755d18914bb62a06d4085a7de51cf89642de7f18 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 19 Aug 2024 16:16:40 +0200
Subject: [PATCH] dooble: update to 2024.08.20.
---
srcpkgs/dooble/patches/dictionaries.patch | 12 ++++++------
.../patches/translations-dooble_application.patch | 14 +++++++-------
.../patches/translations-dooble_settings.patch | 8 ++++----
srcpkgs/dooble/template | 8 ++++----
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/dooble/patches/dictionaries.patch b/srcpkgs/dooble/patches/dictionaries.patch
index f8bf80ee34466b..c8cf113cc6c571 100644
--- a/srcpkgs/dooble/patches/dictionaries.patch
+++ b/srcpkgs/dooble/patches/dictionaries.patch
@@ -1,11 +1,11 @@
--- a/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())
{
-- bytes = "qtwebengine_dictionaries";
-+ bytes = "/usr/share/qt6/qtwebengine_dictionaries";
+ auto const directory
+- (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> "
diff --git a/srcpkgs/dooble/patches/translations-dooble_application.patch b/srcpkgs/dooble/patches/translations-dooble_application.patch
index 2072e9150e6727..af558d1a4c0b15 100644
--- a/srcpkgs/dooble/patches/translations-dooble_application.patch
+++ b/srcpkgs/dooble/patches/translations-dooble_application.patch
@@ -1,20 +1,20 @@
--- a/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
{
- QString path("");
+ QString path("/usr/share/translations/");
- auto name(QLocale::system().name());
- auto variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
-
+ auto const name(QLocale::system().name());
+ auto const variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
+
if(!variable.isEmpty())
path = QString::fromLocal8Bit(variable.constData());
-
+
- if(path.isEmpty())
- path = QDir::currentPath() + QDir::separator() + "Translations";
-
m_translator = new QTranslator(this);
-
+
if(m_translator->load("dooble_" + name, path))
\ No newline at end of file
diff --git a/srcpkgs/dooble/patches/translations-dooble_settings.patch b/srcpkgs/dooble/patches/translations-dooble_settings.patch
index 726a248105f537..02be5cfb1567a5 100644
--- a/srcpkgs/dooble/patches/translations-dooble_settings.patch
+++ b/srcpkgs/dooble/patches/translations-dooble_settings.patch
@@ -1,13 +1,13 @@
--- a/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
{
- QString path("");
+ QString path("/usr/share/dooble/translations/");
- auto variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
-
+ auto const variable(qgetenv("DOOBLE_TRANSLATIONS_PATH").trimmed());
+
if(!variable.isEmpty())
path = QString::fromLocal8Bit(variable.constData());
- else
@@ -16,6 +16,6 @@
- path.append(QDir::separator());
- path.append("Translations");
- }
-
+
if(!path.endsWith(QDir::separator()))
path.append(QDir::separator());
\ No newline at end of file
diff --git a/srcpkgs/dooble/template b/srcpkgs/dooble/template
index 42b702d7b0db92..d4d9be4961b9c9 100644
--- a/srcpkgs/dooble/template
+++ b/srcpkgs/dooble/template
@@ -1,7 +1,7 @@
# Template file for 'dooble'
pkgname=dooble
-version=2024.01.25
-revision=2
+version=2024.08.20
+revision=1
archs="x86_64* aarch64*"
build_style=qmake
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"
depends="qt6-plugin-sqlite"
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"
homepage="https://textbrowser.github.io/dooble/"
distfiles="https://github.com/textbrowser/dooble/archive/refs/tags/${version}.tar.gz"
-checksum=56f320170f612fed37ccec0452c3cccdb84583e3f7751550e9b1eee3d9a24281
+checksum=dbacd6adf762964983a1943496cd435ea9e4cf269568141d85a3c12d67acbc1e
post_patch() {
vsed -i -e 's/Wzero-as-null-pointer-constant/Wno-zero-as-null-pointer-constant/' \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: dooble: update to 2024.08.20.
2024-08-19 14:18 [PR PATCH] dooble: update to 2024.08.19 Eloitor
` (2 preceding siblings ...)
2024-08-21 7:56 ` [PR PATCH] [Updated] " Eloitor
@ 2024-09-24 21:02 ` classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2024-09-24 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There's a closed pull request on the void-packages repository
dooble: update to 2024.08.20.
https://github.com/void-linux/void-packages/pull/51913
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-24 21:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-19 14:18 [PR PATCH] dooble: update to 2024.08.19 Eloitor
2024-08-20 11:42 ` slymattz
2024-08-20 12:05 ` slymattz
2024-08-21 7:56 ` [PR PATCH] [Updated] " Eloitor
2024-09-24 21:02 ` [PR PATCH] [Closed]: dooble: update to 2024.08.20 classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).