summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-04-15 16:49:19 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-04-15 16:49:43 +0200
commitf25fcb82d41e98f66935526fed68fa3265ec0434 (patch)
tree4b38b515c269a6ee9976a86ce049a62914dd0b4a /kde-frameworks/kwayland
parentdev-ruby/yajl-ruby: drop 1.4.1, 1.4.1-r1 (diff)
downloadgentoo-f25fcb82d41e98f66935526fed68fa3265ec0434.tar.gz
gentoo-f25fcb82d41e98f66935526fed68fa3265ec0434.tar.bz2
gentoo-f25fcb82d41e98f66935526fed68fa3265ec0434.zip
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@gentoo.org>
Diffstat (limited to 'kde-frameworks/kwayland')
-rw-r--r--kde-frameworks/kwayland/files/kwayland-5.93.0-pkgconfig.patch27
-rw-r--r--kde-frameworks/kwayland/kwayland-5.93.0-r1.ebuild (renamed from kde-frameworks/kwayland/kwayland-5.93.0.ebuild)2
2 files changed, 29 insertions, 0 deletions
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
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