[arch-commits] Commit in kwayland/repos/testing-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, May 14, 2022 @ 16:29:21
  Author: arojas
Revision: 445593

archrelease: copy trunk to testing-x86_64

Added:
  kwayland/repos/testing-x86_64/PKGBUILD
    (from rev 445592, kwayland/trunk/PKGBUILD)
  kwayland/repos/testing-x86_64/fix-pri.patch
    (from rev 445592, kwayland/trunk/fix-pri.patch)
Deleted:
  kwayland/repos/testing-x86_64/PKGBUILD

---------------+
 PKGBUILD      |   68 ++++++++++++++++++++++++++++++--------------------------
 fix-pri.patch |   12 +++++++++
 2 files changed, 49 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-14 16:29:05 UTC (rev 445592)
+++ PKGBUILD	2022-05-14 16:29:21 UTC (rev 445593)
@@ -1,31 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kwayland
-pkgver=5.94.0
-pkgrel=1
-pkgdesc='Qt-style Client and Server library wrapper for the Wayland libraries'
-arch=(x86_64)
-url='https://www.kde.org'
-license=(LGPL)
-depends=(qt5-wayland)
-makedepends=(extra-cmake-modules doxygen qt5-tools qt5-doc wayland-protocols plasma-wayland-protocols)
-groups=(kf5)
-source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('b2a4d8e1b4d81ce798c991cfb34210ba095f6406a37f4714ae3ab64abaca2636'
-            'SKIP')
-validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
-options=(debug)
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib \
-    -DBUILD_TESTING=OFF \
-    -DBUILD_QCH=ON
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: kwayland/repos/testing-x86_64/PKGBUILD (from rev 445592, kwayland/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-05-14 16:29:21 UTC (rev 445593)
@@ -0,0 +1,37 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kwayland
+pkgver=5.94.0
+pkgrel=2
+pkgdesc='Qt-style Client and Server library wrapper for the Wayland libraries'
+arch=(x86_64)
+url='https://www.kde.org'
+license=(LGPL)
+depends=(qt5-wayland)
+makedepends=(extra-cmake-modules doxygen qt5-tools qt5-doc wayland-protocols plasma-wayland-protocols)
+groups=(kf5)
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
+        fix-pri.patch)
+sha256sums=('b2a4d8e1b4d81ce798c991cfb34210ba095f6406a37f4714ae3ab64abaca2636'
+            'SKIP'
+            'ffb0188e44140a015b2a66a3d5ef230c1cada4cb640f80d9e0522855376d8e53')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
+options=(debug)
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < fix-pri.patch # Fix include path in the pri file
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: kwayland/repos/testing-x86_64/fix-pri.patch (from rev 445592, kwayland/trunk/fix-pri.patch)
===================================================================
--- fix-pri.patch	                        (rev 0)
+++ fix-pri.patch	2022-05-14 16:29:21 UTC (rev 445593)
@@ -0,0 +1,12 @@
+diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
+index 33d8c7e..ef6df30 100644
+--- a/src/client/CMakeLists.txt
++++ b/src/client/CMakeLists.txt
+@@ -332,6 +332,6 @@ set(KWaylandClient_APIDOX_SRCS ${CLIENT_LIB_HEADERS} PARENT_SCOPE)
+ set(KWaylandClient_APIDOX_BUILD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+ 
+ include(ECMGeneratePriFile)
+-ecm_generate_pri_file(BASE_NAME KWaylandClient LIB_NAME KF5WaylandClient DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF})
++ecm_generate_pri_file(BASE_NAME KWaylandClient LIB_NAME KF5WaylandClient DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KWayland)
+ install(FILES ${PRI_FILENAME}
+         DESTINATION ${ECM_MKSPECS_INSTALL_DIR})