Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpimtextedit for openSUSE:Factory checked in at 2021-10-13 18:02:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpimtextedit (Old) and /work/SRC/openSUSE:Factory/.kpimtextedit.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpimtextedit" Wed Oct 13 18:02:47 2021 rev:76 rq:923958 version:21.08.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kpimtextedit/kpimtextedit.changes 2021-09-04 22:35:26.872158920 +0200 +++ /work/SRC/openSUSE:Factory/.kpimtextedit.new.2443/kpimtextedit.changes 2021-10-13 18:03:41.667049616 +0200 @@ -1,0 +2,11 @@ +Tue Oct 5 16:28:39 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.08.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.08.2/ +- Changes since 21.08.1: + * Fix text color + * Fix Bug 442416 - Text highlight while composing or replaying the message (kde#442416) + +------------------------------------------------------------------- Old: ---- kpimtextedit-21.08.1.tar.xz kpimtextedit-21.08.1.tar.xz.sig New: ---- kpimtextedit-21.08.2.tar.xz kpimtextedit-21.08.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpimtextedit.spec ++++++ --- /var/tmp/diff_new_pack.ZMf21u/_old 2021-10-13 18:03:42.179050419 +0200 +++ /var/tmp/diff_new_pack.ZMf21u/_new 2021-10-13 18:03:42.183050425 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kpimtextedit -Version: 21.08.1 +Version: 21.08.2 Release: 0 Summary: KDE PIM Libraries: Text edit functionality License: LGPL-2.1-or-later ++++++ kpimtextedit-21.08.1.tar.xz -> kpimtextedit-21.08.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/.gitlab-ci.yml new/kpimtextedit-21.08.2/.gitlab-ci.yml --- old/kpimtextedit-21.08.1/.gitlab-ci.yml 2021-08-11 07:32:22.000000000 +0200 +++ new/kpimtextedit-21.08.2/.gitlab-ci.yml 2021-09-25 10:14:02.000000000 +0200 @@ -31,4 +31,4 @@ - cd build && run-clang-tidy variables: PLATFORM: SUSEQt5.15 - BRANCH_GROUP: kf5-qt5 + BRANCH_GROUP: stable-kf5-qt5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/CMakeLists.txt new/kpimtextedit-21.08.2/CMakeLists.txt --- old/kpimtextedit-21.08.1/CMakeLists.txt 2021-08-11 07:32:22.000000000 +0200 +++ new/kpimtextedit-21.08.2/CMakeLists.txt 2021-09-25 10:14:02.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.1") +set(PIM_VERSION "5.18.2") project(KPimTextEdit VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/po/cs/libkpimtextedit.po new/kpimtextedit-21.08.2/po/cs/libkpimtextedit.po --- old/kpimtextedit-21.08.1/po/cs/libkpimtextedit.po 2021-08-31 02:36:46.000000000 +0200 +++ new/kpimtextedit-21.08.2/po/cs/libkpimtextedit.po 2021-10-05 07:44:24.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Vit Pelcak <v...@pelcak.org>, 2012, 2013, 2015, 2019, 2020. +# Vit Pelcak <v...@pelcak.org>, 2012, 2013, 2015, 2019, 2020, 2021. # Tom???? Chv??tal <tomas.chva...@gmail.com>, 2012. # msgid "" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 20.04.1\n" +"X-Generator: Lokalize 21.08.1\n" #: composer-ng/klinkdialog.cpp:25 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/po/fr/libkpimtextedit.po new/kpimtextedit-21.08.2/po/fr/libkpimtextedit.po --- old/kpimtextedit-21.08.1/po/fr/libkpimtextedit.po 2021-08-31 02:36:46.000000000 +0200 +++ new/kpimtextedit-21.08.2/po/fr/libkpimtextedit.po 2021-10-05 07:44:24.000000000 +0200 @@ -5,7 +5,7 @@ # Jo??lle Cornavin <j.corna...@sfr.fr>, 2009. # S??bastien Renard <ren...@kde.org>, 2012. # Sebastien Renard <ren...@kde.org>, 2013. -# xavier <xavier.besn...@neuf.fr>, 2013, 2020. +# xavier <xavier.besn...@neuf.fr>, 2013, 2020, 2021. # Vincent Pinon <vpi...@kde.org>, 2017. # Simon Depiets <sdepi...@gmail.com>, 2019. # @@ -22,7 +22,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 20.04.1\n" +"X-Generator: Lokalize 21.08.1\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/po/zh_CN/libkpimtextedit.po new/kpimtextedit-21.08.2/po/zh_CN/libkpimtextedit.po --- old/kpimtextedit-21.08.1/po/zh_CN/libkpimtextedit.po 2021-08-31 02:36:46.000000000 +0200 +++ new/kpimtextedit-21.08.2/po/zh_CN/libkpimtextedit.po 2021-10-05 07:44:24.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-06-21 00:19+0000\n" -"PO-Revision-Date: 2021-08-30 11:45\n" +"PO-Revision-Date: 2021-09-27 13:10\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -380,7 +380,7 @@ #, kde-kuit-format msgctxt "@info" msgid "Unable to load image <filename>%1</filename>." -msgstr "?????????????????? <filename>%1</filename>???" +msgstr "?????????????????? <filename>%1</filename>???" #: composer-ng/richtextcomposerimages.cpp:217 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/src/grantleebuilder/autotests/texthtmlbuildertest.cpp new/kpimtextedit-21.08.2/src/grantleebuilder/autotests/texthtmlbuildertest.cpp --- old/kpimtextedit-21.08.1/src/grantleebuilder/autotests/texthtmlbuildertest.cpp 2021-08-11 07:32:22.000000000 +0200 +++ new/kpimtextedit-21.08.2/src/grantleebuilder/autotests/texthtmlbuildertest.cpp 2021-09-25 10:14:02.000000000 +0200 @@ -928,3 +928,70 @@ delete hb; delete doc; } + +void TextHTMLBuilderTest::testBug442416() +{ + auto doc = new QTextDocument(); + doc->setHtml(QStringLiteral( + "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;\"><span " + "style=\" background-color:#ffff00;\">Sss</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; " + "-qt-block-indent:0; text-indent:0px; -qt-user-state:0;\"><span style=\" background-color:#ffff00;\">sss</span></p>")); + + auto hb = new KPIMTextEdit::TextHTMLBuilder(); + auto md = new KPIMTextEdit::MarkupDirector(hb); + md->processDocument(doc); + auto result = hb->getResult(); + + // qDebug() << " result " << result; + auto regex = QRegularExpression( + QStringLiteral("^<p style=\"margin-top:0;margin-bottom:0;margin-left:0;margin-right:0;\"><span style=\"background-color:#ffff00;\">Sss</span></p>\n<p " + "style=\"margin-top:0;margin-bottom:0;margin-left:0;margin-right:0;\"><span style=\"background-color:#ffff00;\">sss</span></p>\n")); + + QVERIFY(regex.match(result).hasMatch()); + delete md; + delete hb; + delete doc; +} + +void TextHTMLBuilderTest::testBug442416Bis() +{ + auto doc = new QTextDocument(); + doc->setHtml(QStringLiteral( + "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;\"><span " + "style=\" background-color:#ffff00;\">Sss</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; " + "-qt-block-indent:0; text-indent:0px; -qt-user-state:0;\"><span style=\" background-color:#ff0000;\">sss</span></p>")); + + auto hb = new KPIMTextEdit::TextHTMLBuilder(); + auto md = new KPIMTextEdit::MarkupDirector(hb); + md->processDocument(doc); + auto result = hb->getResult(); + + // qDebug() << " result " << result; + auto regex = QRegularExpression( + QStringLiteral("^<p style=\"margin-top:0;margin-bottom:0;margin-left:0;margin-right:0;\"><span style=\"background-color:#ffff00;\">Sss</span></p>\n<p " + "style=\"margin-top:0;margin-bottom:0;margin-left:0;margin-right:0;\"><span style=\"background-color:#ff0000;\">sss</span></p>\n")); + QVERIFY(regex.match(result).hasMatch()); + delete md; + delete hb; + delete doc; +} + +void TextHTMLBuilderTest::testBugTextColor() +{ + auto doc = new QTextDocument(); + doc->setHtml(QStringLiteral("<p><span style=\"color:#ffff00;\">BBBB</span></p><p><span style=\"color:#ffff00;\">AAA</p>")); + + auto hb = new KPIMTextEdit::TextHTMLBuilder(); + auto md = new KPIMTextEdit::MarkupDirector(hb); + md->processDocument(doc); + auto result = hb->getResult(); + + // qDebug() << " result " << result; + auto regex = QRegularExpression( + QStringLiteral("^<p style=\"margin-top:12;margin-bottom:12;margin-left:0;margin-right:0;\"><span style=\"color:#ffff00;\">BBBB</span></p>\n<p " + "style=\"margin-top:12;margin-bottom:12;margin-left:0;margin-right:0;\"><span style=\"color:#ffff00;\">AAA</span></p>\n")); + QVERIFY(regex.match(result).hasMatch()); + delete md; + delete hb; + delete doc; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/src/grantleebuilder/autotests/texthtmlbuildertest.h new/kpimtextedit-21.08.2/src/grantleebuilder/autotests/texthtmlbuildertest.h --- old/kpimtextedit-21.08.1/src/grantleebuilder/autotests/texthtmlbuildertest.h 2021-08-11 07:32:22.000000000 +0200 +++ new/kpimtextedit-21.08.2/src/grantleebuilder/autotests/texthtmlbuildertest.h 2021-09-25 10:14:02.000000000 +0200 @@ -48,6 +48,9 @@ void testBug421908_2(); void testBug421908_full(); void testBug436880(); + void testBug442416(); + void testBug442416Bis(); + void testBugTextColor(); }; #endif // TEXTHTMLBUILDERTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-21.08.1/src/grantleebuilder/markupdirector.cpp new/kpimtextedit-21.08.2/src/grantleebuilder/markupdirector.cpp --- old/kpimtextedit-21.08.1/src/grantleebuilder/markupdirector.cpp 2021-08-11 07:32:22.000000000 +0200 +++ new/kpimtextedit-21.08.2/src/grantleebuilder/markupdirector.cpp 2021-09-25 10:14:02.000000000 +0200 @@ -528,9 +528,13 @@ break; case SpanBackground: m_builder->endBackground(); + // Clear background otherwise if we select 2 lines with same color it will not applied. bug #442416 + d->m_openBackground = {}; break; case SpanForeground: m_builder->endForeground(); + // Clear forground text color otherwise if we select 2 lines with same text color it will not applied. bug #442416 + d->m_openForeground = {}; break; case Anchor: m_builder->endAnchor(); ++++++ kpimtextedit-21.08.1.tar.xz.sig -> kpimtextedit-21.08.2.tar.xz.sig ++++++ --- /work/SRC/openSUSE:Factory/kpimtextedit/kpimtextedit-21.08.1.tar.xz.sig 2021-09-04 22:35:26.864158910 +0200 +++ /work/SRC/openSUSE:Factory/.kpimtextedit.new.2443/kpimtextedit-21.08.2.tar.xz.sig 2021-10-13 18:03:41.635049566 +0200 @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEteZ8ACgkQu0YzUNbv -Me9bgA/+Pk8D+38yofKnGywsnmG47t0xWlFWmQORxhjvgzVDSONwNfzvAOzSWqb+ -aY2rF+vlx1fVQspg+LKxH8p+WnRbX+cfe03eevmCZUVCspXb2gx2OpbadYb/jrN8 -/kuyKLKxAM0ii5kYWvNCo/Evn3wJkS9GmBIDrw8JDb44Vr0p0vPNVIf3QT6s6dLP -3W9gN07a4Chxm6rd8O5I9bavmmaT/cKAk0OXXvaHJKOu0gJZTUIiw+L1LCFiHErI -HZLLoC+8DC+gZmdA7mwKDfYfMQusiBJ+KmyKyIuFg3dOrYrYha23gcYmhSW7psb0 -ykitQOnY9KVG4w5s1xrs/sTIqXe1m7Ku/L91Z8o5wfWlaKoZV297n1wdIOQXGzmA -u6+Ev09FiEt8ucM+hzKoqb9c/eopDFOghot/3ntx4P1TUv7KTJkjs7H/4tcX1qbo -jje8ePi7JruSb1kPSjI8yOumTi7jbwjGXUMW3Wfuu5EnpRRCW4H3dD/kHDVV4Qfo -blB2WAaZ3jyUcAO/vq0DAkhlCuYmQ+irtQllSHWbCtZVHnn5rWEyNn5tIakHcbVJ -5SN0Ix0FByF8eYg6LZjec75EEf9RgiBV7ZNkShG4NMzNuwNMayJlNEYX1iwYnh9q -SHm9VAaW5C4s3IoMcVY2jH11IuSl5NkhoxxsAqKFLKSGnjSDsIY= -=i8eG +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmFb5jkACgkQu0YzUNbv +Me91WA//bo+/h+YE/rps4QlP/Axzl8gcJy/YwcRedDyVbjS7yart90F5NewM6J9Y +sRYbcgOygXiUjfs9bT+LQUk+1KfP9CZlLzpU3iL0nlVoTbxfwSgM+mASqUfTJyX5 +lsL5dw3OyDwt6Md0F94lnkj3IBC8DXJNfHo7pc5bVMQxm1CsGlOhO7TRfGSo+wvY +4H2KbX7QnPMOABsgiDWy2FeoZIyoKakHIap0ZM50yEsYIhwt5Pn2QE4TiNvHVxve +2dZlxYMRkzvIfsv5TraN9ubeinqeKgKwzN5Z/3g9+Zc/8RnIj/QDw2jkgTFxkKJA +LjcSP4C2lM/9bclwsR+Bb3j0b2mDSSDDY6RjW7duZQASTGWaEgRssMdeVL5AHgoM +eqEC3CmyH1UPPddg7n10I9J8bU64aQSa2DvjBw0S5GfwkXOAf1kp1bGEd+wiS1Sz +wpN9z6EUo/o1SnIIkkjAr4E1oAjJfM8cz0rex6UViwxjNK3c2DjZ2fPNY8BnAtDv +v/7Hdd7/l8Xc1VQiYx8SU+zPHdV9sB2BklGgT3twFVFSs2hvYjwN37uqLhlHKhHy +XIabR0+PbJR5MJyLBpvl9tC8qwS6PeirGSAPSFZs2u4jtGmdlTWa+DY/cORSQ6w8 +XP22jNfvuczxjHd4hg7IUz0joSCCcaGSTc11dRUhbDzxs47ZPM0= +=b5p1 -----END PGP SIGNATURE-----
