[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/

2023-04-04 Thread Andreas Sturmlechner
commit: 2721f5747e25a3bb231c9b89fed17abe8a3a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  4 19:38:12 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  4 22:27:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2721f574

kde-apps/yakuake: drop 22.08.3-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/yakuake/Manifest  |  1 -
 .../files/yakuake-22.07.90-without_x11.patch   | 87 --
 kde-apps/yakuake/yakuake-22.08.3-r1.ebuild | 58 ---
 3 files changed, 146 deletions(-)

diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index f89dc39ca5b5..9c83d70c0cc5 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,2 +1 @@
-DIST yakuake-22.08.3.tar.xz 414092 BLAKE2B 
235679d6439560cef5519a414f0177834bcd95f440b57428106e6b285a53811a4f32bce6b2ca7c8566e4567e8d9f56ea332e41b175b22d3e649e951ea7e8c794
 SHA512 
4f02b90d138fa741c8d30f11e409fcc7b08d8775d35e35d90c3d050bbd0f0ce5d2c46ce2c3809e8ad1362eac5661681be75ebe3703570859e4d9e8ebd62ec1d0
 DIST yakuake-22.12.3.tar.xz 427964 BLAKE2B 
72091a73f852d3c62b42a1ab643c77e49c6081b7d584dd1c3980dfa21b5c7f3dea0cad6eb3a571f16377536e040c74bf3b2e8c397d35e40190559846eb31cf3c
 SHA512 
30f5e18f17e3f54b68abad54a88dbb436b750f4d01be8abdb5c3fb83ba374f8f2b3dd28fa441a335e268d871a9aa3fb17518dc8fef557d6333cf500a4125e76a

diff --git a/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch 
b/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch
deleted file mode 100644
index 2d46600e3dc2..
--- a/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 1213c6dfd34583b005d0a2dbe7876951a13361a2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sat, 27 Nov 2021 14:49:51 +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 

- CMakeLists.txt | 30 --
- app/CMakeLists.txt |  4 ++--
- 2 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eafad24..f9a8167 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,20 +51,22 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
- )
- 
- if(NOT APPLE)
--  find_package(X11)
--  set(HAVE_X11 ${X11_FOUND})
--
--  if(X11_FOUND)
--  if (QT_MAJOR_VERSION EQUAL "5")
--  find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
--  else()
--  find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui)
--  endif()
--  endif(X11_FOUND)
--
--  find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
--  set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
--endif(NOT APPLE)
-+option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
-+if(NOT WITHOUT_X11)
-+find_package(X11)
-+set(HAVE_X11 ${X11_FOUND})
-+if(X11_FOUND)
-+if (QT_MAJOR_VERSION EQUAL "5")
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
-+else()
-+find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui)
-+endif()
-+endif()
-+endif()
-+
-+find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
-+set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
-+endif()
- 
- add_subdirectory(app)
- add_subdirectory(data)
-diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
-index b2838ec..6ada125 100644
 a/app/CMakeLists.txt
-+++ b/app/CMakeLists.txt
-@@ -63,13 +63,13 @@ target_link_libraries(yakuake
- KF5::WidgetsAddons
- KF5::WindowSystem)
- 
--if(X11_FOUND)
-+if(HAVE_X11)
- if (TARGET Qt5::X11Extras)
- target_link_libraries(yakuake Qt5::X11Extras)
- elseif (TARGET Qt6::Gui)
- target_link_libraries(yakuake Qt6::GuiPrivate) # qtx11extras_p.h in 
knotificationrestrictions
- endif()
--endif(X11_FOUND)
-+endif()
- 
- if(KF5Wayland_FOUND)
-   target_link_libraries(yakuake KF5::WaylandClient)
--- 
-GitLab
-

diff --git a/kde-apps/yakuake/yakuake-22.08.3-r1.ebuild 
b/kde-apps/yakuake/yakuake-22.08.3-r1.ebuild
deleted file mode 100644
index 9a4b7e2e664e..
--- a/kde-apps/yakuake/yakuake-22.08.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.96.0
-QTMIN=5.15.5
-inherit ecm

[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/

2022-12-10 Thread Andreas Sturmlechner
commit: fe3f01e2d278213c90d28b5e7eb6c4299ddca808
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 10 14:24:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 10 14:25:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3f01e2

kde-apps/yakuake: Fix build with USE=-absolute-position

Closes: https://bugs.gentoo.org/885101
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/yakuake-22.12.0-missing-header.patch | 33 ++
 kde-apps/yakuake/yakuake-22.12.0.ebuild|  2 ++
 2 files changed, 35 insertions(+)

diff --git a/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch 
b/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch
new file mode 100644
index ..ae43268397ca
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch
@@ -0,0 +1,33 @@
+From 1f2df3b0f57f5b3f4e4a5da8608cccde4edb2de5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 10 Dec 2022 12:22:46 +0100
+Subject: [PATCH] Re-add missing header when building without KF5Wayland
+
+Otherwise we rely on KWayland/Client/surface.h to implicitly provide
+QWindow which may not be available.
+
+Partial revert of 9b93462943ab26ab015989321881dee13404d711
+See also: https://invent.kde.org/utilities/yakuake/-/merge_requests/80
+
+Downstream report: https://bugs.gentoo.org/885101
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ app/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index 4ea361e..8b0aab3 100644
+--- a/app/mainwindow.cpp
 b/app/mainwindow.cpp
+@@ -42,6 +42,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #if HAVE_X11
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+-- 
+2.38.1
+

diff --git a/kde-apps/yakuake/yakuake-22.12.0.ebuild 
b/kde-apps/yakuake/yakuake-22.12.0.ebuild
index 08906d9076f1..1dbd5fc92756 100644
--- a/kde-apps/yakuake/yakuake-22.12.0.ebuild
+++ b/kde-apps/yakuake/yakuake-22.12.0.ebuild
@@ -48,6 +48,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" ) # bug 885101
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package absolute-position KF5Wayland)



[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/

2022-08-06 Thread Andreas Sturmlechner
commit: 670ad97b10d0f7fbde3f5ff14ef07f3420945da5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 27 13:51:30 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  6 07:31:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670ad97b

kde-apps/yakuake: Fix build with USE -X

Upstream commit 1213c6dfd34583b005d0a2dbe7876951a13361a2

Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/yakuake-22.04.3-without_x11.patch| 78 ++
 kde-apps/yakuake/yakuake-22.04.3.ebuild|  4 +-
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch 
b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
new file mode 100644
index ..5daf29c35da4
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
@@ -0,0 +1,78 @@
+From 68bee7bce59bed1def66518bc254ecf7ae8985c5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 14:49:51 +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.
+
+* backported to release/22.04
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 22 --
+ app/CMakeLists.txt |  6 +++---
+ 2 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14f6842..0ec65b9 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -51,16 +51,18 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ )
+ 
+ if(NOT APPLE)
+-  find_package(X11)
+-  set(HAVE_X11 ${X11_FOUND})
+-
+-  if(X11_FOUND)
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
+-  endif(X11_FOUND)
+-
+-  find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
+-  set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
+-endif(NOT APPLE)
++option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
++if(NOT WITHOUT_X11)
++find_package(X11)
++set(HAVE_X11 ${X11_FOUND})
++if(X11_FOUND)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++endif()
++endif()
++
++find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
++set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
++endif()
+ 
+ add_subdirectory(app)
+ add_subdirectory(data)
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index 69aedcd..994d36f 100644
+--- a/app/CMakeLists.txt
 b/app/CMakeLists.txt
+@@ -63,9 +63,9 @@ target_link_libraries(yakuake
+ KF5::WidgetsAddons
+ KF5::WindowSystem)
+ 
+-if(X11_FOUND)
+-  target_link_libraries(yakuake Qt5::X11Extras ${X11_X11_LIB})
+-endif(X11_FOUND)
++if(HAVE_X11)
++target_link_libraries(yakuake Qt5::X11Extras)
++endif()
+ 
+ if(KF5Wayland_FOUND)
+   target_link_libraries(yakuake KF5::WaylandClient)
+-- 
+2.35.1
+

diff --git a/kde-apps/yakuake/yakuake-22.04.3.ebuild 
b/kde-apps/yakuake/yakuake-22.04.3.ebuild
index 0db7a4d76d4b..556269d0a620 100644
--- a/kde-apps/yakuake/yakuake-22.04.3.ebuild
+++ b/kde-apps/yakuake/yakuake-22.04.3.ebuild
@@ -48,10 +48,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package absolute-position KF5Wayland)
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
 
ecm_src_configure



[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/

2020-11-25 Thread Andreas Sturmlechner
commit: a9d26e400c770ca0c77bb0674a3c85efcee6f2f5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 25 17:51:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 25 18:05:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d26e40

kde-apps/yakuake: drop 20.04.3*

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/yakuake/Manifest  |  1 -
 ...ke-20.04.3-fix-fullscreen-mode-regression.patch | 37 -
 kde-apps/yakuake/yakuake-20.04.3-r1.ebuild | 60 --
 3 files changed, 98 deletions(-)

diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index eca5515454d..428b90b88a4 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,2 +1 @@
-DIST yakuake-20.04.3.tar.xz 374280 BLAKE2B 
aa53e81af0e77a74ac637d185108341b89ec82ff94dcbc3f3cb0a6a8916cb3b7bcd48bad4d127c073de7f6788a38ae7c8a8c4092aaa72ce9d405e7214ea7342a
 SHA512 
a5b9b42b8fb47fe94c06cbdfc54683ae33ce9a84da3942efba1fee52e6103bd8ab60ef4bf46316793577813940250909fe74e722db77f57157e650612e592658
 DIST yakuake-20.08.3.tar.xz 381328 BLAKE2B 
645538055977d42c37cb18d03c4512b9b11b6a289dbdea4f635348fff05e991e600e775e43f7968bb3a516fadc0f75abb6d8c07475adab3e29dfdea7fbfb03c1
 SHA512 
54cab72921686165047bd5dc8cc3052be90a75b3afc4aa81846f44cb074dcfba248eac26638e21252681ed272810dd5822dce9e031dc736d19eeda25bba3fc7c

diff --git 
a/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch 
b/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch
deleted file mode 100644
index 21b26ab0091..000
--- 
a/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 21b2d50d4c23cd375acda57ed03af288ae0651af Mon Sep 17 00:00:00 2001
-From: Anton Karmanov 
-Date: Thu, 16 Jul 2020 23:34:16 +0500
-Subject: [PATCH] Fix fullscreen mode regression
-
-BUG: 424286
-(cherry picked from commit 946ecc7fb569244f78f8658148b3bef9911a5af4)

- app/mainwindow.cpp | 9 -
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index d8303bd..2d22a9d 100644
 a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -1136,14 +1136,13 @@ void MainWindow::wmActiveWindowChanged()
- 
- void MainWindow::changeEvent(QEvent* event)
- {
--if (event->type() == QEvent::WindowStateChange)
--{
--if ((windowState() & Qt::WindowMaximized))
--{
-+if (event->type() == QEvent::WindowStateChange && !m_isFullscreen) {
-+if (windowState().testFlag(Qt::WindowMaximized)) {
- // Don't alter settings to new size so unmaximizing restores 
previous geometry.
- setWindowGeometry(100, 100, Settings::position());
- setWindowState(Qt::WindowMaximized);
--} else {
-+}
-+else {
- setWindowGeometry(Settings::width(), Settings::height(), 
Settings::position());
- }
- }
--- 
-GitLab
-

diff --git a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild 
b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
deleted file mode 100644
index bec0e30ba8f..000
--- a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://apps.kde.org/en/yakuake";
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="absolute-position X"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-apps/konsole-${PVCUT}:5
-   >=kde-frameworks/karchive-${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/kglobalaccel-${KFMIN}:5
-   >=kde-frameworks/ki18n-${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/kservice-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
-   )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-fullscreen-mode-regression.patch ) # bug 
736858
-
-

[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/, kde-apps/yakuake/files/

2020-08-22 Thread Andreas Sturmlechner
commit: 19205cda205f5f66ebd4cf18ee4627a7b268d2bb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 22 20:31:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug 22 20:31:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19205cda

kde-apps/yakuake: Fix fullscreen mode regression

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=424286
Reported-by: Agostino Sarubbo  gentoo.org>
Bug: https://bugs.gentoo.org/736858
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ke-20.04.3-fix-fullscreen-mode-regression.patch | 37 +
 kde-apps/yakuake/yakuake-20.04.3-r1.ebuild | 60 ++
 2 files changed, 97 insertions(+)

diff --git 
a/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch 
b/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch
new file mode 100644
index 000..21b26ab0091
--- /dev/null
+++ 
b/kde-apps/yakuake/files/yakuake-20.04.3-fix-fullscreen-mode-regression.patch
@@ -0,0 +1,37 @@
+From 21b2d50d4c23cd375acda57ed03af288ae0651af Mon Sep 17 00:00:00 2001
+From: Anton Karmanov 
+Date: Thu, 16 Jul 2020 23:34:16 +0500
+Subject: [PATCH] Fix fullscreen mode regression
+
+BUG: 424286
+(cherry picked from commit 946ecc7fb569244f78f8658148b3bef9911a5af4)
+---
+ app/mainwindow.cpp | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index d8303bd..2d22a9d 100644
+--- a/app/mainwindow.cpp
 b/app/mainwindow.cpp
+@@ -1136,14 +1136,13 @@ void MainWindow::wmActiveWindowChanged()
+ 
+ void MainWindow::changeEvent(QEvent* event)
+ {
+-if (event->type() == QEvent::WindowStateChange)
+-{
+-if ((windowState() & Qt::WindowMaximized))
+-{
++if (event->type() == QEvent::WindowStateChange && !m_isFullscreen) {
++if (windowState().testFlag(Qt::WindowMaximized)) {
+ // Don't alter settings to new size so unmaximizing restores 
previous geometry.
+ setWindowGeometry(100, 100, Settings::position());
+ setWindowState(Qt::WindowMaximized);
+-} else {
++}
++else {
+ setWindowGeometry(Settings::width(), Settings::height(), 
Settings::position());
+ }
+ }
+-- 
+GitLab
+

diff --git a/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild 
b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
new file mode 100644
index 000..078df434035
--- /dev/null
+++ b/kde-apps/yakuake/yakuake-20.04.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.70.0
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Quake-style terminal emulator based on konsole"
+HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake";
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="absolute-position X"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=kde-apps/konsole-${PVCUT}:5
+   >=kde-frameworks/karchive-${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/kglobalaccel-${KFMIN}:5
+   >=kde-frameworks/ki18n-${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/kservice-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+   X? (
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   x11-libs/libX11
+   )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-fullscreen-mode-regression.patch ) # bug 
736858
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package absolute-position KF5Wayland)
+   $(cmake_use_find_package X X11)
+   )
+
+   ecm_src_configure
+}