Hello community, here is the log from the commit of package kpimtextedit for openSUSE:Factory checked in at 2019-07-16 08:36:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpimtextedit (Old) and /work/SRC/openSUSE:Factory/.kpimtextedit.new.1887 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpimtextedit" Tue Jul 16 08:36:47 2019 rev:48 rq:715319 version:19.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kpimtextedit/kpimtextedit.changes 2019-06-13 22:52:12.779963330 +0200 +++ /work/SRC/openSUSE:Factory/.kpimtextedit.new.1887/kpimtextedit.changes 2019-07-16 08:36:48.923345211 +0200 @@ -1,0 +2,17 @@ +Sat Jul 13 07:26:36 UTC 2019 - [email protected] + +- Update to 19.04.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.04.3.php +- No code changes since 19.04.2 + +------------------------------------------------------------------- +Fri Jul 12 12:09:58 UTC 2019 - [email protected] + +- Add upstream patches to fix pasting URI in composer not adding + href in richtext mode: (boo#1141308, kde#409695) + * Fix-Bug-409695.patch + * Add-more-protocols.patch + +------------------------------------------------------------------- Old: ---- kpimtextedit-19.04.2.tar.xz New: ---- Add-more-protocols.patch Fix-Bug-409695.patch kpimtextedit-19.04.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpimtextedit.spec ++++++ --- /var/tmp/diff_new_pack.I41DxV/_old 2019-07-16 08:36:49.551344746 +0200 +++ /var/tmp/diff_new_pack.I41DxV/_new 2019-07-16 08:36:49.551344746 +0200 @@ -17,18 +17,20 @@ %define kf5_version 5.44.0 -%define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kpimtextedit -Version: 19.04.2 +Version: 19.04.3 Release: 0 Summary: KDE PIM Libraries: Text edit functionality License: LGPL-2.1-or-later Group: System/GUI/KDE URL: http://www.kde.org Source: kpimtextedit-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: Fix-Bug-409695.patch +Patch1: Add-more-protocols.patch BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: grantlee5-devel BuildRequires: kcodecs-devel >= %{kf5_version} @@ -86,6 +88,7 @@ %prep %setup -q -n kpimtextedit-%{version} +%autopatch -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} ++++++ Add-more-protocols.patch ++++++ >From 7e5fa67b0dc1f0623f947ffa7ee791d6ecd335e4 Mon Sep 17 00:00:00 2001 From: Laurent Montel <[email protected]> Date: Fri, 12 Jul 2019 06:59:30 +0200 Subject: Add more protocol CCBUG: 409695 --- src/composer-ng/richtextcomposer.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/composer-ng/richtextcomposer.cpp b/src/composer-ng/richtextcomposer.cpp index bbc7f34..0099f9d 100644 --- a/src/composer-ng/richtextcomposer.cpp +++ b/src/composer-ng/richtextcomposer.cpp @@ -524,6 +524,11 @@ void RichTextComposer::insertFromMimeData(const QMimeData *source) || sourceText.startsWith(QStringLiteral("mailto:";)) || sourceText.startsWith(QStringLiteral("smb://")) || sourceText.startsWith(QStringLiteral("file://")) + || sourceText.startsWith(QStringLiteral("webdavs://")) + || sourceText.startsWith(QStringLiteral("imaps://")) + || sourceText.startsWith(QStringLiteral("sftp://";)) + || sourceText.startsWith(QStringLiteral("fish://")) + || sourceText.startsWith(QStringLiteral("tel:")) ) { insertHtml(QStringLiteral("<a href=\"%1\">%1</a> ").arg(sourceText)); return; -- cgit v1.1 ++++++ Fix-Bug-409695.patch ++++++ >From f953a07ee13c3654939fd8922d765245a55f9afb Mon Sep 17 00:00:00 2001 From: Laurent Montel <[email protected]> Date: Thu, 11 Jul 2019 08:53:22 +0200 Subject: Fix Bug 409695 - pasting URI in composer doesnt add href in richtextmode FIXED-IN: 5.12.0 BUG: 409695 --- src/composer-ng/richtextcomposer.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/composer-ng/richtextcomposer.cpp b/src/composer-ng/richtextcomposer.cpp index 27b7b39..bbc7f34 100644 --- a/src/composer-ng/richtextcomposer.cpp +++ b/src/composer-ng/richtextcomposer.cpp @@ -514,6 +514,23 @@ void RichTextComposer::insertFromMimeData(const QMimeData *source) } } + if (textMode() == RichTextComposer::Rich) { + if (source->hasText()) { + const QString sourceText = source->text(); + if (sourceText.startsWith(QStringLiteral("http://";)) + || sourceText.startsWith(QStringLiteral("https://";)) + || sourceText.startsWith(QStringLiteral("ftps://")) + || sourceText.startsWith(QStringLiteral("ftp://";)) + || sourceText.startsWith(QStringLiteral("mailto:";)) + || sourceText.startsWith(QStringLiteral("smb://")) + || sourceText.startsWith(QStringLiteral("file://")) + ) { + insertHtml(QStringLiteral("<a href=\"%1\">%1</a> ").arg(sourceText)); + return; + } + } + } + KPIMTextEdit::RichTextEditor::insertFromMimeData(source); } -- cgit v1.1 ++++++ kpimtextedit-19.04.2.tar.xz -> kpimtextedit-19.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-19.04.2/CMakeLists.txt new/kpimtextedit-19.04.3/CMakeLists.txt --- old/kpimtextedit-19.04.2/CMakeLists.txt 2019-06-04 02:15:57.000000000 +0200 +++ new/kpimtextedit-19.04.3/CMakeLists.txt 2019-07-09 02:19:20.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.11.2") +set(PIM_VERSION "5.11.3") project(KPimTextEdit VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpimtextedit-19.04.2/po/pl/libkpimtextedit.po new/kpimtextedit-19.04.3/po/pl/libkpimtextedit.po --- old/kpimtextedit-19.04.2/po/pl/libkpimtextedit.po 2019-06-04 02:15:56.000000000 +0200 +++ new/kpimtextedit-19.04.3/po/pl/libkpimtextedit.po 2019-07-09 02:19:19.000000000 +0200 @@ -2,20 +2,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Maciej Wikło <[email protected]>, 2009. -# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2013, 2015, 2017, 2018. +# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2013, 2015, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 07:44+0200\n" -"PO-Revision-Date: 2018-12-16 06:10+0100\n" +"PO-Revision-Date: 2019-06-21 06:10+0200\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.07.70\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -398,48 +398,47 @@ #: emoticon/emoticonunicodetab.cpp:44 #, kde-format msgid "Faces" -msgstr "" +msgstr "Twarze" #: emoticon/emoticonunicodetab.cpp:45 #, kde-format msgid "Animals" -msgstr "" +msgstr "Zwierzęta" #: emoticon/emoticonunicodetab.cpp:46 -#, fuzzy, kde-format -#| msgid "Options" +#, kde-format msgid "Emotions" -msgstr "Opcje" +msgstr "Emocje" #: emoticon/emoticonunicodetab.cpp:47 #, kde-format msgid "Body" -msgstr "" +msgstr "Treść" #: emoticon/emoticonunicodetab.cpp:48 #, kde-format msgid "Transports" -msgstr "" +msgstr "Serwery pocztowe" #: emoticon/emoticonunicodetab.cpp:49 #, kde-format msgid "Events" -msgstr "" +msgstr "Wydarzenia" #: emoticon/emoticonunicodetab.cpp:50 #, kde-format msgid "Flags" -msgstr "" +msgstr "Flagi" #: emoticon/emoticonunicodetab.cpp:51 #, kde-format msgid "Weather" -msgstr "" +msgstr "Pogoda" #: emoticon/emoticonunicodetab.cpp:52 #, kde-format msgid "Foods" -msgstr "" +msgstr "Jedzenie" #: inserthtmldialog.cpp:39 #, kde-format
