Bug#1109597: unblock: alligator/25.04.3-1
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: alligator@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:alligator
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
please unblock package alligator.
[ Reason ]
* New upstream point release (25.04.3).
- Fix loading of resources with relative URLs in feeds.
- Fix handling of cross article URLs omitting the website’s hostname.
The complete debdiff is a bit big due to translations so I’m attaching a
trimmed down version without these for your convenience :
diff -ur --exclude=po alligator-25.04.[03]
[ Tests ]
Tested the app successfully with my usual feeds from an OPML import.
[ Risks ]
New upstream point release, low risk.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
Thanks !
unblock alligator/25.04.3-1
diff -Nru alligator-25.04.0/CMakeLists.txt alligator-25.04.3/CMakeLists.txt
--- alligator-25.04.0/CMakeLists.txt 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/CMakeLists.txt 2025-06-30 18:52:53.000000000 +0200
@@ -7,7 +7,7 @@
# KDE Applications version, managed by release script.
set(RELEASE_SERVICE_VERSION_MAJOR "25")
set(RELEASE_SERVICE_VERSION_MINOR "04")
-set(RELEASE_SERVICE_VERSION_MICRO "0")
+set(RELEASE_SERVICE_VERSION_MICRO "3")
set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(alligator VERSION ${RELEASE_SERVICE_VERSION})
diff -Nru alligator-25.04.0/debian/changelog alligator-25.04.3/debian/changelog
--- alligator-25.04.0/debian/changelog 2025-06-03 20:14:21.000000000 +0200
+++ alligator-25.04.3/debian/changelog 2025-07-05 10:23:00.000000000 +0200
@@ -1,3 +1,14 @@
+alligator (25.04.3-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Aurélien COUDERC ]
+ * New upstream point release (25.04.3).
+ - Fix loading of resources with relative URLs in feeds.
+ - Fix handling of cross article URLs omitting the website’s hostname.
+
+ -- Aurélien COUDERC <coucouf@debian.org> Sat, 05 Jul 2025 10:23:00 +0200
+
alligator (25.04.0-4) unstable; urgency=medium
* Add patch to copy the URL of an article
diff -Nru alligator-25.04.0/org.kde.alligator.appdata.xml alligator-25.04.3/org.kde.alligator.appdata.xml
--- alligator-25.04.0/org.kde.alligator.appdata.xml 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/org.kde.alligator.appdata.xml 2025-06-30 18:52:53.000000000 +0200
@@ -50,6 +50,7 @@
<summary xml:lang="ar">قارئ التّغذيات RSS</summary>
<summary xml:lang="ca">Lector de fonts RSS</summary>
<summary xml:lang="ca-valencia">Lector de fonts RSS</summary>
+ <summary xml:lang="de">RSS-Nachrichtenbetrachter</summary>
<summary xml:lang="en-GB">RSS feed reader</summary>
<summary xml:lang="eo">RSS-flua legilo</summary>
<summary xml:lang="es">Lector de fuentes RSS</summary>
@@ -90,6 +91,7 @@
<p xml:lang="ar">قاطور هو قارئ موجزات متقارب ومتعدد الأنظمة، ويدعم موجزات RSS/Atom القياسية</p>
<p xml:lang="ca">Alligator és un lector de fonts convergent i multiplataforma, que admet canals RSS/Atom estàndard</p>
<p xml:lang="ca-valencia">Alligator és un lector de fonts convergent i multiplataforma, que admet canals RSS/Atom estàndard</p>
+ <p xml:lang="de">Alligator ist ein konvergenter, plattformübergreifender Nachrichtenbetrachter mit Unterstützung für RSS/Atom-Nachrichtenquellen</p>
<p xml:lang="en-GB">Alligator is a convergent, cross-platform feed reader, supporting standard RSS/Atom feeds</p>
<p xml:lang="eo">Aligatoro estas konverĝa, plurplatforma leganto, subtenanta normajn RSS/Atom-fluojn</p>
<p xml:lang="es">Alligator es un lector de fuentes convergente y multiplataforma compatible con fuentes RSS/Atom estándar</p>
@@ -210,6 +212,9 @@
</screenshots>
<launchable type="desktop-id">org.kde.alligator.desktop</launchable>
<releases>
+ <release version="25.04.3" date="2025-07-03"/>
+ <release version="25.04.2" date="2025-06-05"/>
+ <release version="25.04.1" date="2025-05-08"/>
<release version="25.04.0" date="2025-04-17"/>
<release version="24.12.3" date="2025-03-06"/>
<release version="24.12.2" date="2025-02-06"/>
diff -Nru alligator-25.04.0/po/ar/alligator.po alligator-25.04.3/po/ar/alligator.po
--- alligator-25.04.0/po/ar/alligator.po 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/po/ar/alligator.po 2025-06-30 18:52:53.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: alligator\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2025-03-01 00:46+0000\n"
-"PO-Revision-Date: 2025-01-17 07:05+0400\n"
+"PO-Revision-Date: 2025-06-28 17:29+0400\n"
"Last-Translator: Zayed Al-Saidi <zayed.alsaidi@gmail.com>\n"
"Language-Team: ar\n"
"Language: ar\n"
@@ -164,7 +164,7 @@
#: qml/EntryListPage.qml:45
#, kde-format
msgid "Refresh"
-msgstr "أنعش"
+msgstr "حدّث"
#: qml/EntryListPage.qml:51
#, kde-format
@@ -328,7 +328,7 @@
#: qml/FeedListPage.qml:30
#, kde-format
msgid "Refresh All Feeds"
-msgstr "أنعش كل التلقيمات"
+msgstr "حدّث كل التلقيمات"
#: qml/FeedListPage.qml:36
#, kde-format
diff -Nru alligator-25.04.0/po/de/alligator.po alligator-25.04.3/po/de/alligator.po
--- alligator-25.04.0/po/de/alligator.po 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/po/de/alligator.po 2025-06-30 18:52:53.000000000 +0200
@@ -3,21 +3,22 @@
# Burkhard Lück <lueck@hube-lueck.de>, 2020, 2021.
# Frederik Schwarzer <schwarzer@kde.org>, 2022, 2023.
# SPDX-FileCopyrightText: 2024 Johannes Obermayr <johannesobermayr@gmx.de>
+# SPDX-FileCopyrightText: 2025 Flori G <Renner03@protonmail.com>
#
msgid ""
msgstr ""
"Project-Id-Version: alligator\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2025-03-01 00:46+0000\n"
-"PO-Revision-Date: 2024-08-20 19:39+0200\n"
-"Last-Translator: Johannes Obermayr <johannesobermayr@gmx.de>\n"
+"PO-Revision-Date: 2025-03-26 16:49+0100\n"
+"Last-Translator: Flori G <Renner03@protonmail.com>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 24.05.2\n"
+"X-Generator: Lokalize 24.12.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -97,7 +98,7 @@
#: qml/AddFeedDialog.qml:25
#, kde-format
msgid "URL"
-msgstr ""
+msgstr "Adresse"
#: qml/AddFeedDialog.qml:32
#, kde-format
@@ -142,10 +143,9 @@
msgstr "Nachrichtenquelle bearbeiten"
#: qml/EditFeedDialog.qml:33
-#, fuzzy, kde-format
-#| msgid "feed URL"
+#, kde-format
msgid "Feed URL:"
-msgstr "Adresse der Nachrichtenquelle"
+msgstr "Adresse der Nachrichtenquelle:"
#: qml/EditFeedDialog.qml:41
#, kde-format
@@ -169,11 +169,10 @@
msgstr "Aktualisieren"
#: qml/EntryListPage.qml:51
-#, fuzzy, kde-format
-#| msgid "Mark as read"
+#, kde-format
msgctxt "@action:button"
msgid "Mark all read"
-msgstr "Als gelesen markieren"
+msgstr "Alle als gelesen markieren"
#: qml/EntryListPage.qml:63
#, kde-format
@@ -211,10 +210,9 @@
msgstr "Keine ungelesenen Einträge verfügbar"
#: qml/EntryListPage.qml:127
-#, fuzzy, kde-format
-#| msgid "No unread entries available"
+#, kde-format
msgid "No favorite entries available"
-msgstr "Keine ungelesenen Einträge verfügbar"
+msgstr "Keine Favoriteneinträge verfügbar"
#: qml/EntryListPage.qml:129
#, kde-format
@@ -234,19 +232,19 @@
#: qml/EntryListPage.qml:185
#, kde-format
msgid "Favorites"
-msgstr ""
+msgstr "Favoriten"
#: qml/EntryPage.qml:69
#, kde-format
msgctxt "@action:button"
msgid "Remove from Favorites"
-msgstr ""
+msgstr "Aus Favoriten entfernen"
#: qml/EntryPage.qml:69
#, kde-format
msgctxt "@action:button"
msgid "Add to Favorites"
-msgstr ""
+msgstr "Zu Favoriten hinzufügen"
#: qml/EntryPage.qml:77
#, kde-format
@@ -262,7 +260,7 @@
#: qml/FeedDetailsPage.qml:25
#, kde-format
msgid "Close"
-msgstr ""
+msgstr "Schließen"
#: qml/FeedDetailsPage.qml:46
#, kde-format
diff -Nru alligator-25.04.0/po/es/alligator.po alligator-25.04.3/po/es/alligator.po
--- alligator-25.04.0/po/es/alligator.po 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/po/es/alligator.po 2025-06-30 18:52:53.000000000 +0200
@@ -1,15 +1,15 @@
# Spanish translations for alligator.po package.
-# Copyright (C) 2020 This file is copyright:
+# Copyright (C) 2020-2025 This file is copyright:
# This file is distributed under the same license as the alligator package.
-#
# Automatically generated, 2020.
+#
# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024, 2025 Eloy Cuadra <ecuadra@eloihr.net>
msgid ""
msgstr ""
"Project-Id-Version: alligator\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2025-03-01 00:46+0000\n"
-"PO-Revision-Date: 2025-01-16 07:51+0100\n"
+"PO-Revision-Date: 2025-06-29 14:00+0100\n"
"Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
"Language-Team: Spanish <kde-l10n-es@kde.org>\n"
"Language: es\n"
@@ -330,7 +330,7 @@
#: qml/FeedListPage.qml:36
#, kde-format
msgid "Add Feed…"
-msgstr "Añadir emisión web..."
+msgstr "Añadir emisión web…"
#: qml/FeedListPage.qml:40
#, kde-format
@@ -346,12 +346,12 @@
#: qml/FeedListPage.qml:51
#, kde-format
msgid "Import Feeds…"
-msgstr "Importar emisiones web..."
+msgstr "Importar emisiones web…"
#: qml/FeedListPage.qml:56
#, kde-format
msgid "Export Feeds…"
-msgstr "Exportar emisiones web..."
+msgstr "Exportar emisiones web…"
#: qml/FeedListPage.qml:86
#, kde-format
@@ -396,7 +396,7 @@
#: qml/GroupsListPage.qml:24
#, kde-format
msgid "Add Group…"
-msgstr "Añadir grupo..."
+msgstr "Añadir grupo…"
#: qml/GroupsListPage.qml:55
#, kde-format
@@ -468,45 +468,3 @@
#, kde-format
msgid "Use system default"
msgstr "Usar el predeterminado del sistema"
-
-#~ msgid "Url"
-#~ msgstr "URL"
-
-#~ msgid "Import Feeds..."
-#~ msgstr "Importar emisiones web..."
-
-#~ msgid "Export Feeds..."
-#~ msgstr "Exportar emisiones web..."
-
-#~ msgid "OK"
-#~ msgstr "Aceptar"
-
-#~ msgid "Configure Groups"
-#~ msgstr "Configurar grupos"
-
-#~ msgid "Mark as unread"
-#~ msgstr "Marcar como no leído"
-
-#~ msgid "Show all entries"
-#~ msgstr "Mostrar todas las entradas"
-
-#~ msgid "Show only unread entries"
-#~ msgstr "Mostrar solo las entradas sin leer"
-
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
-#~ msgid "Feed group"
-#~ msgstr "Grupo de emisiones web"
-
-#~ msgid "Add feed"
-#~ msgstr "Añadir emisión web"
-
-#~ msgid "Add new Feed"
-#~ msgstr "Añadir nueva emisión web"
-
-#~ msgid "Posts"
-#~ msgstr "Publicaciones"
-
-#~ msgid "Save"
-#~ msgstr "Guardar"
diff -Nru alligator-25.04.0/po/hu/alligator.po alligator-25.04.3/po/hu/alligator.po
--- alligator-25.04.0/po/hu/alligator.po 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/po/hu/alligator.po 2025-06-30 18:52:53.000000000 +0200
@@ -2,13 +2,13 @@
# This file is distributed under the same license as the alligator package.
#
# Kristóf Kiszel <kiszel.kristof@gmail.com>, 2020, 2021.
-# SPDX-FileCopyrightText: 2021, 2022, 2024 Kristof Kiszel <ulysses@fsf.hu>
+# SPDX-FileCopyrightText: 2021, 2022, 2024, 2025 Kristof Kiszel <ulysses@fsf.hu>
msgid ""
msgstr ""
"Project-Id-Version: alligator\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2025-03-01 00:46+0000\n"
-"PO-Revision-Date: 2024-11-18 22:17+0100\n"
+"PO-Revision-Date: 2025-04-21 22:18+0200\n"
"Last-Translator: Kristof Kiszel <ulysses@fsf.hu>\n"
"Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
"Language: hu\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 24.08.3\n"
+"X-Generator: Lokalize 25.04.0\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -96,7 +96,7 @@
#: qml/AddFeedDialog.qml:25
#, kde-format
msgid "URL"
-msgstr ""
+msgstr "URL"
#: qml/AddFeedDialog.qml:32
#, kde-format
@@ -141,10 +141,9 @@
msgstr "Csatorna szerkesztése"
#: qml/EditFeedDialog.qml:33
-#, fuzzy, kde-format
-#| msgid "feed URL"
+#, kde-format
msgid "Feed URL:"
-msgstr "Csatorna URL"
+msgstr "Csatorna URL:"
#: qml/EditFeedDialog.qml:41
#, kde-format
@@ -168,11 +167,10 @@
msgstr "Frissítés"
#: qml/EntryListPage.qml:51
-#, fuzzy, kde-format
-#| msgid "Mark entries as read"
+#, kde-format
msgctxt "@action:button"
msgid "Mark all read"
-msgstr "Bejegyzések megjelölése olvasottként"
+msgstr "Összes megjelölése olvasottként"
#: qml/EntryListPage.qml:63
#, kde-format
diff -Nru alligator-25.04.0/po/pl/alligator.po alligator-25.04.3/po/pl/alligator.po
--- alligator-25.04.0/po/pl/alligator.po 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/po/pl/alligator.po 2025-06-30 18:52:53.000000000 +0200
@@ -17,7 +17,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 24.12.1\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
diff -Nru alligator-25.04.0/src/contenthelper.cpp alligator-25.04.3/src/contenthelper.cpp
--- alligator-25.04.0/src/contenthelper.cpp 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/src/contenthelper.cpp 2025-06-30 18:52:53.000000000 +0200
@@ -12,13 +12,19 @@
{
}
-void ContentHelper::openLink(const QString &link)
+void ContentHelper::openLink(const QString &link, const QString &baseUrl)
{
QUrl url(link);
if (link.startsWith(QStringLiteral("//"))) {
// we a protocol-relative, see https://en.wikipedia.org/wiki/Wikipedia:Protocol-relative_URL
url.setScheme(QUrl(link).scheme());
}
+
+ if (url.isRelative()) {
+ QUrl articleUrl(baseUrl);
+ url.setHost(articleUrl.host());
+ url.setScheme(articleUrl.scheme());
+ }
QDesktopServices::openUrl(url);
}
diff -Nru alligator-25.04.0/src/contenthelper.h alligator-25.04.3/src/contenthelper.h
--- alligator-25.04.0/src/contenthelper.h 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/src/contenthelper.h 2025-06-30 18:52:53.000000000 +0200
@@ -15,6 +15,6 @@
public:
explicit ContentHelper(QObject *parent = nullptr);
- Q_INVOKABLE void openLink(const QString &link);
+ Q_INVOKABLE void openLink(const QString &link, const QString &baseUrl);
Q_INVOKABLE QString adjustedContent(int width, int fontSize, const QString &content);
};
diff -Nru alligator-25.04.0/src/qml/EntryPage.qml alligator-25.04.3/src/qml/EntryPage.qml
--- alligator-25.04.0/src/qml/EntryPage.qml 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/src/qml/EntryPage.qml 2025-06-30 18:52:53.000000000 +0200
@@ -53,11 +53,11 @@
id: contentLabel
text: page.content
- baseUrl: page.baseUrl
+ baseUrl: page.link
textFormat: Text.RichText
wrapMode: Text.WordWrap
Layout.fillWidth: true
- onLinkActivated: link => contentHelper.openLink(link)
+ onLinkActivated: link => contentHelper.openLink(link, page.baseUrl)
font.pointSize: !(AlligatorSettings.articleFontUseSystem) ? AlligatorSettings.articleFontSize : Kirigami.Theme.defaultFont.pointSize
}
}
diff -ur '--exclude=po' alligator-25.04.0/CMakeLists.txt alligator-25.04.3/CMakeLists.txt
--- alligator-25.04.0/CMakeLists.txt 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/CMakeLists.txt 2025-06-30 18:52:53.000000000 +0200
@@ -7,7 +7,7 @@
# KDE Applications version, managed by release script.
set(RELEASE_SERVICE_VERSION_MAJOR "25")
set(RELEASE_SERVICE_VERSION_MINOR "04")
-set(RELEASE_SERVICE_VERSION_MICRO "0")
+set(RELEASE_SERVICE_VERSION_MICRO "3")
set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(alligator VERSION ${RELEASE_SERVICE_VERSION})
diff -ur '--exclude=po' alligator-25.04.0/debian/changelog alligator-25.04.3/debian/changelog
--- alligator-25.04.0/debian/changelog 2025-06-03 20:14:21.000000000 +0200
+++ alligator-25.04.3/debian/changelog 2025-07-05 10:23:00.000000000 +0200
@@ -1,3 +1,14 @@
+alligator (25.04.3-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Aurélien COUDERC ]
+ * New upstream point release (25.04.3).
+ - Fix loading of resources with relative URLs in feeds.
+ - Fix handling of cross article URLs omitting the website’s hostname.
+
+ -- Aurélien COUDERC <coucouf@debian.org> Sat, 05 Jul 2025 10:23:00 +0200
+
alligator (25.04.0-4) unstable; urgency=medium
* Add patch to copy the URL of an article
diff -ur '--exclude=po' alligator-25.04.0/org.kde.alligator.appdata.xml alligator-25.04.3/org.kde.alligator.appdata.xml
--- alligator-25.04.0/org.kde.alligator.appdata.xml 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/org.kde.alligator.appdata.xml 2025-06-30 18:52:53.000000000 +0200
@@ -50,6 +50,7 @@
<summary xml:lang="ar">قارئ التّغذيات RSS</summary>
<summary xml:lang="ca">Lector de fonts RSS</summary>
<summary xml:lang="ca-valencia">Lector de fonts RSS</summary>
+ <summary xml:lang="de">RSS-Nachrichtenbetrachter</summary>
<summary xml:lang="en-GB">RSS feed reader</summary>
<summary xml:lang="eo">RSS-flua legilo</summary>
<summary xml:lang="es">Lector de fuentes RSS</summary>
@@ -90,6 +91,7 @@
<p xml:lang="ar">قاطور هو قارئ موجزات متقارب ومتعدد الأنظمة، ويدعم موجزات RSS/Atom القياسية</p>
<p xml:lang="ca">Alligator és un lector de fonts convergent i multiplataforma, que admet canals RSS/Atom estàndard</p>
<p xml:lang="ca-valencia">Alligator és un lector de fonts convergent i multiplataforma, que admet canals RSS/Atom estàndard</p>
+ <p xml:lang="de">Alligator ist ein konvergenter, plattformübergreifender Nachrichtenbetrachter mit Unterstützung für RSS/Atom-Nachrichtenquellen</p>
<p xml:lang="en-GB">Alligator is a convergent, cross-platform feed reader, supporting standard RSS/Atom feeds</p>
<p xml:lang="eo">Aligatoro estas konverĝa, plurplatforma leganto, subtenanta normajn RSS/Atom-fluojn</p>
<p xml:lang="es">Alligator es un lector de fuentes convergente y multiplataforma compatible con fuentes RSS/Atom estándar</p>
@@ -210,6 +212,9 @@
</screenshots>
<launchable type="desktop-id">org.kde.alligator.desktop</launchable>
<releases>
+ <release version="25.04.3" date="2025-07-03"/>
+ <release version="25.04.2" date="2025-06-05"/>
+ <release version="25.04.1" date="2025-05-08"/>
<release version="25.04.0" date="2025-04-17"/>
<release version="24.12.3" date="2025-03-06"/>
<release version="24.12.2" date="2025-02-06"/>
diff -ur '--exclude=po' alligator-25.04.0/.pc/000001-open_in_browser_comes_first.patch/src/qml/EntryPage.qml alligator-25.04.3/.pc/000001-open_in_browser_comes_first.patch/src/qml/EntryPage.qml
--- alligator-25.04.0/.pc/000001-open_in_browser_comes_first.patch/src/qml/EntryPage.qml 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/.pc/000001-open_in_browser_comes_first.patch/src/qml/EntryPage.qml 2025-06-30 18:52:53.000000000 +0200
@@ -53,11 +53,11 @@
id: contentLabel
text: page.content
- baseUrl: page.baseUrl
+ baseUrl: page.link
textFormat: Text.RichText
wrapMode: Text.WordWrap
Layout.fillWidth: true
- onLinkActivated: link => contentHelper.openLink(link)
+ onLinkActivated: link => contentHelper.openLink(link, page.baseUrl)
font.pointSize: !(AlligatorSettings.articleFontUseSystem) ? AlligatorSettings.articleFontSize : Kirigami.Theme.defaultFont.pointSize
}
}
diff -ur '--exclude=po' alligator-25.04.0/.pc/000002-copy_url.patch/src/qml/EntryPage.qml alligator-25.04.3/.pc/000002-copy_url.patch/src/qml/EntryPage.qml
--- alligator-25.04.0/.pc/000002-copy_url.patch/src/qml/EntryPage.qml 2025-07-20 18:31:16.000000000 +0200
+++ alligator-25.04.3/.pc/000002-copy_url.patch/src/qml/EntryPage.qml 2025-07-20 18:31:17.000000000 +0200
@@ -53,11 +53,11 @@
id: contentLabel
text: page.content
- baseUrl: page.baseUrl
+ baseUrl: page.link
textFormat: Text.RichText
wrapMode: Text.WordWrap
Layout.fillWidth: true
- onLinkActivated: link => contentHelper.openLink(link)
+ onLinkActivated: link => contentHelper.openLink(link, page.baseUrl)
font.pointSize: !(AlligatorSettings.articleFontUseSystem) ? AlligatorSettings.articleFontSize : Kirigami.Theme.defaultFont.pointSize
}
}
diff -ur '--exclude=po' alligator-25.04.0/src/contenthelper.cpp alligator-25.04.3/src/contenthelper.cpp
--- alligator-25.04.0/src/contenthelper.cpp 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/src/contenthelper.cpp 2025-06-30 18:52:53.000000000 +0200
@@ -12,13 +12,19 @@
{
}
-void ContentHelper::openLink(const QString &link)
+void ContentHelper::openLink(const QString &link, const QString &baseUrl)
{
QUrl url(link);
if (link.startsWith(QStringLiteral("//"))) {
// we a protocol-relative, see https://en.wikipedia.org/wiki/Wikipedia:Protocol-relative_URL
url.setScheme(QUrl(link).scheme());
}
+
+ if (url.isRelative()) {
+ QUrl articleUrl(baseUrl);
+ url.setHost(articleUrl.host());
+ url.setScheme(articleUrl.scheme());
+ }
QDesktopServices::openUrl(url);
}
diff -ur '--exclude=po' alligator-25.04.0/src/contenthelper.h alligator-25.04.3/src/contenthelper.h
--- alligator-25.04.0/src/contenthelper.h 2025-04-08 05:20:01.000000000 +0200
+++ alligator-25.04.3/src/contenthelper.h 2025-06-30 18:52:53.000000000 +0200
@@ -15,6 +15,6 @@
public:
explicit ContentHelper(QObject *parent = nullptr);
- Q_INVOKABLE void openLink(const QString &link);
+ Q_INVOKABLE void openLink(const QString &link, const QString &baseUrl);
Q_INVOKABLE QString adjustedContent(int width, int fontSize, const QString &content);
};
diff -ur '--exclude=po' alligator-25.04.0/src/qml/EntryPage.qml alligator-25.04.3/src/qml/EntryPage.qml
--- alligator-25.04.0/src/qml/EntryPage.qml 2025-07-20 18:31:16.000000000 +0200
+++ alligator-25.04.3/src/qml/EntryPage.qml 2025-07-20 18:31:17.000000000 +0200
@@ -53,11 +53,11 @@
id: contentLabel
text: page.content
- baseUrl: page.baseUrl
+ baseUrl: page.link
textFormat: Text.RichText
wrapMode: Text.WordWrap
Layout.fillWidth: true
- onLinkActivated: link => contentHelper.openLink(link)
+ onLinkActivated: link => contentHelper.openLink(link, page.baseUrl)
font.pointSize: !(AlligatorSettings.articleFontUseSystem) ? AlligatorSettings.articleFontSize : Kirigami.Theme.defaultFont.pointSize
}
}
Reply to: