[SCM] kpty packaging branch, master, updated. debian/5.37.0-2-96-g6d8962f
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:51:18 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kpty.git;a=commitdiff;h=225f3b8
The following commit has been merged in the master branch:
commit 225f3b888b4f1475bb3b488fb33105702086232b
Author: Jonathan Riddell <jr at jriddell.org>
Date: Tue Oct 18 14:35:43 2016 +0100
take diff from 5.27 tag
---
debian/patches/kde_01_search_utempter.diff | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/debian/patches/kde_01_search_utempter.diff b/debian/patches/kde_01_search_utempter.diff
index e2ca653..4ac1716 100644
--- a/debian/patches/kde_01_search_utempter.diff
+++ b/debian/patches/kde_01_search_utempter.diff
@@ -1,9 +1,15 @@
diff --git a/cmake/FindUTEMPTER.cmake b/cmake/FindUTEMPTER.cmake
-index 2fc1cd8..4921e58 100644
+index 9773963..4921e58 100644
--- a/cmake/FindUTEMPTER.cmake
+++ b/cmake/FindUTEMPTER.cmake
-@@ -37,6 +37,8 @@
- find_file (UTEMPTER_EXECUTABLE utempter PATHS
+@@ -32,9 +32,13 @@
+ # SUCH DAMAGE.
+
+
+-find_program (UTEMPTER_EXECUTABLE utempter PATHS
++# use find_file instead of find_program until this is fixed:
++# https://gitlab.kitware.com/cmake/cmake/issues/10468
++find_file (UTEMPTER_EXECUTABLE utempter PATHS
${KDE_INSTALL_FULL_LIBEXECDIR}/utempter
${KDE_INSTALL_FULL_LIBDIR}/utempter
+ ${CMAKE_PREFIX_PATH}/libexec/utempter
--
kpty packaging
More information about the pkg-kde-commits
mailing list