Your message dated Thu, 3 Jun 2021 09:35:58 +0200
with message-id <[email protected]>
and subject line Re: Bug#989405: unblock:
qtdeclarative-opensource-src/5.15.2+dfsg-5
has caused the Debian Bug report #989405,
regarding unblock: qtdeclarative-opensource-src/5.15.2+dfsg-5
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
989405: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989405
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
X-Debbugs-Cc: [email protected]
Please unblock package qtdeclarative-opensource-src
[ Reason ]
Upstream warned us of this simple patch in order to support &apos in
translations.
[ Impact ]
Translations are not being show as expected, and that makes us look bad
;-)
[ Risks ]
Code is trivial, it only affectes proper presentation of translated
text.
[ 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
[ Other info ]
No.
unblock qtdeclarative-opensource-src/5.15.2+dfsg-5
diff -Nru qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog
qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog
--- qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog 2021-03-19
14:46:16.000000000 -0300
+++ qtdeclarative-opensource-src-5.15.2+dfsg/debian/changelog 2021-06-01
18:37:21.000000000 -0300
@@ -1,3 +1,10 @@
+qtdeclarative-opensource-src (5.15.2+dfsg-6) unstable; urgency=medium
+
+ * Backport patch to support &appos in styled text, along with it's
+ documentation.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[email protected]> Tue, 01 Jun
2021 18:37:21 -0300
+
qtdeclarative-opensource-src (5.15.2+dfsg-5) unstable; urgency=medium
* Add a patch to make tst_qmldiskcache::regenerateAfterChange() pass on
diff -Nru qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/series
qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/series
--- qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/series
2021-03-19 14:46:16.000000000 -0300
+++ qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/series
2021-06-01 18:36:28.000000000 -0300
@@ -3,6 +3,7 @@
fix_qml_property_cache_leaks.patch
gcc_11.patch
tst_qmldiskcache_big_endian.patch
+support_apos_in_styled_text.patch
# Debian patches
disableopengltests.patch
diff -Nru
qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/support_apos_in_styled_text.patch
qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/support_apos_in_styled_text.patch
---
qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/support_apos_in_styled_text.patch
1969-12-31 21:00:00.000000000 -0300
+++
qtdeclarative-opensource-src-5.15.2+dfsg/debian/patches/support_apos_in_styled_text.patch
2021-06-01 18:36:28.000000000 -0300
@@ -0,0 +1,33 @@
+Description: Support ' in styled text and document it
+ This ensures that some translations really look ok.
+Origin: https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/3/diffs
+Forwarded: not-needed
+Author: Albert Astals Cid
+Applied-Upstream:
https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0dda47d9f1a22567ad8f1266be2f0cd8a9226c7f
+
+diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
+index
581ab9f76a41b731126eb53aa7069a21d7c96c76..4ddd2a41bc9290d09412b7904c3561ccfb65a6a8
100644
+--- a/src/quick/items/qquicktext.cpp
++++ b/src/quick/items/qquicktext.cpp
+@@ -2168,7 +2168,7 @@ void QQuickText::resetMaximumLineCount()
+ <img src="" align="top,middle,bottom" width="" height=""> - inline images
+ <ol type="">, <ul type=""> and <li> - ordered and unordered lists
+ <pre></pre> - preformatted
+- > < &
++ > < & " '
+ \endcode
+
+ \c Text.StyledText parser is strict, requiring tags to be correctly
nested.
+diff --git a/src/quick/util/qquickstyledtext.cpp
b/src/quick/util/qquickstyledtext.cpp
+index
d531fc92051b4a966a29ea4c463c7d5ca79a7ab3..a25af90414bc4e29efe02c773bf19645a272b93c
100644
+--- a/src/quick/util/qquickstyledtext.cpp
++++ b/src/quick/util/qquickstyledtext.cpp
+@@ -564,6 +564,8 @@ void QQuickStyledTextPrivate::parseEntity(const QChar
*&ch, const QString &textI
+ textOut += QChar(60);
+ else if (entity == QLatin1String("amp"))
+ textOut += QChar(38);
++ else if (entity == QLatin1String("apos"))
++ textOut += QChar(39);
+ else if (entity == QLatin1String("quot"))
+ textOut += QChar(34);
+ else if (entity == QLatin1String("nbsp"))
--- End Message ---
--- Begin Message ---
Hi Lisandro,
On 03-06-2021 00:13, Lisandro Damián Nicanor Pérez Meyer wrote:
> Please unblock package qtdeclarative-opensource-src
You have a typo in your changelog s/appos/apos/, but unblocked anyways ;).
Paul
OpenPGP_signature
Description: OpenPGP digital signature
--- End Message ---
