* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2016-11-20 16:21 Michael Palimaka
0 siblings, 0 replies; 14+ messages in thread
From: Michael Palimaka @ 2016-11-20 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 733c84ea8d919028598111f0f551f287119417fc
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 16:20:22 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 16:20:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733c84ea
kde-apps/konsole: backport patch from upstream making the file filter optional
The file filter was introduced in 16.08 and can cause high CPU usage and
general lag in konsole. This backports a commit from 16.12 making the file
filter optional and disabled by default.
KDE-bug: 367882
KDE-bug: 368234
Package-Manager: portage-2.3.2
.../konsole/files/konsole-16.08.3-filefilter.patch | 437 +++++++++++++++++++++
kde-apps/konsole/konsole-16.08.3-r1.ebuild | 60 +++
2 files changed, 497 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-16.08.3-filefilter.patch b/kde-apps/konsole/files/konsole-16.08.3-filefilter.patch
new file mode 100644
index 00000000..c842c37
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-16.08.3-filefilter.patch
@@ -0,0 +1,437 @@
+From e434862050abe2ec48a0c506faf8e2a5f0fe99a9 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
+Date: Sun, 4 Sep 2016 14:12:02 +0200
+Subject: [PATCH] Make the config of file filters and url filters separate
+
+REVIEW: 128828
+BUG: 368234
+---
+ src/EditProfileDialog.cpp | 21 ++++++++++++---
+ src/EditProfileDialog.h | 1 +
+ src/EditProfileDialog.ui | 14 ++++++++--
+ src/Profile.cpp | 4 ++-
+ src/Profile.h | 9 +++++++
+ src/SessionController.cpp | 40 +++++++++++++++++++++++++---
+ src/SessionController.h | 6 +++++
+ src/TerminalDisplay.cpp | 67 ++++++++++++++++++++++-------------------------
+ src/TerminalDisplay.h | 16 -----------
+ src/ViewManager.cpp | 1 -
+ 10 files changed, 117 insertions(+), 62 deletions(-)
+
+diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
+index a85cd5b..1a94193 100644
+--- a/src/EditProfileDialog.cpp
++++ b/src/EditProfileDialog.cpp
+@@ -857,6 +857,7 @@ void EditProfileDialog::removeKeyBinding()
+ _ui->keyBindingList->model()->removeRow(selected.first().row());
+ }
+ }
++
+ void EditProfileDialog::showKeyBindingEditor(bool isNewTranslator)
+ {
+ QModelIndexList selected = _ui->keyBindingList->selectionModel()->selectedIndexes();
+@@ -1010,11 +1011,16 @@ void EditProfileDialog::scrollHalfPage()
+ }
+ void EditProfileDialog::setupMousePage(const Profile::Ptr profile)
+ {
+- BooleanOption options[] = { {
++ BooleanOption options[] = {
++ {
+ _ui->underlineLinksButton , Profile::UnderlineLinksEnabled,
+ SLOT(toggleUnderlineLinks(bool))
+ },
+ {
++ _ui->underlineFilesButton , Profile::UnderlineFilesEnabled,
++ SLOT(toggleUnderlineFiles(bool))
++ },
++ {
+ _ui->ctrlRequiredForDragButton, Profile::CtrlRequiredForDrag,
+ SLOT(toggleCtrlRequiredForDrag(bool))
+ },
+@@ -1057,7 +1063,7 @@ void EditProfileDialog::setupMousePage(const Profile::Ptr profile)
+
+ connect(_ui->tripleClickModeCombo, static_cast<void(KComboBox::*)(int)>(&KComboBox::activated), this, &Konsole::EditProfileDialog::TripleClickModeChanged);
+
+- _ui->openLinksByDirectClickButton->setEnabled(_ui->underlineLinksButton->isChecked());
++ _ui->openLinksByDirectClickButton->setEnabled(_ui->underlineLinksButton->isChecked() || _ui->underlineFilesButton->isChecked());
+
+ _ui->enableMouseWheelZoomButton->setChecked(profile->mouseWheelZoomEnabled());
+ connect(_ui->enableMouseWheelZoomButton, &QCheckBox::toggled, this, &Konsole::EditProfileDialog::toggleMouseWheelZoom);
+@@ -1163,7 +1169,16 @@ void EditProfileDialog::toggleBlinkingCursor(bool enable)
+ void EditProfileDialog::toggleUnderlineLinks(bool enable)
+ {
+ updateTempProfileProperty(Profile::UnderlineLinksEnabled, enable);
+- _ui->openLinksByDirectClickButton->setEnabled(enable);
++
++ bool enableClick = _ui->underlineFilesButton->isChecked() || enable;
++ _ui->openLinksByDirectClickButton->setEnabled(enableClick);
++}
++void EditProfileDialog::toggleUnderlineFiles(bool enable)
++{
++ updateTempProfileProperty(Profile::UnderlineFilesEnabled, enable);
++
++ bool enableClick = _ui->underlineLinksButton->isChecked() || enable;
++ _ui->openLinksByDirectClickButton->setEnabled(enableClick);
+ }
+ void EditProfileDialog::toggleCtrlRequiredForDrag(bool enable)
+ {
+diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
+index 1195c14..febed0a 100644
+--- a/src/EditProfileDialog.h
++++ b/src/EditProfileDialog.h
+@@ -156,6 +156,7 @@ private slots:
+ void removeKeyBinding();
+
+ // mouse page
++ void toggleUnderlineFiles(bool enable);
+ void toggleUnderlineLinks(bool);
+ void toggleOpenLinksByDirectClick(bool);
+ void toggleCtrlRequiredForDrag(bool);
+diff --git a/src/EditProfileDialog.ui b/src/EditProfileDialog.ui
+index 1acec37..45b93d3 100644
+--- a/src/EditProfileDialog.ui
++++ b/src/EditProfileDialog.ui
+@@ -984,10 +984,20 @@
+ <item>
+ <widget class="QCheckBox" name="underlineLinksButton">
+ <property name="toolTip">
+- <string>Text recognized as a file, link or an email address will be underlined when hovered by the mouse pointer.</string>
++ <string>Text recognized as a link or an email address will be underlined when hovered by the mouse pointer.</string>
+ </property>
+ <property name="text">
+- <string>Underline files and links</string>
++ <string>Underline links</string>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="QCheckBox" name="underlineFilesButton">
++ <property name="toolTip">
++ <string>Text recognized as a file will be underlined when hovered by the mouse pointer.</string>
++ </property>
++ <property name="text">
++ <string>Underline files</string>
+ </property>
+ </widget>
+ </item>
+diff --git a/src/Profile.cpp b/src/Profile.cpp
+index 3e0eb4c..5611659 100644
+--- a/src/Profile.cpp
++++ b/src/Profile.cpp
+@@ -107,6 +107,7 @@ const Profile::PropertyInfo Profile::DefaultPropertyNames[] = {
+ , { WordCharacters , "WordCharacters" , INTERACTION_GROUP , QVariant::String }
+ , { TripleClickMode , "TripleClickMode" , INTERACTION_GROUP , QVariant::Int }
+ , { UnderlineLinksEnabled , "UnderlineLinksEnabled" , INTERACTION_GROUP , QVariant::Bool }
++ , { UnderlineFilesEnabled , "UnderlineFilesEnabled" , INTERACTION_GROUP , QVariant::Bool }
+ , { OpenLinksByDirectClickEnabled , "OpenLinksByDirectClickEnabled" , INTERACTION_GROUP , QVariant::Bool }
+ , { CtrlRequiredForDrag, "CtrlRequiredForDrag" , INTERACTION_GROUP , QVariant::Bool }
+ , { DropUrlsAsText , "DropUrlsAsText" , INTERACTION_GROUP , QVariant::Bool }
+@@ -178,7 +179,8 @@ FallbackProfile::FallbackProfile()
+ setProperty(FlowControlEnabled, true);
+ setProperty(EnableUrlHints, false);
+ setProperty(BlinkingTextEnabled, true);
+- setProperty(UnderlineLinksEnabled, false);
++ setProperty(UnderlineLinksEnabled, true);
++ setProperty(UnderlineFilesEnabled, false);
+ setProperty(OpenLinksByDirectClickEnabled, false);
+ setProperty(CtrlRequiredForDrag, true);
+ setProperty(AutoCopySelectedText, false);
+diff --git a/src/Profile.h b/src/Profile.h
+index de74afa..8681076 100644
+--- a/src/Profile.h
++++ b/src/Profile.h
+@@ -196,6 +196,10 @@ public:
+ * underlined when hovered by the mouse pointer.
+ */
+ UnderlineLinksEnabled,
++ /** (bool) If true, text that matches a file is
++ * underlined when hovered by the mouse pointer.
++ */
++ UnderlineFilesEnabled,
+ /** (bool) If true, links can be opened by direct mouse click.*/
+ OpenLinksByDirectClickEnabled,
+ /** (bool) If true, control key must be pressed to click and drag selected text. */
+@@ -463,6 +467,11 @@ public:
+ return property<bool>(Profile::UnderlineLinksEnabled);
+ }
+
++ /** Convenience method for property<bool>(Profile::UnderlineFilesEnabled) */
++ bool underlineFilesEnabled() const {
++ return property<bool>(Profile::UnderlineFilesEnabled);
++ }
++
+ bool autoCopySelectedText() const {
+ return property<bool>(Profile::AutoCopySelectedText);
+ }
+diff --git a/src/SessionController.cpp b/src/SessionController.cpp
+index cacb51b..07e96b7 100644
+--- a/src/SessionController.cpp
++++ b/src/SessionController.cpp
+@@ -20,6 +20,7 @@
+
+ // Own
+ #include "SessionController.h"
++#include "ProfileManager.h"
+
+ // Qt
+ #include <QApplication>
+@@ -99,6 +100,8 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q
+ , _profileList(0)
+ , _previousState(-1)
+ , _searchFilter(0)
++ , _urlFilter(0)
++ , _fileFilter(0)
+ , _copyInputToAllTabsAction(0)
+ , _findAction(0)
+ , _findNextAction(0)
+@@ -140,11 +143,11 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q
+ view->installEventFilter(this);
+ view->setSessionController(this);
+
+- // install filter on the view to highlight URLs
+- _view->filterChain()->addFilter(new UrlFilter);
++ // install filter on the view to highlight URLs and files
++ updateFilterList(SessionManager::instance()->sessionProfile(_session));
+
+- // install filter on the view to highlight Files
+- _view->filterChain()->addFilter(new FileFilter(_session));
++ // listen for changes in session, we might need to change the enabled filters
++ connect(ProfileManager::instance(), &Konsole::ProfileManager::profileChanged, this, &Konsole::SessionController::updateFilterList);
+
+ // listen for session resize requests
+ connect(_session.data(), &Konsole::Session::resizeRequest, this, &Konsole::SessionController::sessionResizeRequest);
+@@ -744,6 +747,7 @@ void SessionController::setupExtraActions()
+ void SessionController::switchProfile(Profile::Ptr profile)
+ {
+ SessionManager::instance()->setSessionProfile(_session, profile);
++ updateFilterList(profile);
+ }
+
+ void SessionController::prepareSwitchProfileMenu()
+@@ -1068,6 +1072,34 @@ void SessionController::searchClosed()
+ searchHistory(false);
+ }
+
++void SessionController::updateFilterList(Profile::Ptr profile)
++{
++ if (profile != SessionManager::instance()->sessionProfile(_session)) {
++ return;
++ }
++
++ bool underlineFiles = profile->underlineFilesEnabled();
++
++ if (!underlineFiles && _fileFilter) {
++ _view->filterChain()->removeFilter(_fileFilter);
++ delete _fileFilter;
++ _fileFilter = nullptr;
++ } else if (underlineFiles && !_fileFilter) {
++ _fileFilter = new FileFilter(_session);
++ _view->filterChain()->addFilter(_fileFilter);
++ }
++
++ bool underlineLinks = profile->underlineLinksEnabled();
++ if (!underlineLinks && _urlFilter) {
++ _view->filterChain()->removeFilter(_urlFilter);
++ delete _urlFilter;
++ _urlFilter = nullptr;
++ } else if (underlineLinks && !_urlFilter) {
++ _urlFilter = new UrlFilter();
++ _view->filterChain()->addFilter(_urlFilter);
++ }
++}
++
+ void SessionController::setSearchStartToWindowCurrentLine()
+ {
+ setSearchStartTo(-1);
+diff --git a/src/SessionController.h b/src/SessionController.h
+index 3ac06f5..30f07e4 100644
+--- a/src/SessionController.h
++++ b/src/SessionController.h
+@@ -61,6 +61,8 @@ class TerminalDisplay;
+ class IncrementalSearchBar;
+ class ProfileList;
+ class RegExpFilter;
++class UrlFilter;
++class FileFilter;
+ class EditProfileDialog;
+
+ // SaveHistoryTask
+@@ -265,6 +267,8 @@ private slots:
+ void searchClosed(); // called when the user clicks on the
+ // history search bar's close button
+
++ void updateFilterList(Profile::Ptr profile); // Called when the profile has changed, so we might need to change the list of filters
++
+ void interactionHandler();
+ void snapshot(); // called periodically as the user types
+ // to take a snapshot of the state of the
+@@ -317,6 +321,8 @@ private:
+ int _previousState;
+
+ RegExpFilter* _searchFilter;
++ UrlFilter* _urlFilter;
++ FileFilter* _fileFilter;
+
+ QAction* _copyInputToAllTabsAction;
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 555a991..0569d1c 100644
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -360,7 +360,6 @@ TerminalDisplay::TerminalDisplay(QWidget* parent)
+ , _hasTextBlinker(false)
+ , _showUrlHint(false)
+ , _enableShowUrlHint(false)
+- , _underlineLinks(true)
+ , _openLinksByDirectClick(false)
+ , _ctrlRequiredForDrag(true)
+ , _tripleClickMode(Enum::SelectWholeLine)
+@@ -1369,7 +1368,7 @@ void TerminalDisplay::paintFilters(QPainter& painter)
+ urlNumber++;
+
+ QRegion region;
+- if (_underlineLinks && spot->type() == Filter::HotSpot::Link) {
++ if (spot->type() == Filter::HotSpot::Link) {
+ QRect r;
+ if (spot->startLine() == spot->endLine()) {
+ r.setCoords(spot->startColumn()*_fontWidth + _contentRect.left(),
+@@ -1447,7 +1446,7 @@ void TerminalDisplay::paintFilters(QPainter& painter)
+ endColumn * _fontWidth + _contentRect.left() - 1,
+ (line + 1)*_fontHeight + _contentRect.top() - 1);
+ // Underline link hotspots
+- if (_underlineLinks && spot->type() == Filter::HotSpot::Link) {
++ if (spot->type() == Filter::HotSpot::Link) {
+ QFontMetrics metrics(font());
+
+ // find the baseline (which is the invisible line that the characters in the font sit on,
+@@ -2043,7 +2042,7 @@ void TerminalDisplay::mousePressEvent(QMouseEvent* ev)
+ emit mouseSignal(0, charColumn + 1, charLine + 1 + _scrollBar->value() - _scrollBar->maximum() , 0);
+ }
+
+- if (_underlineLinks && (_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier))) {
++ if ((_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier))) {
+ Filter::HotSpot* spot = _filterChain->hotSpotAt(charLine, charColumn);
+ if (spot && spot->type() == Filter::HotSpot::Link) {
+ QObject action;
+@@ -2083,43 +2082,41 @@ void TerminalDisplay::mouseMoveEvent(QMouseEvent* ev)
+ // change link hot-spot appearance on mouse-over
+ Filter::HotSpot* spot = _filterChain->hotSpotAt(charLine, charColumn);
+ if (spot && spot->type() == Filter::HotSpot::Link) {
+- if (_underlineLinks) {
+- QRegion previousHotspotArea = _mouseOverHotspotArea;
+- _mouseOverHotspotArea = QRegion();
+- QRect r;
+- if (spot->startLine() == spot->endLine()) {
+- r.setCoords(spot->startColumn()*_fontWidth + _contentRect.left(),
+- spot->startLine()*_fontHeight + _contentRect.top(),
+- (spot->endColumn())*_fontWidth + _contentRect.left() - 1,
+- (spot->endLine() + 1)*_fontHeight + _contentRect.top() - 1);
+- _mouseOverHotspotArea |= r;
+- } else {
+- r.setCoords(spot->startColumn()*_fontWidth + _contentRect.left(),
+- spot->startLine()*_fontHeight + _contentRect.top(),
+- (_columns)*_fontWidth + _contentRect.left() - 1,
+- (spot->startLine() + 1)*_fontHeight + _contentRect.top() - 1);
+- _mouseOverHotspotArea |= r;
+- for (int line = spot->startLine() + 1 ; line < spot->endLine() ; line++) {
+- r.setCoords(0 * _fontWidth + _contentRect.left(),
+- line * _fontHeight + _contentRect.top(),
+- (_columns)*_fontWidth + _contentRect.left() - 1,
+- (line + 1)*_fontHeight + _contentRect.top() - 1);
+- _mouseOverHotspotArea |= r;
+- }
++ QRegion previousHotspotArea = _mouseOverHotspotArea;
++ _mouseOverHotspotArea = QRegion();
++ QRect r;
++ if (spot->startLine() == spot->endLine()) {
++ r.setCoords(spot->startColumn()*_fontWidth + _contentRect.left(),
++ spot->startLine()*_fontHeight + _contentRect.top(),
++ (spot->endColumn())*_fontWidth + _contentRect.left() - 1,
++ (spot->endLine() + 1)*_fontHeight + _contentRect.top() - 1);
++ _mouseOverHotspotArea |= r;
++ } else {
++ r.setCoords(spot->startColumn()*_fontWidth + _contentRect.left(),
++ spot->startLine()*_fontHeight + _contentRect.top(),
++ (_columns)*_fontWidth + _contentRect.left() - 1,
++ (spot->startLine() + 1)*_fontHeight + _contentRect.top() - 1);
++ _mouseOverHotspotArea |= r;
++ for (int line = spot->startLine() + 1 ; line < spot->endLine() ; line++) {
+ r.setCoords(0 * _fontWidth + _contentRect.left(),
+- spot->endLine()*_fontHeight + _contentRect.top(),
+- (spot->endColumn())*_fontWidth + _contentRect.left() - 1,
+- (spot->endLine() + 1)*_fontHeight + _contentRect.top() - 1);
++ line * _fontHeight + _contentRect.top(),
++ (_columns)*_fontWidth + _contentRect.left() - 1,
++ (line + 1)*_fontHeight + _contentRect.top() - 1);
+ _mouseOverHotspotArea |= r;
+ }
++ r.setCoords(0 * _fontWidth + _contentRect.left(),
++ spot->endLine()*_fontHeight + _contentRect.top(),
++ (spot->endColumn())*_fontWidth + _contentRect.left() - 1,
++ (spot->endLine() + 1)*_fontHeight + _contentRect.top() - 1);
++ _mouseOverHotspotArea |= r;
++ }
+
+- if ((_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier)) && (cursor().shape() != Qt::PointingHandCursor))
+- setCursor(Qt::PointingHandCursor);
++ if ((_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier)) && (cursor().shape() != Qt::PointingHandCursor))
++ setCursor(Qt::PointingHandCursor);
+
+- update(_mouseOverHotspotArea | previousHotspotArea);
+- }
++ update(_mouseOverHotspotArea | previousHotspotArea);
+ } else if (!_mouseOverHotspotArea.isEmpty()) {
+- if ((_underlineLinks && (_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier))) || (cursor().shape() == Qt::PointingHandCursor))
++ if ((_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier)) || (cursor().shape() == Qt::PointingHandCursor))
+ setCursor(_mouseMarks ? Qt::IBeamCursor : Qt::ArrowCursor);
+
+ update(_mouseOverHotspotArea);
+diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
+index 93c98ab..4590cbf 100644
+--- a/src/TerminalDisplay.h
++++ b/src/TerminalDisplay.h
+@@ -180,21 +180,6 @@ public:
+ }
+
+ /**
+- * Specifies whether links and email addresses should be underlined when
+- * hovered by the mouse. Defaults to true.
+- */
+- void setUnderlineLinks(bool value) {
+- _underlineLinks = value;
+- }
+- /**
+- * Returns true if links and email addresses should be underlined when
+- * hovered by the mouse.
+- */
+- bool getUnderlineLinks() const {
+- return _underlineLinks;
+- }
+-
+- /**
+ * Specifies whether links and email addresses should be opened when
+ * clicked with the mouse. Defaults to false.
+ */
+@@ -889,7 +874,6 @@ private:
+
+ bool _showUrlHint;
+ bool _enableShowUrlHint;
+- bool _underlineLinks; // Underline URL and hosts on mouse hover
+ bool _openLinksByDirectClick; // Open URL and hosts by single mouse click
+
+ bool _ctrlRequiredForDrag; // require Ctrl key for drag selected text
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index b1efc0a..21a9f9e 100644
+--- a/src/ViewManager.cpp
++++ b/src/ViewManager.cpp
+@@ -804,7 +804,6 @@ void ViewManager::applyProfileToView(TerminalDisplay* view , const Profile::Ptr
+ view->setTripleClickMode(Enum::TripleClickModeEnum(tripleClickMode));
+
+ view->setAutoCopySelectedText(profile->autoCopySelectedText());
+- view->setUnderlineLinks(profile->underlineLinksEnabled());
+ view->setControlDrag(profile->property<bool>(Profile::CtrlRequiredForDrag));
+ view->setDropUrlsAsText(profile->property<bool>(Profile::DropUrlsAsText));
+ view->setBidiEnabled(profile->bidiRenderingEnabled());
+--
+2.7.3
+
diff --git a/kde-apps/konsole/konsole-16.08.3-r1.ebuild b/kde-apps/konsole/konsole-16.08.3-r1.ebuild
new file mode 100644
index 00000000..a68fd53
--- /dev/null
+++ b/kde-apps/konsole/konsole-16.08.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpty)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-filefilter.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2017-01-29 14:13 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2017-01-29 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 2b8f606c3df1f0ece08d0a060c3bef8b6b7c3020
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 14:12:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 14:13:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8f606c
kde-apps/konsole: Fix build w/ ECM 5.31
Add upstream patch to fix build w/ upcoming extra-cmake-modules.
Thanks-to: karolherbst
Package-Manager: portage-2.3.3
.../konsole/files/konsole-16.12.1-ecm531.patch | 22 ++++++++++++++++++++++
kde-apps/konsole/konsole-16.12.1.ebuild | 2 ++
2 files changed, 24 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch b/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch
new file mode 100644
index 00000000..fd22781
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-16.12.1-ecm531.patch
@@ -0,0 +1,22 @@
+commit 3a055ea19d5f458ccf06a33c697fbcda7a7f14df
+Author: Aleix Pol <aleixpol@kde.org>
+Date: Wed Jan 18 12:15:00 2017 +0100
+
+ Fix build
+
+ frameworks/konsole/src/Session.cpp:839:5: warning: 'not' is not defined,
+ evaluates to 0 [-Wundef]
+
+diff --git a/src/Session.cpp b/src/Session.cpp
+index d63c8a0..482ee0b 100644
+--- a/src/Session.cpp
++++ b/src/Session.cpp
+@@ -836,7 +836,7 @@ void Session::sendTextToTerminal(const QString& text, const QChar& eol) const
+ // Only D-Bus calls this function (via SendText or runCommand)
+ void Session::sendText(const QString& text) const
+ {
+-#if not defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
++#if !defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
+ if (show_disallow_certain_dbus_methods_message) {
+
+ KNotification::event(KNotification::Warning, "Konsole D-Bus Warning",
diff --git a/kde-apps/konsole/konsole-16.12.1.ebuild b/kde-apps/konsole/konsole-16.12.1.ebuild
index 1070cde..ea4c0fe 100644
--- a/kde-apps/konsole/konsole-16.12.1.ebuild
+++ b/kde-apps/konsole/konsole-16.12.1.ebuild
@@ -49,6 +49,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-ecm531.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2018-11-13 11:32 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2018-11-13 11:32 UTC (permalink / raw
To: gentoo-commits
commit: d5244c851a9becb379023744f0be214d0b1565e1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 11:08:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 11:32:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5244c85
kde-apps/konsole: Add StartupWMClass to .desktop file
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../konsole/files/konsole-18.08.3-desktop.patch | 29 +++++++++++
kde-apps/konsole/konsole-18.08.3-r1.ebuild | 59 ++++++++++++++++++++++
2 files changed, 88 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-18.08.3-desktop.patch b/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
new file mode 100644
index 00000000000..8c204fe2bd2
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
@@ -0,0 +1,29 @@
+From 1506ecdfd0f91d4b8b39c01bad1fe301193d6e82 Mon Sep 17 00:00:00 2001
+From: David Hallas <david@davidhallas.dk>
+Date: Sun, 11 Nov 2018 10:26:31 -0500
+Subject: Add StartupWMClass to .desktop file
+
+The org.kde.konsole.desktop file is missing a StartupWMClass setting.
+
+BUG: 372441
+FIXED-IN: 18.12
+
+Differential Revision: https://phabricator.kde.org/D16546
+---
+ desktop/org.kde.konsole.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
+index adc472c..86c2160 100755
+--- a/desktop/org.kde.konsole.desktop
++++ b/desktop/org.kde.konsole.desktop
+@@ -10,6 +10,7 @@ X-DocPath=konsole/index.html
+ X-DBUS-StartupType=Unique
+ StartupNotify=true
+ X-KDE-AuthorizeAction=shell_access
++StartupWMClass=konsole
+
+ Name=Konsole
+ Name[af]=Konsole
+--
+cgit v0.11.2
diff --git a/kde-apps/konsole/konsole-18.08.3-r1.ebuild b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
new file mode 100644
index 00000000000..5bc727ab78c
--- /dev/null
+++ b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpty)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2018-12-25 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2018-12-25 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 8db345fe63a72a60df25699e7f182634404a3e8f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 12:59:11 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 21:23:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db345fe
kde-apps/konsole: Fix cursor w/ antialising
Follow-up to 6984d3c, fixed in 18.12.1.
Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../konsole/files/konsole-18.12.0-fix-cursor.patch | 58 ++++++++++++++++++++
kde-apps/konsole/konsole-18.12.0-r2.ebuild | 62 ++++++++++++++++++++++
2 files changed, 120 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch
new file mode 100644
index 00000000000..36aabaaccc5
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch
@@ -0,0 +1,58 @@
+From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
+Date: Mon, 10 Dec 2018 10:09:35 -0500
+Subject: fix cursor when anti aliasing is enabled
+
+Summary:
+When there is a margin of 1 pixel, but some of the anti-aliasing
+"blur" leaks to 0,0. so it is fixed with a full update() (e. g. when
+it regains focus), but not when just some content updates in the
+window. Without this it draws outside the content rect, most
+visible as a vertical line if the cursor is completely to the left and
+then moves.
+
+Reviewers: #konsole, hindenburg
+
+Reviewed By: #konsole, hindenburg
+
+Subscribers: pbraun, konsole-devel, #konsole
+
+Tags: #konsole
+
+Differential Revision: https://phabricator.kde.org/D17414
+
+(cherry picked from commit e7085310d6d594823d0ed491fa8bdbd99dec4932)
+---
+ src/TerminalDisplay.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 6e8b262..64c831c 100644
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -933,7 +933,7 @@ void TerminalDisplay::drawCursor(QPainter& painter,
+
+ // shift rectangle top down one pixel to leave some space
+ // between top and bottom
+- QRect cursorRect = rect.adjusted(0, 1, 0, 0);
++ QRectF cursorRect = rect.adjusted(0, 1, 0, 0);
+
+ QColor cursorColor = _cursorColor.isValid() ? _cursorColor : foregroundColor;
+ painter.setPen(cursorColor);
+@@ -942,10 +942,10 @@ void TerminalDisplay::drawCursor(QPainter& painter,
+ // draw the cursor outline, adjusting the area so that
+ // it is draw entirely inside 'rect'
+ int penWidth = qMax(1, painter.pen().width());
+- painter.drawRect(cursorRect.adjusted(penWidth / 2,
+- penWidth / 2,
+- - penWidth / 2 - penWidth % 2,
+- - penWidth / 2 - penWidth % 2));
++ painter.drawRect(cursorRect.adjusted(penWidth / 2 + 0.5,
++ penWidth / 2 + 0.5,
++ - penWidth / 2 - penWidth % 2 + 0.5,
++ - penWidth / 2 - penWidth % 2 + 0.5));
+
+ // draw the cursor body only when the widget has focus
+ if (hasFocus()) {
+--
+cgit v1.1
diff --git a/kde-apps/konsole/konsole-18.12.0-r2.ebuild b/kde-apps/konsole/konsole-18.12.0-r2.ebuild
new file mode 100644
index 00000000000..abc36ad9309
--- /dev/null
+++ b/kde-apps/konsole/konsole-18.12.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpty)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-drawing-box-chars.patch" # fixed in 18.12.1
+ "${FILESDIR}/${P}-fix-cursor.patch" # fixed in 18.12.1
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2020-02-12 21:54 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-02-12 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 1026fe273b5eeb3ac241fca8056011f9d8a94e7c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 21:50:00 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 21:51:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1026fe27
kde-apps/konsole: ColorScheme: Fix DarkBackground Detection
See also: https://invent.kde.org/kde/konsole/merge_requests/65
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=416638
Thanks-to: Manuel Rüger <mrueg <AT> gentoo.org>
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../konsole-19.12.2-darkbackground-detect.patch | 27 +++++++++
kde-apps/konsole/konsole-19.12.2-r1.ebuild | 64 ++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
new file mode 100644
index 00000000000..990bad142c3
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
@@ -0,0 +1,27 @@
+From e5b2ada1a6f06e0eea76af1f26ff4c0c4aad8497 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
+Date: Thu, 23 Jan 2020 11:00:06 +0100
+Subject: ColorScheme: Fix DarkBackground Detection
+
+Luminance is a value between 0 and 100.
+
+https://bugs.kde.org/show_bug.cgi?id=416638
+---
+ src/ColorScheme.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
+index 1693c22..5d6b408 100644
+--- a/src/ColorScheme.cpp
++++ b/src/ColorScheme.cpp
+@@ -403,7 +403,7 @@ bool ColorScheme::hasDarkBackground() const
+ const double g = backgroundColor().greenF();
+ const double b = backgroundColor().blueF();
+ rgb2hsluv(r, g, b, &h, &s, &l);
+- return l < 0.5;
++ return l < 50;
+ }
+
+ void ColorScheme::setOpacity(qreal opacity)
+--
+cgit v1.1
diff --git a/kde-apps/konsole/konsole-19.12.2-r1.ebuild b/kde-apps/konsole/konsole-19.12.2-r1.ebuild
new file mode 100644
index 00000000000..3e45534a5d5
--- /dev/null
+++ b/kde-apps/konsole/konsole-19.12.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-darkbackground-detect.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2020-04-15 22:27 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-04-15 22:27 UTC (permalink / raw
To: gentoo-commits
commit: d05e2833e464fdae89660ebf0cb283f67687582d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 15 19:32:09 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 15 22:27:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05e2833
kde-apps/konsole: Adapt the code to >=kde-frameworks/kbookmarks-5.69
Tested-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Tested-by: Nils Freydank <holgersson <AT> posteo.de>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/konsole-19.12.3-kf5bookmarks-5.69.patch | 117 +++++++++++++++++++++
kde-apps/konsole/konsole-19.12.3-r1.ebuild | 69 ++++++++++++
2 files changed, 186 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch
new file mode 100644
index 00000000000..d70a50ea055
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch
@@ -0,0 +1,117 @@
+From e56c31a961b182663decd44bc57729576446315b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Mon, 13 Apr 2020 11:30:47 +0200
+Subject: [PATCH] [BookmarkMenu] Adapt the code to KBookmarks 5.69 changes
+
+Starting from KBookmarks 5.69 the ctor that took a KActionCollection
+parameter has been deprecated, and we need to manually add the various
+bookmark actions to the actionCollection so that they show up in the
+shortcusts editor.
+
+Move the code that overrides the add bookmark shortcut, Ctrl+B, to the
+BookmarkMenu class, so that all the relevant code is in one place.
+
+BUG: 419981
+(cherry picked from commit 6db7f8d2593ccb0238b2b547ed6eaf7da6a26c4c)
+(cherry picked from commit dcf8cf3f2255293da170648f633873aa7c4afcf1)
+---
+ src/BookmarkMenu.cpp | 34 +++++++++++++++++++++++++++++-----
+ src/BookmarkMenu.h | 2 +-
+ src/MainWindow.cpp | 10 ----------
+ 3 files changed, 30 insertions(+), 16 deletions(-)
+
+diff --git a/src/BookmarkMenu.cpp b/src/BookmarkMenu.cpp
+index 77344ad1..5b83ece9 100644
+--- a/src/BookmarkMenu.cpp
++++ b/src/BookmarkMenu.cpp
+@@ -21,24 +21,48 @@
+
+ // Own
+ #include "BookmarkMenu.h"
++#include "Shortcut_p.h"
+
+ // KDE
+ #include <KActionCollection>
++#include <kbookmarks_version.h>
++#include <KBookmarkManager>
++#include <KBookmark>
+
+ // Qt
+ #include <QAction>
+-#include <KBookmarkManager>
+-#include <KBookmark>
++#include <QMenu>
+
+ #include <algorithm> // std::any_of
+
+-BookmarkMenu::BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collec) :
+- KBookmarkMenu (mgr, owner, parentMenu, collec)
++BookmarkMenu::BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collection) :
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
++ KBookmarkMenu (mgr, owner, parentMenu, collection)
++#else
++ KBookmarkMenu (mgr, owner, parentMenu)
++#endif
+ {
++ QAction *bookmarkAction;
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
++ bookmarkAction = collection->action(QStringLiteral("add_bookmark"));
++#else
++ collection->addActions(parentMenu->actions());
++
++ bookmarkAction = addBookmarkAction();
++#endif
++
++ Q_ASSERT(bookmarkAction);
++
+ // We need to hijack the action - note this only hijacks top-level action
+- QAction *bookmarkAction = collec->action(QStringLiteral("add_bookmark"));
+ disconnect(bookmarkAction, nullptr, this, nullptr);
+ connect(bookmarkAction, &QAction::triggered, this, &BookmarkMenu::maybeAddBookmark);
++
++ // replace Ctrl+B shortcut for bookmarks only if user hasn't already
++ // changed the shortcut; however, if the user changed it to Ctrl+B
++ // this will still get changed to Ctrl+Shift+B
++ if (bookmarkAction->shortcut() == QKeySequence(Konsole::ACCEL + Qt::Key_B)) {
++ collection->setDefaultShortcut(bookmarkAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_B);
++ }
+ }
+
+ void BookmarkMenu::maybeAddBookmark()
+diff --git a/src/BookmarkMenu.h b/src/BookmarkMenu.h
+index a42eab23..fde893c0 100644
+--- a/src/BookmarkMenu.h
++++ b/src/BookmarkMenu.h
+@@ -39,7 +39,7 @@ class KONSOLEPRIVATE_EXPORT BookmarkMenu : public KBookmarkMenu
+ Q_OBJECT
+
+ public:
+- BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collec);
++ BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collection);
+
+ private Q_SLOTS:
+ void maybeAddBookmark();
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 461b9e54..90bbf5ed 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -190,16 +190,6 @@ void MainWindow::correctStandardShortcuts()
+ if (helpAction != nullptr) {
+ actionCollection()->setDefaultShortcut(helpAction, QKeySequence());
+ }
+-
+- // replace Ctrl+B shortcut for bookmarks only if user hasn't already
+- // changed the shortcut; however, if the user changed it to Ctrl+B
+- // this will still get changed to Ctrl+Shift+B
+- QAction *bookmarkAction = actionCollection()->action(QStringLiteral("add_bookmark"));
+- if ((bookmarkAction != nullptr)
+- && bookmarkAction->shortcut() == QKeySequence(Konsole::ACCEL + Qt::Key_B)) {
+- actionCollection()->setDefaultShortcut(bookmarkAction,
+- Konsole::ACCEL + Qt::SHIFT + Qt::Key_B);
+- }
+ }
+
+ ViewManager *MainWindow::viewManager() const
+--
+2.26.1
+
diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
new file mode 100644
index 00000000000..d3f4cb95ef1
--- /dev/null
+++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+# drop kbookmarks subslot operator when KFMIN >= 5.69.0
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5=
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch"
+ "${FILESDIR}/${P}-no-ccache.patch"
+ "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # KDE-Bug 419981
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2020-05-28 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-05-28 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 53c4419851fc373c392ccd9081f2190f77780d4a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 19:38:59 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 28 19:40:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c44198
kde-apps/konsole: Fix crash on session close
Upstream commit fdfae25665731882687da8721e58c3c56a3babf8
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=415762
Closes: https://bugs.gentoo.org/723214
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/konsole-20.04.1-crash-on-close.patch | 57 +++++++++++++++++++
kde-apps/konsole/konsole-20.04.1-r1.ebuild | 64 ++++++++++++++++++++++
2 files changed, 121 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch b/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
new file mode 100644
index 00000000000..51e1d0c5dcd
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
@@ -0,0 +1,57 @@
+From fdfae25665731882687da8721e58c3c56a3babf8 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 28 May 2020 09:28:06 -0400
+Subject: Fix crash when closing session in KonsolePart via menu
+
+This close method is also used when closing a Konsole session
+via the X on the tabbar and tabheader.
+
+FIXED-IN: 20.08.0
+BUG: 420817
+BUG: 420695
+BUG: 415762
+
+See merge request !87
+---
+ src/SessionController.cpp | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/src/SessionController.cpp b/src/SessionController.cpp
+index 006ba8b..e72f342 100644
+--- a/src/SessionController.cpp
++++ b/src/SessionController.cpp
+@@ -999,16 +999,23 @@ void SessionController::closeSession()
+ return;
+ }
+
+- if (confirmClose()) {
+- if (_session->closeInNormalWay()) {
++ if (!confirmClose()) {
++ return;
++ }
++
++ if (!_session->closeInNormalWay()) {
++ if (!confirmForceClose()) {
+ return;
+- } else if (confirmForceClose()) {
+- if (_session->closeInForceWay()) {
+- return;
+- } else {
+- qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way.";
+- }
+ }
++
++ if (!_session->closeInForceWay()) {
++ qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way.";
++ return;
++ }
++ }
++
++ if (factory()) {
++ factory()->removeClient(this);
+ }
+ }
+
+--
+cgit v1.1
+
diff --git a/kde-apps/konsole/konsole-20.04.1-r1.ebuild b/kde-apps/konsole/konsole-20.04.1-r1.ebuild
new file mode 100644
index 00000000000..f6870330550
--- /dev/null
+++ b/kde-apps/konsole/konsole-20.04.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.70.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-crash-on-close.patch" ) # bug 723214
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2020-05-28 23:22 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-05-28 23:22 UTC (permalink / raw
To: gentoo-commits
commit: e51f152cde1e609553ca5712df2f7ad9a4e40ca8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 23:20:43 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 28 23:21:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51f152c
kde-apps/konsole: Fix segfault on session close
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=415762
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/konsole-20.04.1-segfault-on-close.patch | 44 ++++++++++++++
kde-apps/konsole/konsole-20.04.1-r2.ebuild | 68 ++++++++++++++++++++++
2 files changed, 112 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch b/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
new file mode 100644
index 00000000000..55213878ad2
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
@@ -0,0 +1,44 @@
+From 5e5129d51fa85036832f1af44ec5b875d426392f Mon Sep 17 00:00:00 2001
+From: Maximilian Schiller <manimax3@outlook.de>
+Date: Thu, 28 May 2020 22:57:29 +0200
+Subject: [PATCH] Fix konsolepart Segfault when closed
+
+Assign the _view as the parent to the KXMLGuiFactory because the factory
+is referencing the view widget as its associated widget. Since the
+TerminalDisplay gets destructed first this is now a dangling pointer.
+If the view is set as the parent the factory gets cleaned up correctly.
+
+Also cleanup the created clientBuilder after destruction because it
+cant have a parent and would probably leak memory.
+
+BUG: 415762
+BUG: 421226
+BUG: 421194
+BUG: 421138
+---
+ src/SessionController.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/SessionController.cpp b/src/SessionController.cpp
+index e72f342c4..99e185f5e 100644
+--- a/src/SessionController.cpp
++++ b/src/SessionController.cpp
+@@ -1732,11 +1732,13 @@ void SessionController::showDisplayContextMenu(const QPoint& position)
+ if (factory() == nullptr) {
+ if (clientBuilder() == nullptr) {
+ setClientBuilder(new KXMLGUIBuilder(_view));
++
++ // Client builder does not get delted automatically
++ connect(this, &QObject::destroyed, this, [this]{ delete clientBuilder(); });
+ }
+
+- auto factory = new KXMLGUIFactory(clientBuilder(), this);
++ auto factory = new KXMLGUIFactory(clientBuilder(), _view);
+ factory->addClient(this);
+- ////qDebug() << "Created xmlgui factory" << factory;
+ }
+
+ QPointer<QMenu> popup = qobject_cast<QMenu*>(factory()->container(QStringLiteral("session-popup-menu"), this));
+--
+2.26.2
+
diff --git a/kde-apps/konsole/konsole-20.04.1-r2.ebuild b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
new file mode 100644
index 00000000000..95fd7ffcee3
--- /dev/null
+++ b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.70.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/org.kde.konsole
+https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-crash-on-close.patch" # bug 723214, in 20.04.2
+ "${FILESDIR}/${P}-qt-5.15-set-text-encoding-crash.patch" # KDE-Bug 419526; pending
+ "${FILESDIR}/${P}-segfault-on-close.patch" # KDE-Bug 415762; pending
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2020-12-17 22:00 Jason A. Donenfeld
0 siblings, 0 replies; 14+ messages in thread
From: Jason A. Donenfeld @ 2020-12-17 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 23227fd8a2cfd663d0e5d9aa4f107e64a47941ad
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 17:15:54 2020 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 22:00:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23227fd8
kde-apps/konsole: revbump to fix bold breakage
Upstream has a regression in the handling of bold/bright colors in
Konsole, detailed here:
https://bugs.kde.org/show_bug.cgi?id=430311
https://invent.kde.org/utilities/konsole/-/merge_requests/299
Before 20.12 colors looked like this:
https://invent.kde.org/utilities/konsole/uploads/3d18886419733f6e0c6bec0041aef5f8/image.png
With 20.12 colors look like this:
https://invent.kde.org/utilities/konsole/uploads/e5eaa8503d9888befdc3213ca5bc6aab/image.png
This follows the bug's suggestion of reverting a particular commit until
upstream has a proper fix.
Acked-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
.../konsole-20.12.0-revert-bold-breakage.patch | 33 ++++++++++
kde-apps/konsole/konsole-20.12.0-r1.ebuild | 72 ++++++++++++++++++++++
2 files changed, 105 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch
new file mode 100644
index 00000000000..8e79793601e
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch
@@ -0,0 +1,33 @@
+From 08a51bbdd70c0c850f44a660a7efbe4c394b8ee3 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Thu, 17 Dec 2020 17:21:44 +0100
+Subject: [PATCH] Revert "Fix bold character color paint"
+
+This reverts commit 270d6ea3247bb41a51535129e4b1c8eef51cf316.
+---
+ src/Screen.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/Screen.cpp b/src/Screen.cpp
+index 8e7eee51..c8f477ce 100644
+--- a/src/Screen.cpp
++++ b/src/Screen.cpp
+@@ -474,8 +474,14 @@ void Screen::updateEffectiveRendition()
+ _effectiveBackground = _currentBackground;
+ }
+
+- if ((_currentRendition & RE_BOLD) == 0 && (_currentRendition & RE_FAINT) != 0) {
++ if ((_currentRendition & RE_BOLD) != 0) {
++ if ((_currentRendition & RE_FAINT) == 0) {
++ _effectiveForeground.setIntensive();
++ }
++ } else {
++ if ((_currentRendition & RE_FAINT) != 0) {
+ _effectiveForeground.setFaint();
++ }
+ }
+ }
+
+--
+2.29.2
+
diff --git a/kde-apps/konsole/konsole-20.12.0-r1.ebuild b/kde-apps/konsole/konsole-20.12.0-r1.ebuild
new file mode 100644
index 00000000000..ddcce96264f
--- /dev/null
+++ b/kde-apps/konsole/konsole-20.12.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.75.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kinit-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-revert-bold-breakage.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # drkonqi process interferes. bug 702690
+ local myctestargs=(
+ -E "(DBusTest)"
+ )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2021-08-13 20:14 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2021-08-13 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 9a6221644bee352314ff6e2047f415dd289f5d06
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 13 20:11:26 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 13 20:13:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a622164
kde-apps/konsole: Fix crash when setting blur effect
Upstream commit f24dd6acc28393ba6f731be1360731c01a9a1ef0
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439871
Closes: https://bugs.gentoo.org/807905
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/konsole-21.08.0-fix-crash-w-blur.patch | 49 ++++++++++++++++++++++
kde-apps/konsole/konsole-21.08.0-r1.ebuild | 1 +
2 files changed, 50 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch
new file mode 100644
index 00000000000..b0c7193eda8
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.08.0-fix-crash-w-blur.patch
@@ -0,0 +1,49 @@
+From f24dd6acc28393ba6f731be1360731c01a9a1ef0 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 16 Jul 2021 21:37:51 +0200
+Subject: [PATCH] Fix crash when setting blur effect
+
+Basically to use QWidget::windowHandle() to get a QWindow*, we need to first
+set the Qt::WA_NativeWindow attribute on the QWidget. See:
+https://phabricator.kde.org/D23108
+
+BUG: 439871
+FIXED-IN: 21.12
+(cherry picked from commit a6b2bd539162b39191e827566b656bd97266ffad)
+---
+ src/MainWindow.cpp | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index ed5d8cc3d..c67acf8b9 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -56,6 +56,8 @@
+ #include "terminalDisplay/TerminalDisplay.h"
+ #include "widgets/ViewContainer.h"
+
++#include <konsoledebug.h>
++
+ using namespace Konsole;
+
+ MainWindow::MainWindow() :
+@@ -889,7 +891,15 @@ void MainWindow::setBlur(bool blur)
+ #if KWINDOWSYSTEM_VERSION < QT_VERSION_CHECK(5,82,0)
+ KWindowEffects::enableBlurBehind(winId(), blur);
+ #else
+- KWindowEffects::enableBlurBehind(windowHandle(), blur);
++ // Set the WA_NativeWindow attribute to force the creation of the QWindow.
++ // Without this QWidget::windowHandle() returns 0.
++ // See https://phabricator.kde.org/D23108
++ setAttribute(Qt::WA_NativeWindow);
++ if (QWindow *window = windowHandle()) {
++ KWindowEffects::enableBlurBehind(window, blur);
++ } else {
++ qCWarning(KonsoleDebug) << "Blur effect couldn't be enabled.";
++ }
+ #endif
+ }
+ }
+--
+GitLab
+
diff --git a/kde-apps/konsole/konsole-21.08.0-r1.ebuild b/kde-apps/konsole/konsole-21.08.0-r1.ebuild
index a9745100e0f..4095d9ac5f9 100644
--- a/kde-apps/konsole/konsole-21.08.0-r1.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r1.ebuild
@@ -52,6 +52,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
+ "${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
)
src_configure() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2021-08-18 7:19 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2021-08-18 7:19 UTC (permalink / raw
To: gentoo-commits
commit: f0b8fd584285365af19662391cbb62af44c039bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 07:18:16 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 07:19:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b8fd58
kde-apps/konsole: Fix MainWindow size when there is no saved size
Upstream commit c78edfbac49852cec40efd5cbe73c341bc06c5ab
See also: https://mail.kde.org/pipermail/distributions/2021-August/001044.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437791
Bug: https://bugs.gentoo.org/808627
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...1.08.0-fix-MainWindow-size-w-o-saved-size.patch | 79 ++++++++++++++++++++++
...21.08.0-r2.ebuild => konsole-21.08.0-r3.ebuild} | 4 +-
2 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch b/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch
new file mode 100644
index 00000000000..48fe1be666a
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.08.0-fix-MainWindow-size-w-o-saved-size.patch
@@ -0,0 +1,79 @@
+From c78edfbac49852cec40efd5cbe73c341bc06c5ab Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Thu, 29 Jul 2021 18:45:45 +0200
+Subject: [PATCH] Fix MainWindow size when there is no saved size
+
+The very first time a user runs Konsole, where is no konsolerc file in $HOME,
+there is no saved size to restore, instead use the sizeHint(), which ideally
+will be the size set in the default profile (based on lines/columns setting).
+
+CCBUG: 437791
+---
+ src/MainWindow.cpp | 21 +++++++++++++++------
+ src/MainWindow.h | 1 +
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index a4b36b61d..9b025c8fe 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -70,13 +70,22 @@ MainWindow::MainWindow() :
+ _menuBarInitialVisibility(true),
+ _menuBarInitialVisibilityApplied(false)
+ {
+- if (!KonsoleSettings::saveGeometryOnExit()) {
++ KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc"));
++ KConfigGroup cg = konsoleConfig->group(QStringLiteral("MainWindow"));
++ const bool isGroup = cg.exists();
++ if (isGroup) {
++ const QString stateConfig = cg.readEntry(QStringLiteral("State"));
++
++ // If "stateConfig" is empty then this is the very first run,
++ // i.e. no konsolerc file in $HOME
++ _isSavedUiState = !stateConfig.isEmpty();
++ }
++
++ if (isGroup && !KonsoleSettings::saveGeometryOnExit()) {
+ // If we are not using the global Konsole save geometry on exit,
+ // remove all geometry data from [MainWindow] in Konsolerc, so KWin will
+ // manage it directly
+- KSharedConfigPtr konsoleConfig = KSharedConfig::openConfig(QStringLiteral("konsolerc"));
+- KConfigGroup group = konsoleConfig->group("MainWindow");
+- QMap<QString, QString> configEntries = group.entryMap();
++ QMap<QString, QString> configEntries = cg.entryMap();
+ QMapIterator<QString, QString> i(configEntries);
+
+ while (i.hasNext()) {
+@@ -93,7 +102,7 @@ MainWindow::MainWindow() :
+ || i.key().contains(QLatin1String(" YPosition"))
+ #endif
+ ) {
+- group.deleteEntry(i.key());
++ cg.deleteEntry(i.key());
+ }
+ }
+ }
+@@ -949,7 +958,7 @@ void MainWindow::showEvent(QShowEvent *event)
+ _menuBarInitialVisibilityApplied = true;
+ }
+
+- if (!KonsoleSettings::saveGeometryOnExit()) {
++ if (!_isSavedUiState || !KonsoleSettings::saveGeometryOnExit()) {
+ // Delay resizing to here, so that the other parts of the UI
+ // (ViewManager, TabbedViewContainer, TerminalDisplay ... etc)
+ // have been created and TabbedViewContainer::sizeHint() returns
+diff --git a/src/MainWindow.h b/src/MainWindow.h
+index a80674012..876a81d71 100644
+--- a/src/MainWindow.h
++++ b/src/MainWindow.h
+@@ -200,6 +200,7 @@ private:
+ bool _menuBarInitialVisibility;
+ bool _menuBarInitialVisibilityApplied;
+ bool _blurEnabled = false;
++ bool _isSavedUiState = false;
+ };
+ }
+
+--
+GitLab
+
diff --git a/kde-apps/konsole/konsole-21.08.0-r2.ebuild b/kde-apps/konsole/konsole-21.08.0-r3.ebuild
similarity index 94%
rename from kde-apps/konsole/konsole-21.08.0-r2.ebuild
rename to kde-apps/konsole/konsole-21.08.0-r3.ebuild
index 00032973af8..fe8cab4b97f 100644
--- a/kde-apps/konsole/konsole-21.08.0-r2.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r3.ebuild
@@ -53,8 +53,8 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
- # KDE-bugs 430036, 439339; backport pending for 21.08 branch
- "${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch"
+ "${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # KDE-bugs 430036, 439339
+ "${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 437791
)
src_configure() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2021-08-30 12:58 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2021-08-30 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 1d44e1110d380df8df6b397520eecb201fea4d6a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 12:17:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 12:58:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d44e111
kde-apps/konsole: Only emit empty() in SessionFinished()
...when in TabbedNavigation mode.
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=441206
Closes: https://bugs.gentoo.org/810598
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ionFinished-only-in-TabbedNavigation-mode.patch | 53 ++++++++++++++++++++++
...21.04.3-r2.ebuild => konsole-21.04.3-r3.ebuild} | 1 +
...21.08.0-r4.ebuild => konsole-21.08.0-r5.ebuild} | 1 +
3 files changed, 55 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
new file mode 100644
index 00000000000..d02846ace5a
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch
@@ -0,0 +1,53 @@
+From 2684bc7fa5ac0b740b3e8661c3a0ae0136fde0a7 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sun, 22 Aug 2021 20:02:52 +0200
+Subject: [PATCH] Only emit empty() in SessionFinished() when in
+ TabbedNavigation mode
+
+empty() is emitted so that MainWindow calls close() and we get rid of the
+colours-flashing bug when closing the last session/tab in a window, see
+commit bbec72250d080. However all that isn't relevant when we are in
+konsole Part mode, where there are no tabs or MainWindows.
+
+This fixes a crash in Dolphin when closing its window while the embedded
+Konsole Part is open. The crash would happen as calling
+ViewContainer::currentTabViewCount() would end up in the ViewSplitter code
+path, which is no-op in Konsole Part.
+
+To test:
+- Open dolphin, make sure the terminal panel isn't open to begin with
+- open the terminal panel
+- close the dolphin window while the terminal panel is open
+
+BUG: 441206
+FIXED-IN: 21.08.1
+---
+ src/ViewManager.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
+index 92d2951fc..2ba77e9f0 100644
+--- a/src/ViewManager.cpp
++++ b/src/ViewManager.cpp
+@@ -494,11 +494,13 @@ void ViewManager::sessionFinished()
+ return;
+ }
+
+- // The last session/tab, and only one view (no splits), emit empty()
+- // so that close() is called in MainWindow, fixes #432077
+- if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
+- Q_EMIT empty();
+- return;
++ if (_navigationMethod == TabbedNavigation) {
++ // The last session/tab, and only one view (no splits), emit empty()
++ // so that close() is called in MainWindow, fixes #432077
++ if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) {
++ Q_EMIT empty();
++ return;
++ }
+ }
+
+ auto *session = qobject_cast<Session *>(sender());
+--
+GitLab
+
diff --git a/kde-apps/konsole/konsole-21.04.3-r2.ebuild b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
similarity index 95%
rename from kde-apps/konsole/konsole-21.04.3-r2.ebuild
rename to kde-apps/konsole/konsole-21.04.3-r3.ebuild
index c95192f968c..8ebbdcdf1dd 100644
--- a/kde-apps/konsole/konsole-21.04.3-r2.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3-r3.ebuild
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510
+ "${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598
)
src_prepare() {
diff --git a/kde-apps/konsole/konsole-21.08.0-r4.ebuild b/kde-apps/konsole/konsole-21.08.0-r5.ebuild
similarity index 95%
rename from kde-apps/konsole/konsole-21.08.0-r4.ebuild
rename to kde-apps/konsole/konsole-21.08.0-r5.ebuild
index d4600f096a8..22a1835a1ff 100644
--- a/kde-apps/konsole/konsole-21.08.0-r4.ebuild
+++ b/kde-apps/konsole/konsole-21.08.0-r5.ebuild
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-21.04.3-no-flash-on-session-close.patch" # bug 807933
"${FILESDIR}/${PN}-21.04.3-dont-close-window-while-split.patch" # bug 808510
+ "${FILESDIR}/${PN}-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598
"${FILESDIR}/${P}-fix-crash-w-blur.patch" # bug 807905, fixed in 21.08.1
"${FILESDIR}/${P}-fix-KXmlGUI-toolbars-and-MainWindow-size.patch" # KDE-bugs 430036, 439339
"${FILESDIR}/${P}-fix-MainWindow-size-w-o-saved-size.patch" # KDE-bug 437791
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2022-08-06 7:45 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2022-08-06 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 7ec978e7f9bb50d0353c0bdacc8d278339f51805
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 13:45:49 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 07:26:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec978e7
kde-apps/konsole: Fix build with USE -X
Upstream commit 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/konsole-22.04.3-without_x11.patch | 46 ++++++++++++++++++++++
kde-apps/konsole/konsole-22.04.3.ebuild | 5 ++-
2 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..ed396fcf20ab
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
@@ -0,0 +1,46 @@
+From 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:43:18 +0100
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61ed70cd7..565682848 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,10 +103,13 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+ )
+
+ if(NOT APPLE)
+- find_package(X11)
+- set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++ if (NOT WITHOUT_X11)
++ find_package(X11)
++ set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
++ set(HAVE_X11 ${X11_FOUND})
++ endif()
+ endif()
+-set(HAVE_X11 ${X11_FOUND})
+
+ # Check for function GETPWUID
+ check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
+--
+GitLab
+
diff --git a/kde-apps/konsole/konsole-22.04.3.ebuild b/kde-apps/konsole/konsole-22.04.3.ebuild
index cce03a53b3c6..d02a5534dca2 100644
--- a/kde-apps/konsole/konsole-22.04.3.ebuild
+++ b/kde-apps/konsole/konsole-22.04.3.ebuild
@@ -50,11 +50,12 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
-
ecm_src_configure
}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/
@ 2024-07-12 17:40 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2024-07-12 17:40 UTC (permalink / raw
To: gentoo-commits
commit: d0b7e3ec2f89f77780354cd607642b9895ca19ac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 17:22:34 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 17:33:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b7e3ec
kde-apps/konsole: Re-add IUSE X, add missing USEdep, drop obsolete patch
Amends (rather fixes) commit 6663a2bf1415d295444b5500d6911ee6e6f15727.
Upstream commit c5f2315c9df05ca069de25ab741d9fc38a6de21a
Bug: https://bugs.gentoo.org/935530
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/konsole/files/konsole-24.05.2-cmake.patch | 135 +++++++++++++++++++++
kde-apps/konsole/konsole-24.05.2-r1.ebuild | 67 ++++++++++
2 files changed, 202 insertions(+)
diff --git a/kde-apps/konsole/files/konsole-24.05.2-cmake.patch b/kde-apps/konsole/files/konsole-24.05.2-cmake.patch
new file mode 100644
index 000000000000..dbedc87de729
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-24.05.2-cmake.patch
@@ -0,0 +1,135 @@
+From c5f2315c9df05ca069de25ab741d9fc38a6de21a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 7 Jul 2024 23:27:32 +0200
+Subject: [PATCH] Drop faux X11 dependency and switch WITHOUT_X11 option to
+ WITH_X11
+
+X11 is nowhere needed in the codebase. Follow-up to 2f116f9fb2438a6e66b6702b3cc2ace9d0205f96
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 7 +------
+ src/MainWindow.cpp | 8 ++++----
+ src/WindowSystemInfo.cpp | 4 ++--
+ src/config-konsole.h.cmake | 2 +-
+ src/main.cpp | 4 ++--
+ 5 files changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 80292afd1b..4746aae72a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,12 +105,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
+ find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
+
+ if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
+- option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
+- if(NOT WITHOUT_X11)
+- find_package(X11)
+- set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
+- set(HAVE_X11 ${X11_FOUND})
+- endif()
++ option(WITH_X11 "Build with X11 integration" ON)
+ endif()
+
+ # Check for function GETPWUID
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index c034288df4..1631053572 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -35,7 +35,7 @@
+ #include <KWindowSystem>
+ #include <KXMLGUIFactory>
+
+-#if HAVE_X11
++#if WITH_X11
+ #include <KX11Extras>
+ #endif
+
+@@ -156,7 +156,7 @@ void MainWindow::activationRequest(const QString &xdgActivationToken)
+ KWindowSystem::setCurrentXdgActivationToken(xdgActivationToken);
+
+ if (KWindowSystem::isPlatformX11()) {
+-#if HAVE_X11
++#if WITH_X11
+ KX11Extras::forceActiveWindow(winId());
+ #endif
+ } else {
+@@ -713,7 +713,7 @@ bool MainWindow::queryClose()
+ // NOTE: Some, if not all, of the below KWindowSystem calls are only
+ // implemented under x11 (KDE4.8 kdelibs/kdeui/windowmanagement).
+
+-#if HAVE_X11
++#if WITH_X11
+ // make sure the window is shown on current desktop and is not minimized
+ KX11Extras::setOnDesktop(winId(), KX11Extras::currentDesktop());
+ #endif
+@@ -1022,7 +1022,7 @@ void MainWindow::setRemoveWindowTitleBarAndFrame(bool frameless)
+ }
+
+ if (KWindowSystem::isPlatformX11()) {
+-#if HAVE_X11
++#if WITH_X11
+ const auto oldGeometry = saveGeometry();
+ // This happens for every Konsole window. It depends on
+ // the fact that every window is processed in single thread
+diff --git a/src/WindowSystemInfo.cpp b/src/WindowSystemInfo.cpp
+index d6cad5f68b..28cc3bd6cd 100644
+--- a/src/WindowSystemInfo.cpp
++++ b/src/WindowSystemInfo.cpp
+@@ -11,7 +11,7 @@
+
+ #include <QtGlobal>
+
+-#if HAVE_X11
++#if WITH_X11
+ #include <KWindowSystem>
+ #include <KX11Extras>
+ #endif
+@@ -22,7 +22,7 @@ bool WindowSystemInfo::HAVE_TRANSPARENCY = false;
+
+ bool WindowSystemInfo::compositingActive()
+ {
+-#if HAVE_X11
++#if WITH_X11
+ return !KWindowSystem::isPlatformX11() || KX11Extras::compositingActive();
+ #else
+ return true;
+diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake
+index fd8f35822c..a1702d8ed9 100644
+--- a/src/config-konsole.h.cmake
++++ b/src/config-konsole.h.cmake
+@@ -3,7 +3,7 @@
+ /* Defined if on DragonFly BSD */
+ #cmakedefine01 HAVE_OS_DRAGONFLYBSD
+
+-#cmakedefine01 HAVE_X11
++#cmakedefine01 WITH_X11
+
+ #cmakedefine01 HAVE_DBUS
+
+diff --git a/src/main.cpp b/src/main.cpp
+index c9b8b12978..2207db1d7c 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -286,7 +286,7 @@ bool shouldUseNewProcess(int argc, char *argv[])
+ QStringList qtProblematicOptions;
+ qtProblematicOptions << QStringLiteral("--session") << QStringLiteral("--name") << QStringLiteral("--reverse") << QStringLiteral("--stylesheet")
+ << QStringLiteral("--graphicssystem");
+-#if HAVE_X11
++#if WITH_X11
+ qtProblematicOptions << QStringLiteral("--display") << QStringLiteral("--visual");
+ #endif
+ for (const QString &option : std::as_const(qtProblematicOptions)) {
+@@ -298,7 +298,7 @@ bool shouldUseNewProcess(int argc, char *argv[])
+ // take KDE options into consideration
+ QStringList kdeProblematicOptions;
+ kdeProblematicOptions << QStringLiteral("--config") << QStringLiteral("--style");
+-#if HAVE_X11
++#if WITH_X11
+ kdeProblematicOptions << QStringLiteral("--waitforwm");
+ #endif
+
+--
+GitLab
+
diff --git a/kde-apps/konsole/konsole-24.05.2-r1.ebuild b/kde-apps/konsole/konsole-24.05.2-r1.ebuild
new file mode 100644
index 000000000000..f9039c642964
--- /dev/null
+++ b/kde-apps/konsole/konsole-24.05.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="X"
+
+DEPEND="
+ dev-libs/icu:=
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtmultimedia-${QTMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kpty-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # fixed in 24.08
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_X11=$(usex X)
+ )
+ ecm_src_configure
+}
+
+src_test() {
+ # DBusTest: drkonqi process interferes. bug 702690
+ # TerminalInterfaceTest: unbelievably flaky, bug 862594 and bug 662756
+ local myctestargs=(
+ -E "(DBusTest|TerminalInterfaceTest)"
+ )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-07-12 17:40 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-13 20:14 [gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/files/, kde-apps/konsole/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-07-12 17:40 Andreas Sturmlechner
2022-08-06 7:45 Andreas Sturmlechner
2021-08-30 12:58 Andreas Sturmlechner
2021-08-18 7:19 Andreas Sturmlechner
2020-12-17 22:00 Jason A. Donenfeld
2020-05-28 23:22 Andreas Sturmlechner
2020-05-28 19:40 Andreas Sturmlechner
2020-04-15 22:27 Andreas Sturmlechner
2020-02-12 21:54 Andreas Sturmlechner
2018-12-25 21:23 Andreas Sturmlechner
2018-11-13 11:32 Andreas Sturmlechner
2017-01-29 14:13 Andreas Sturmlechner
2016-11-20 16:21 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox