From 8aefa0d06be018b575cfa7deb5cb5d2d8e1ba266 Mon Sep 17 00:00:00 2001
From: Marcin Deranek <gringo@slonko.net>
Date: Sun, 23 Jun 2019 15:17:25 +0200
Subject: Fix build

---
 x11-wm/compiz/Manifest                         |  3 ++-
 x11-wm/compiz/compiz-9999.ebuild               |  3 +--
 x11-wm/compiz/files/fix_pkgconfig_libdir.patch | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 x11-wm/compiz/files/fix_pkgconfig_libdir.patch

(limited to 'x11-wm')

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 03bf999..58ce61f 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,4 @@
 AUX access_violation.patch 974 BLAKE2B 9b226e3d7255073bff22448f096fc19f743b97582b2e4de2725c7df84f0895bb63b7eee25d3b82f08090b19b5ea9c1179d57d1eaf994bfabc42e4e04e8f1ec33 SHA512 0d91b71ad9c2646745d91a8a6b3d9228a23dccb3971abf69094ca4f6b3055f92570f01eb6dda62acab8630c05cc9480e846b59bd3b6044a73b31510d72a8f800
+AUX fix_pkgconfig_libdir.patch 1155 BLAKE2B 33319182db6d8c46ca0d2f2ced06fd4610c39f59588ff85045a4f83877f25163b0692458e426bf2199fb14e784605ca4844f523b31d1a2d16e201ce8317422c5 SHA512 fb1362ef72864bdcb46d82c042dd688850f496a244b58b9314a2466f93aa79d8a31fc3585a6f08d3d4836c0fdc9d8ce7b4f5a1332bf87c3349a59e4b8011b3c6
 EBUILD compiz-0.9.13.9999.ebuild 3636 BLAKE2B ad8141a2d9d323ca091b122af0c2c8e110563d5c41f99d6b5ea53ce8707f9db639dd5b8705faf4c70bb68ca9f4b37e4429a5700db829d14f9c637b955c1af3d1 SHA512 5ed76b241fae11650c1b78d03853fe1cc7fd64f43529a9f93ca7cfe6cd670ab8074ebe588f258d24fbb5eaf741947fe1ba97e0ff03b8924720e208d0f74d8819
-EBUILD compiz-9999.ebuild 3450 BLAKE2B e173357691a9bbf9ea02f5a7fa5f8e558af755252428c7c8a4b71b5ea160e4bc2083d38fe5929ed6ce9168d81dd1e61f08737606c4a296730d8b61bcf396637c SHA512 a30455942bdd74b0231d67c17c92a64d1eb3b843b954f08e9f1262eb87ac77bd333e69a1a3c199d7544b86f18e2041e774f8b30b918202d469049eb3c7b0d15e
+EBUILD compiz-9999.ebuild 3436 BLAKE2B d544d4330f3f297086b1ccbd7f7e90d6b89c86d0dc9e25a57b99f3389bbd82559a1a5016ff2e1a17d434eb22ce901e710729a969c1c65bcc3e4ee17a2e5b237b SHA512 a4e439c36e5205aefd238f062ce668cddc5ef69132949a28ebbf3dcf2e74bb074d16b5a9928b9876d187def94a505172a24e641b604d1e9ed9cf71f87c923453
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index 54557ea..a9e71b5 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -103,6 +103,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 	sed -i -e 's/CYTHON_BIN cython3/CYTHON_BIN cython/' compizconfig/compizconfig-python/CMakeLists.txt
 	epatch "${FILESDIR}"/access_violation.patch
+	epatch "${FILESDIR}"/fix_pkgconfig_libdir.patch
 	eapply_user
 }
 
@@ -118,8 +119,6 @@ src_configure() {
 		"-DUSE_METACITY=$(usex gnome)"
 		"-DUSE_GTK=$(usex gtk)"
 		"-DCOMPIZ_BUILD_TESTING=$(usex test)"
-		"-DCMAKE_BUILD_TYPE=Release"
-		"-DCMAKE_INSTALL_PREFIX=/usr"
 		"-DCOMPIZ_DEFAULT_PLUGINS=composite,opengl,decor,resize,place,move,ccp"
 		"-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On"
 		"-DCOMPIZ_PACKAGING_ENABLED=On"
diff --git a/x11-wm/compiz/files/fix_pkgconfig_libdir.patch b/x11-wm/compiz/files/fix_pkgconfig_libdir.patch
new file mode 100644
index 0000000..c154dc6
--- /dev/null
+++ b/x11-wm/compiz/files/fix_pkgconfig_libdir.patch
@@ -0,0 +1,19 @@
+--- cmake/base.cmake.orig	2019-06-23 15:06:08.415173847 +0200
++++ cmake/base.cmake	2019-06-23 15:08:18.866267616 +0200
+@@ -40,13 +40,13 @@
+ 
+ # add install prefix to pkgconfig search path if needed
+ string (REGEX REPLACE "([\\+\\(\\)\\^\\\$\\.\\-\\*\\?\\|])" "\\\\\\1" PKGCONFIG_REGEX ${CMAKE_INSTALL_PREFIX})
+-set (PKGCONFIG_REGEX ".*${PKGCONFIG_REGEX}/lib/pkgconfig:${PKGCONFIG_REGEX}/share/pkgconfig.*")
++set (PKGCONFIG_REGEX ".*${PKGCONFIG_REGEX}/lib${LIB_SUFFIX}/pkgconfig:${PKGCONFIG_REGEX}/share/pkgconfig.*")
+ 
+ if (NOT "$ENV{PKG_CONFIG_PATH}" MATCHES "${PKGCONFIG_REGEX}")
+     if ("" STREQUAL "$ENV{PKG_CONFIG_PATH}")
+-	set (ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
++	set (ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
+     else ()
+ 	set (ENV{PKG_CONFIG_PATH}
+-	    "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
++	    "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig:${CMAKE_INSTALL_PREFIX}/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+     endif ()
+ endif ()
-- 
cgit v1.2.3