[arch-commits] Commit in extra-cmake-modules/trunk (PKGBUILD libdir.patch)

[Antonio Rojas]

    Date: Wednesday, August 28, 2019 @ 05:48:44
  Author: arojas
Revision: 361311

Patch merged

Modified:
  extra-cmake-modules/trunk/PKGBUILD
Deleted:
  extra-cmake-modules/trunk/libdir.patch

--------------+
 PKGBUILD     |    4 ++--
 libdir.patch |   12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-27 23:36:32 UTC (rev 361310)
+++ PKGBUILD	2019-08-28 05:48:44 UTC (rev 361311)
@@ -14,11 +14,11 @@
 groups=(kf5)
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig}
         ECM-no-init.py.patch
-        libdir.patch)
+        libdir.patch::"https://cgit.kde.org/extra-cmake-modules.git/patch/?id=c806bd48")
 sha256sums=('a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c'
             'SKIP'
             '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52'
-            '2b8c0532497c906ef64886d6751c4a52d06713962736bc455460b6974d5659d9')
+            'c675d7e2d6919eec7a907a54021b5c43bfae831874232c9d194ce85bdb7e6496')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
 
 prepare() {

Deleted: libdir.patch
===================================================================
--- libdir.patch	2019-08-27 23:36:32 UTC (rev 361310)
+++ libdir.patch	2019-08-28 05:48:44 UTC (rev 361311)
@@ -1,12 +0,0 @@
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index 2003223..0acd33f 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -245,6 +245,7 @@ set(_LIBDIR_DEFAULT "lib")
- # See https://wiki.debian.org/Multiarch
- if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
-    AND NOT CMAKE_CROSSCOMPILING
-+   AND NOT EXISTS "/etc/arch-release"
-    AND NOT DEFINED ENV{FLATPAK_ID})
-   if (EXISTS "/etc/debian_version") # is this a debian system ?
-     if(CMAKE_LIBRARY_ARCHITECTURE)