From f25fcb82d41e98f66935526fed68fa3265ec0434 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 15 Apr 2022 16:49:19 +0200 Subject: 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 --- .../kwayland/files/kwayland-5.93.0-pkgconfig.patch | 27 ++++++++++++++ kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild | 42 ++++++++++++++++++++++ kde-frameworks/kwayland/kwayland-5.93.0.ebuild | 40 --------------------- 3 files changed, 69 insertions(+), 40 deletions(-) create mode 100644 kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch create mode 100644 kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild delete mode 100644 kde-frameworks/kwayland/kwayland-5.93.0.ebuild (limited to 'kde-frameworks/kwayland') 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 +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-r1.ebuild b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild new file mode 100644 index 000000000000..b8ea897904cf --- /dev/null +++ b/kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild @@ -0,0 +1,42 @@ +# 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.2 +inherit ecm 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 ~ppc64 ~riscv ~x86" +IUSE="" + +# All failing, I guess we need a virtual wayland server +RESTRICT="test" + +# slot op: includes qpa/qplatformnativeinterface.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.4.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}-pkgconfig.patch" ) # bug 838376 diff --git a/kde-frameworks/kwayland/kwayland-5.93.0.ebuild b/kde-frameworks/kwayland/kwayland-5.93.0.ebuild deleted file mode 100644 index b99be2cf1a42..000000000000 --- a/kde-frameworks/kwayland/kwayland-5.93.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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.2 -inherit ecm 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 ~ppc64 ~riscv ~x86" -IUSE="" - -# All failing, I guess we need a virtual wayland server -RESTRICT="test" - -# slot op: includes qpa/qplatformnativeinterface.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.4.0 - >=dev-libs/wayland-protocols-1.15 - sys-kernel/linux-headers -" -BDEPEND=" - || ( - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - =dev-util/wayland-scanner-1.19.0 -" -- cgit v1.2.3-65-gdbad