Skip to content

Commit 0ac36a4

Browse files
authored
Merge branch 'textbrowser:master' into master
2 parents c5b5b9e + 14fe723 commit 0ac36a4

File tree

7 files changed

+357
-342
lines changed

7 files changed

+357
-342
lines changed

Distributions/PiOS/control

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Architecture: arm64
2-
Depends: libqt6charts6 (>= 6.0),
3-
libqt6core6 (>= 6.0),
4-
libqt6gui6 (>= 6.0),
5-
libqt6network6 (>= 6.0),
6-
libqt6printsupport6 (>= 6.0),
7-
libqt6qml6 (>= 6.0),
8-
libqt6sql6 (>= 6.0),
9-
libqt6webenginecore6 (>= 6.0),
10-
libqt6webenginewidgets6 (>= 6.0),
11-
libqt6widgets6 (>= 6.0)
2+
Depends: libqt6charts6,
3+
libqt6core6,
4+
libqt6gui6,
5+
libqt6network6,
6+
libqt6printsupport6,
7+
libqt6qml6,
8+
libqt6sql6,
9+
libqt6webenginecore6,
10+
libqt6webenginewidgets6,
11+
libqt6widgets6
1212
Maintainer: [email protected]
1313
Package: Dooble
1414
Priority: optional

Distributions/UBUNTU-NATIVE-24.04/control

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Architecture: amd64
2-
Depends: libgpgme11 (>= 1.16.0),
3-
libqt5charts5 (>= 5.15.0),
4-
libqt5core5a (>= 5.15.0),
5-
libqt5gui5 (>= 5.15.0),
6-
libqt5network5 (>= 5.15.0),
7-
libqt5printsupport5 (>= 5.15.0),
8-
libqt5qml5 (>= 5.15.0),
9-
libqt5sql5 (>= 5.15.0),
10-
libqt5webenginecore5 (>= 5.15.0),
11-
libqt5webenginewidgets5 (>= 5.15.0),
12-
libqt5widgets5 (>= 5.15.0)
2+
Depends: libgpgme11,
3+
libqt5charts5,
4+
libqt5core5a,
5+
libqt5gui5,
6+
libqt5network5,
7+
libqt5printsupport5,
8+
libqt5qml5,
9+
libqt5sql5,
10+
libqt5webenginecore5,
11+
libqt5webenginewidgets5,
12+
libqt5widgets5
1313
Maintainer: [email protected]
1414
Package: Dooble
1515
Priority: optional

Distributions/build_debian_amd64.bash

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ cp -p ~/Qt/6.8.0/gcc_64/lib/libQt6WebEngineCore.so.6 ./opt/dooble/Lib/.
4141
cp -p ~/Qt/6.8.0/gcc_64/lib/libQt6WebEngineWidgets.so.6 ./opt/dooble/Lib/.
4242
cp -p ~/Qt/6.8.0/gcc_64/lib/libQt6Widgets.so.6 ./opt/dooble/Lib/.
4343
cp -p ~/Qt/6.8.0/gcc_64/lib/libQt6XcbQpa.so.6 ./opt/dooble/Lib/.
44-
cp -p ~/Qt/6.8.0/gcc_64/lib/libicudata.so.56 ./opt/dooble/Lib/.
45-
cp -p ~/Qt/6.8.0/gcc_64/lib/libicui18n.so.56 ./opt/dooble/Lib/.
46-
cp -p ~/Qt/6.8.0/gcc_64/lib/libicuuc.so.56 ./opt/dooble/Lib/.
44+
cp -p ~/Qt/6.8.0/gcc_64/lib/libicudata.so.73 ./opt/dooble/Lib/.
45+
cp -p ~/Qt/6.8.0/gcc_64/lib/libicui18n.so.73 ./opt/dooble/Lib/.
46+
cp -p ~/Qt/6.8.0/gcc_64/lib/libicuio.so.73 ./opt/dooble/Lib/.
47+
cp -p ~/Qt/6.8.0/gcc_64/lib/libicuuc.so.73 ./opt/dooble/Lib/.
48+
cp -p ~/Qt/6.8.0/gcc_64/lib/libicuuc.so.73 ./opt/dooble/Lib/.
4749
cp -p ~/Qt/6.8.0/gcc_64/libexec/QtWebEngineProcess ./opt/dooble/.
4850
cp -pr ~/Qt/6.8.0/gcc_64/plugins ./opt/dooble/.
4951
cp -pr ~/Qt/6.8.0/gcc_64/resources/* ./opt/dooble/.

Documentation/ReleaseNotes.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<title>Dooble Release Notes</title>
3232
<div class="css">
3333
<p>
34-
<h3><b>Dooble 2024.00.00</b></h3>
35-
Welcome to the <b>2024.00.00</b> release of Dooble. Corrections and new features are detailed below.
34+
<h3><b>Dooble 2024.11.17</b></h3>
35+
Welcome to the <b>2024.11.17</b> release of Dooble. Corrections and new features are detailed below.
3636
<ul>
3737
<li>Clear Items: new JavaScript Scripts, Style Sheets.</li>
3838
<li>Inject JavaScript scripts into loaded pages. GitHub ticket <a href="https://github.com/textbrowser/dooble/issues/239">#239</a>.</li>
@@ -46,6 +46,8 @@ <h3><b>Dooble 2024.00.00</b></h3>
4646
<li>Publish page: Title, URL, HTML.</li>
4747
<li>Qt 6.8 LTS. Web permissions are wonky.</li>
4848
<li>Show all hosts and scripts in JavaScript Console. Scripts may be deleted and edited.</li>
49+
<li>Spelling corrections in this file.</li>
50+
<li>The Dictionaries directory has been moved into its own repository. Please see https://github.com/textbrowser/dooble-dictionaries. The environment variable DOOBLE_DICTIONARIES_DIRECTORY should be set to the absolute path of Dictionaries.</li>
4951
<li>The top-left corner widget may not be available. Locking Dooble will result in an abnormal termination.</li>
5052
</ul>
5153
</p>
@@ -158,7 +160,7 @@ <h3><b>Dooble 2023.08.30</b></h3>
158160
<h3><b>Dooble 2023.07.15</b></h3>
159161
Welcome to the <b>2023.07.15</b> release of Dooble. Corrections and new features are detailed below.
160162
<ul>
161-
<li>Display discovered shorcuts in Settings -> Display. Read-only. GitHub ticket <a href="https://github.com/textbrowser/dooble/issues/103">#103</a>.</li>
163+
<li>Display discovered shortcuts in Settings -> Display. Read-only. GitHub ticket <a href="https://github.com/textbrowser/dooble/issues/103">#103</a>.</li>
162164
<li>Initialize s[i] elements in Threefish.</li>
163165
<li>Introduced --attach and --listen command-line options. If a Dooble instance is available, a new Dooble instance will attach its URLs to the existing Dooble instance. GitHub ticket <a href="https://github.com/textbrowser/dooble/issues/182">#182</a>.</li>
164166
<li>New executable-current-url command-line option. See Tools -> Current URL Executable(s). Multiple instances are allowed and Dooble does not verify content. GitHub discussion <a href="https://github.com/textbrowser/dooble/discussions/193">#193</a>.</li>

Source/dooble_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727

2828
#ifndef DOOBLE_VERSION_STRING
29-
#define DOOBLE_VERSION_STRING "2024.09.29"
29+
#define DOOBLE_VERSION_STRING "2024.11.17"
3030
#endif
3131
#ifndef DOOBLE_VERSION_STRING_LTS
3232
#define DOOBLE_VERSION_STRING_LTS "2024.09.29"
File renamed without changes.

0 commit comments

Comments
 (0)