From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F5B51381F3 for ; Fri, 17 Apr 2020 20:59:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E882DE087E; Fri, 17 Apr 2020 20:59:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD462E087E for ; Fri, 17 Apr 2020 20:59:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3CBC34F0DF for ; Fri, 17 Apr 2020 20:59:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 589281E1 for ; Fri, 17 Apr 2020 20:59:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587157126.b3474b35d60531d3c9d3174801b4b63a6e5a1f81.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch net-irc/konversation/konversation-1.7.5-r2.ebuild X-VCS-Directories: net-irc/konversation/files/ net-irc/konversation/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b3474b35d60531d3c9d3174801b4b63a6e5a1f81 X-VCS-Branch: master Date: Fri, 17 Apr 2020 20:59:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e143489e-4207-4789-8c20-0f7b75a5c9c8 X-Archives-Hash: 1de5dcbdc2530231bf48b47258af4c01 commit: b3474b35d60531d3c9d3174801b4b63a6e5a1f81 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 17 19:53:14 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 17 20:58:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3474b35 net-irc/konversation: Drop kde-frameworks/kemoticons dependency Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../konversation-1.7.5-unused-kemoticons.patch | 112 +++++++++++++++++++++ net-irc/konversation/konversation-1.7.5-r2.ebuild | 2 +- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch new file mode 100644 index 00000000000..d856a17215a --- /dev/null +++ b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch @@ -0,0 +1,112 @@ +From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Mon, 16 Sep 2019 18:18:49 +0100 +Subject: Drop effectively unused kemoticons support + +Summary: +Konversation only supported emoticons if config value EnableEmotIcons +was true. This by default was false and there is no UI for configuring +this, making it effectively unused. + +This appears to be deliberate from the code comments. + +This helps clear up some KEmoticon library usage for future KF6 +transitioning. + +UTF-8 emoticons work correctly. + +Test Plan: Compiles + +Differential Revision: https://phabricator.kde.org/D24000 +--- + src/CMakeLists.txt | 2 -- + src/config/konversation.kcfg | 8 -------- + src/viewer/ircview.cpp | 3 --- + 3 files changed, 13 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c2077b3..89616a6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -138,7 +138,6 @@ set(viewer_SRCS + viewer/topiclabel.cpp + viewer/awaylabel.cpp + viewer/editnotifydialog.cpp +- viewer/emoticons.cpp + viewer/images.cpp + viewer/quickbutton.cpp + viewer/searchbar.cpp +@@ -224,7 +223,6 @@ target_link_libraries(konversation + KF5::Bookmarks + KF5::ConfigWidgets + KF5::Crash +- KF5::Emoticons + KF5::I18n + KF5::IdleTime + KF5::NotifyConfig +diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg +index 1d59eaf..3f0b7a6 100644 +--- a/src/config/konversation.kcfg ++++ b/src/config/konversation.kcfg +@@ -844,14 +844,6 @@ + + + +- +- false +- +- +- +- Default +- +- + + + +diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp +index c129f61..15f78ca 100644 +--- a/src/viewer/ircview.cpp ++++ b/src/viewer/ircview.cpp +@@ -20,7 +20,6 @@ + #include "application.h" + #include "highlight.h" + #include "sound.h" +-#include "emoticons.h" + #include "notificationhandler.h" + + #include +@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const + QLatin1String("\">") + filteredLine + QLatin1String(""); + } + +- filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine); +- + return filteredLine; + } + +-- +cgit v1.1 + +From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001 +From: Peter Simonsson +Date: Tue, 7 Apr 2020 16:37:53 +0200 +Subject: Remove KEmoticons from dependencies as it's not used + +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5315dbd..19facd8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED + CoreAddons + Crash + DocTools +- Emoticons + I18n + IdleTime + NotifyConfig +-- +cgit v1.1 diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild index cb485212136..8c3b601c6cc 100644 --- a/net-irc/konversation/konversation-1.7.5-r2.ebuild +++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild @@ -34,7 +34,6 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kemoticons-${KFMIN}:5 >=kde-frameworks/kglobalaccel-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 @@ -65,6 +64,7 @@ PATCHES=( "${FILESDIR}"/${P}-kf5windowsystem-5.63.patch # git master "${FILESDIR}"/${P}-kf5bookmarks-5.69.patch + "${FILESDIR}"/${P}-unused-kemoticons.patch ) src_configure() {