From 8fee66d1d0b7bd7e885baa5bec5bbcc37f34c3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20V=C3=A1radi?= Date: Tue, 7 Sep 2021 19:24:46 +0200 Subject: [PATCH] Updated 'sane' CMake patch to avoid fuzz with the latest CMakeLists.txt --- debian/patches/0004-sane-cmake.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/0004-sane-cmake.patch b/debian/patches/0004-sane-cmake.patch index a158f181cd..c6ff3fc1be 100644 --- a/debian/patches/0004-sane-cmake.patch +++ b/debian/patches/0004-sane-cmake.patch @@ -5,7 +5,7 @@ Last-Update: 2019-11-17 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -61,29 +109,12 @@ include(GNUInstallDirs) +@@ -72,29 +72,12 @@ include(DefineInstallationPaths) include(GenerateExportHeader) @@ -33,9 +33,9 @@ Last-Update: 2019-11-17 -message(STATUS "GIT_SHA1 ${GIT_SHA1}") - set(SYSCONFDIR ${SYSCONF_INSTALL_DIR}) - set(DATADIR ${DATA_INSTALL_DIR}) - if(WIN32) -@@ -195,7 +226,47 @@ if (NOT DEFINED APPLICATION_ICON_NAME) + set(SHAREDIR ${CMAKE_INSTALL_DATADIR}) + +@@ -203,7 +186,47 @@ set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME}) endif()