* [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/, kde-apps/yakuake/
@ 2023-01-05 18:03 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-01-05 18:03 UTC (permalink / raw
To: gentoo-commits
commit: a67cf84cb44811a53ff5ba7c00f31139987fa744
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 3 14:47:44 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 18:02:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67cf84c
kde-apps/yakuake: drop 22.12.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/yakuake/Manifest | 1 -
| 33 ------------
kde-apps/yakuake/yakuake-22.12.0.ebuild | 60 ----------------------
3 files changed, 94 deletions(-)
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 4a29fc345daa..9541afc93cbe 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,3 +1,2 @@
DIST yakuake-22.08.3.tar.xz 414092 BLAKE2B 235679d6439560cef5519a414f0177834bcd95f440b57428106e6b285a53811a4f32bce6b2ca7c8566e4567e8d9f56ea332e41b175b22d3e649e951ea7e8c794 SHA512 4f02b90d138fa741c8d30f11e409fcc7b08d8775d35e35d90c3d050bbd0f0ce5d2c46ce2c3809e8ad1362eac5661681be75ebe3703570859e4d9e8ebd62ec1d0
-DIST yakuake-22.12.0.tar.xz 426592 BLAKE2B e053ad61017a2229ed2f9341457e2effc08b7e0f98ae9e59d5d83a8045de89e4ecdbc4619e913e877fb53737ba5fa3e83667659d0d223b0083437ad7c97703a8 SHA512 2569d67516b9e80277e37291c01ae7225ddfa04a4410ee13add03a1ae8453a431a525cdacb8e447bd32bf6b55e60f81eb49431d2c4a13d5e1e7addc65a830842
DIST yakuake-22.12.1.tar.xz 426896 BLAKE2B 54f9a231ae06eac7477b2da9d7aeb6d2cdd38ca1cb7729c33947520329066ac68e4ecec72ebfe6f1d824c352b1ae78cde554834258b1d993ffad0bff0abd5afe SHA512 734b066a311baf0e3f491b98c0891836b0058694fd8a46d6e13a743248c64a2b19ccb93baedf167be0cdfdeff7a6e4f8371bce12cd701aa5f429746dd5774d07
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
deleted file mode 100644
index ae43268397ca..000000000000
--- a/kde-apps/yakuake/files/yakuake-22.12.0-missing-header.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1f2df3b0f57f5b3f4e4a5da8608cccde4edb2de5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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 <QPainter>
- #include <QScreen>
- #include <QWhatsThis>
-+#include <QWindow>
-
- #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
deleted file mode 100644
index 1dbd5fc92756..000000000000
--- a/kde-apps/yakuake/yakuake-22.12.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.99.0
-QTMIN=5.15.5
-inherit ecm gear.kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://apps.kde.org/yakuake/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~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}-missing-header.patch" ) # bug 885101
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package absolute-position KF5Wayland)
- -DWITHOUT_X11=$(usex !X)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/, kde-apps/yakuake/
@ 2023-04-22 12:15 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-04-22 12:15 UTC (permalink / raw
To: gentoo-commits
commit: 5af7e43d0856706bc3448b4e80711c31ebc9931e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 12:12:49 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 12:15:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af7e43d
kde-apps/yakuake: Fix build with USE=-absolute-position
Closes: https://bugs.gentoo.org/904742
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/yakuake-23.04.0-missing-ifdef.patch | 32 ++++++++++++++++++++++
kde-apps/yakuake/yakuake-23.04.0.ebuild | 2 ++
2 files changed, 34 insertions(+)
diff --git a/kde-apps/yakuake/files/yakuake-23.04.0-missing-ifdef.patch b/kde-apps/yakuake/files/yakuake-23.04.0-missing-ifdef.patch
new file mode 100644
index 000000000000..aae30407060c
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-23.04.0-missing-ifdef.patch
@@ -0,0 +1,32 @@
+From 0901b2f27fdfb9092f7d56da2a9129fa4b5e1183 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 22 Apr 2023 14:10:34 +0200
+Subject: [PATCH] Add missing HAVE_KWAYLAND ifdef
+
+Follow-up to 91a90aa6f30e95d2927d9d089eb5c4f429677080
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ app/mainwindow.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index 9f6dca0..6f21a21 100644
+--- a/app/mainwindow.cpp
++++ b/app/mainwindow.cpp
+@@ -933,10 +933,12 @@ void MainWindow::applyWindowProperties()
+ KWindowSystem::setState(winId(), NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager);
+ }
+
++#if HAVE_KWAYLAND
+ if (m_isWayland && m_plasmaShellSurface) {
+ m_plasmaShellSurface->setSkipTaskbar(true);
+ m_plasmaShellSurface->setSkipSwitcher(true);
+ }
++#endif
+
+ KX11Extras::setOnAllDesktops(winId(), Settings::showOnAllDesktops());
+ KWindowEffects::enableBlurBehind(windowHandle(), m_sessionStack->wantsBlur());
+--
+2.40.0
+
diff --git a/kde-apps/yakuake/yakuake-23.04.0.ebuild b/kde-apps/yakuake/yakuake-23.04.0.ebuild
index 6ae55f80d4b7..ebae5522753a 100644
--- a/kde-apps/yakuake/yakuake-23.04.0.ebuild
+++ b/kde-apps/yakuake/yakuake-23.04.0.ebuild
@@ -47,6 +47,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-missing-ifdef.patch" ) # bug 904742
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package absolute-position KF5Wayland)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/, kde-apps/yakuake/
@ 2023-05-11 16:04 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-05-11 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 6ff212aef9fbc2f2754d3330d1b659e2aaff0287
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 11 13:12:20 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 11 16:01:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff212ae
kde-apps/yakuake: drop 23.04.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/yakuake/Manifest | 1 -
.../files/yakuake-23.04.0-missing-ifdef.patch | 32 ------------
kde-apps/yakuake/yakuake-23.04.0.ebuild | 58 ----------------------
3 files changed, 91 deletions(-)
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 031aaf6b22a3..64a3cf025d80 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,3 +1,2 @@
DIST yakuake-22.12.3.tar.xz 427964 BLAKE2B 72091a73f852d3c62b42a1ab643c77e49c6081b7d584dd1c3980dfa21b5c7f3dea0cad6eb3a571f16377536e040c74bf3b2e8c397d35e40190559846eb31cf3c SHA512 30f5e18f17e3f54b68abad54a88dbb436b750f4d01be8abdb5c3fb83ba374f8f2b3dd28fa441a335e268d871a9aa3fb17518dc8fef557d6333cf500a4125e76a
-DIST yakuake-23.04.0.tar.xz 428468 BLAKE2B 3b778e609b5984ac9f15c35504cc41e7643738ba5ed1de5b3bd7ba686ebf5c0e9a56eb5949399e280b0a8101daeae2a98ac3329a86aba385d35f02e65ee45e26 SHA512 f995648a27d4152b9b2a24929c78198b56c37500ace934b7b2b07d4f71356c49bae7f5de515e5acee7f43407f1d864443efe44ba54ea9182a6d295500988b215
DIST yakuake-23.04.1.tar.xz 428616 BLAKE2B e07e41024cb0d55d79a20caa2c1e58c2ccf26252b3d93afbd8a888a89ed3bc683809ed17051f643a9cc465bd17d1823624c26c688f1d1ad9380cf04ed4f813d4 SHA512 bc5dd46d80b5a857fa2b1c53cac05402f5207d645ed045f0558e1d7d0a5e785b4ca1e0a2f3256d0d42e54713eda70d61f1cd062e782be4460fd3045663b8a1ba
diff --git a/kde-apps/yakuake/files/yakuake-23.04.0-missing-ifdef.patch b/kde-apps/yakuake/files/yakuake-23.04.0-missing-ifdef.patch
deleted file mode 100644
index aae30407060c..000000000000
--- a/kde-apps/yakuake/files/yakuake-23.04.0-missing-ifdef.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0901b2f27fdfb9092f7d56da2a9129fa4b5e1183 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 22 Apr 2023 14:10:34 +0200
-Subject: [PATCH] Add missing HAVE_KWAYLAND ifdef
-
-Follow-up to 91a90aa6f30e95d2927d9d089eb5c4f429677080
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- app/mainwindow.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index 9f6dca0..6f21a21 100644
---- a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -933,10 +933,12 @@ void MainWindow::applyWindowProperties()
- KWindowSystem::setState(winId(), NET::KeepAbove | NET::SkipTaskbar | NET::SkipPager);
- }
-
-+#if HAVE_KWAYLAND
- if (m_isWayland && m_plasmaShellSurface) {
- m_plasmaShellSurface->setSkipTaskbar(true);
- m_plasmaShellSurface->setSkipSwitcher(true);
- }
-+#endif
-
- KX11Extras::setOnAllDesktops(winId(), Settings::showOnAllDesktops());
- KWindowEffects::enableBlurBehind(windowHandle(), m_sessionStack->wantsBlur());
---
-2.40.0
-
diff --git a/kde-apps/yakuake/yakuake-23.04.0.ebuild b/kde-apps/yakuake/yakuake-23.04.0.ebuild
deleted file mode 100644
index ebae5522753a..000000000000
--- a/kde-apps/yakuake/yakuake-23.04.0.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.104.0
-QTMIN=5.15.5
-inherit ecm gear.kde.org
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://apps.kde.org/yakuake/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="absolute-position"
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${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[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- x11-libs/libX11
- absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-ifdef.patch" ) # bug 904742
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package absolute-position KF5Wayland)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/, kde-apps/yakuake/
@ 2023-08-26 11:01 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-08-26 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 0ddd7ebfc0f6e414b86701d69bc902d35d495704
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 10:51:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 11:00:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddd7ebf
kde-apps/yakuake: Fix cmake w/ IUSE=-absolute-position
See also: https://invent.kde.org/utilities/yakuake/-/merge_requests/111
Bug: https://bugs.gentoo.org/904742
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch | 28 ++++++++++++++++++++++
kde-apps/yakuake/yakuake-23.08.0.ebuild | 2 ++
2 files changed, 30 insertions(+)
diff --git a/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch b/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch
new file mode 100644
index 000000000000..808aa488d0da
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch
@@ -0,0 +1,28 @@
+From 0d0a3639b1c1e33aa49e979879e29064808a0a96 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 26 Aug 2023 12:49:24 +0200
+Subject: [PATCH] Fix broken HAVE_KWAYLAND assignment
+
+Fixes up commit 3e58132f2315b99d0d8c8c233a8183079356506a
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d143f9..bfdcd12 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,7 +80,7 @@ if(NOT APPLE)
+ endif()
+
+ find_package(KF${KF_MAJOR_VERSION}Wayland ${KF_MIN_VERSION} CONFIG)
+- set(HAVE_KWAYLAND KF${KF_MAJOR_VERSION}Wayland_FOUND)
++ set(HAVE_KWAYLAND ${KF${KF_MAJOR_VERSION}Wayland_FOUND})
+ endif()
+
+ add_subdirectory(app)
+--
+2.42.0
+
diff --git a/kde-apps/yakuake/yakuake-23.08.0.ebuild b/kde-apps/yakuake/yakuake-23.08.0.ebuild
index e26baa415e5c..dde091307229 100644
--- a/kde-apps/yakuake/yakuake-23.08.0.ebuild
+++ b/kde-apps/yakuake/yakuake-23.08.0.ebuild
@@ -47,6 +47,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package absolute-position KF5Wayland)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-26 11:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-11 16:04 [gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/, kde-apps/yakuake/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-08-26 11:01 Andreas Sturmlechner
2023-04-22 12:15 Andreas Sturmlechner
2023-01-05 18:03 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox