[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwayland/files/, kde-frameworks/kwayland/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwayland/files/, kde-frameworks/kwayland/

[Andreas Sturmlechner]

commit:     2cc3c6f1a63ffbf57e2e99974c379c012d0cb4b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 01:19:59 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 01:27:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc3c6f1

kde-frameworks/kwayland: Fix 5.64.0 build with Qt 5.14.0

Upstream commit c4a49fbf2d5dd63659ed0c679ce180eda89a6d0d

Reported-by: m.manico <AT> gmx.at
Closes: https://bugs.gentoo.org/703696
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kwayland/files/kwayland-5.64.0-qt-5.14.0.patch | 24 ++++++++++++++++++++++
 kde-frameworks/kwayland/kwayland-5.64.0.ebuild     |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch b/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch
new file mode 100644
index 00000000000..818e9894765
--- /dev/null
+++ b/kde-frameworks/kwayland/files/kwayland-5.64.0-qt-5.14.0.patch
@@ -0,0 +1,24 @@
+From c4a49fbf2d5dd63659ed0c679ce180eda89a6d0d Mon Sep 17 00:00:00 2001
+From: Roman Gilg <subdiff@gmail.com>
+Date: Fri, 22 Nov 2019 15:26:23 +0100
+Subject: Add missing include for Qt 5.14 build
+
+---
+ src/server/xdgoutput_interface.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/server/xdgoutput_interface.cpp b/src/server/xdgoutput_interface.cpp
+index e32ccf9..b2b2cba 100644
+--- a/src/server/xdgoutput_interface.cpp
++++ b/src/server/xdgoutput_interface.cpp
+@@ -25,6 +25,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ #include <wayland-xdg-output-server-protocol.h>
+ 
++#include <QHash>
++
+ namespace KWayland
+ {
+ namespace Server
+-- 
+cgit v1.1

diff --git a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild
index b1e978e691f..5a81ee17e71 100644
--- a/kde-frameworks/kwayland/kwayland-5.64.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.64.0.ebuild
@@ -30,3 +30,5 @@ RDEPEND="${COMMON_DEPEND}
 
 # All failing, I guess we need a virtual wayland server
 RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.14.0.patch" )

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwayland/files/, kde-frameworks/kwayland/

[Andreas Sturmlechner]

commit:     f25fcb82d41e98f66935526fed68fa3265ec0434
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 14:49:19 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 14:49:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25fcb82

kde-frameworks/kwayland: Fix pkgconfig

Upstream commit 9e70125d2991a2a2ab64e606ccabd223848945b0

Closes: https://bugs.gentoo.org/838376
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kwayland/files/kwayland-5.93.0-pkgconfig.patch | 27 ++++++++++++++++++++++
 ...and-5.93.0.ebuild => kwayland-5.93.0-r1.ebuild} |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch b/kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch
new file mode 100644
index 000000000000..8b58aa012669
--- /dev/null
+++ b/kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch
@@ -0,0 +1,27 @@
+From 9e70125d2991a2a2ab64e606ccabd223848945b0 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 15 Apr 2022 16:34:56 +0200
+Subject: [PATCH] Fix include path in the generated pkgconfig file
+
+Reported at
+https://invent.kde.org/frameworks/kwayland/-/merge_requests/52#note_433191
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34bb0ff..873c8cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,7 +110,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwayland_version.h
+ 
+ if (NOT WIN32)
+     ecm_generate_pkgconfig_file(BASE_NAME KF5WaylandClient
+-      INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}
++      INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KWayland
+       DEPS Qt${QT_MAJOR_VERSION}Gui
+     INSTALL)
+ endif()
+-- 
+GitLab
+

diff --git a/kde-frameworks/kwayland/kwayland-5.93.0.ebuild b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
similarity index 93%
rename from kde-frameworks/kwayland/kwayland-5.93.0.ebuild
rename to kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
index b99be2cf1a42..b8ea897904cf 100644
--- a/kde-frameworks/kwayland/kwayland-5.93.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild
@@ -38,3 +38,5 @@ BDEPEND="
 	)
 	>=dev-util/wayland-scanner-1.19.0
 "
+
+PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" ) # bug 838376

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwayland/files/, kde-frameworks/kwayland/

[Andreas Sturmlechner]

commit:     f56997f551acc1a3adc6da6c7271060379fce56f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 19:34:11 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 20:39:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56997f5

kde-frameworks/kwayland: Fix misplaced panel popups in Plasma Wayland

Upstream commit d02188ad1f6222215adcf842f4c9806ba9e62ccb

See also:
https://mail.kde.org/pipermail/kde-frameworks-devel/2022-September/123098.html

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ....0-plasmashell-fallback-for-applet-popups.patch | 37 +++++++++++++++++++
 kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild  | 41 ++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch b/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch
new file mode 100644
index 000000000000..7cc45ad8e2e6
--- /dev/null
+++ b/kde-frameworks/kwayland/files/kwayland-5.98.0-plasmashell-fallback-for-applet-popups.patch
@@ -0,0 +1,37 @@
+From d02188ad1f6222215adcf842f4c9806ba9e62ccb Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Sat, 17 Sep 2022 01:18:28 +0200
+Subject: [PATCH] client/plasmashell: add fallback for applet popups
+
+When the compositor doesn't support applet popups, the current code sends an
+invalid surface role. This causes KWin to fall back to the "normal" surface role
+and do normal window placement on it.
+
+CCBUG: 459188
+---
+ src/client/plasmashell.cpp | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/client/plasmashell.cpp b/src/client/plasmashell.cpp
+index dc613cb..93bc31c 100644
+--- a/src/client/plasmashell.cpp
++++ b/src/client/plasmashell.cpp
+@@ -276,7 +276,14 @@ void PlasmaShellSurface::setRole(PlasmaShellSurface::Role role)
+         }
+         break;
+     case Role::AppletPopup:
+-        wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP;
++        // ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP_SINCE_VERSION is not used for this check
++        // because it wrongly is 7 with old plasma wayland protocols
++        if (wl_proxy_get_version(d->surface) < 8) {
++            // dock is what applet popups were before
++            wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_PANEL;
++        } else {
++            wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP;
++        }
+         break;
+     default:
+         Q_UNREACHABLE();
+-- 
+GitLab
+

diff --git a/kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild
new file mode 100644
index 000000000000..59884e1adf75
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.98.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT="test"
+
+# slot ops: includes qpa/qplatformnativeinterface.h, surface_p.h
+RDEPEND="
+	>=dev-libs/wayland-1.15.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5=
+	media-libs/libglvnd
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.7.0
+	>=dev-libs/wayland-protocols-1.15
+	sys-kernel/linux-headers
+"
+BDEPEND="
+	>=dev-qt/qtwaylandscanner-${QTMIN}:5
+	>=dev-util/wayland-scanner-1.19.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-plasmashell-fallback-for-applet-popups.patch"
+)