From 5d01e61ac92b9cb67c2253536c5dc475c0723e61 Mon Sep 17 00:00:00 2001 From: abs Date: Sat, 21 Nov 2015 20:18:14 +0000 Subject: Add include(CheckIncludeFiles) to fix build with latest cmake --- misc/kdeartwork4/distinfo | 5 +++-- misc/kdeartwork4/patches/patch-aa | 8 ++++---- .../patches/patch-kscreensaver_xsavers_CMakeLists.txt | 10 ++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 misc/kdeartwork4/patches/patch-kscreensaver_xsavers_CMakeLists.txt (limited to 'misc') diff --git a/misc/kdeartwork4/distinfo b/misc/kdeartwork4/distinfo index ff3dfca9ea3..d20a216c193 100644 --- a/misc/kdeartwork4/distinfo +++ b/misc/kdeartwork4/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.23 2015/11/03 23:49:39 agc Exp $ +$NetBSD: distinfo,v 1.24 2015/11/21 20:18:14 abs Exp $ SHA1 (kdeartwork-4.14.3.tar.xz) = 78697ddce0fc5b8bbfe6659110a5ba147e3b2fe6 RMD160 (kdeartwork-4.14.3.tar.xz) = 4f7272623ed18867648f4d7aa6ec7564d63e8dd2 SHA512 (kdeartwork-4.14.3.tar.xz) = 5b5b403adc9aca2258fd85d7577fdb960bba35dcf22340f79f2ebf26abdea908e35da767be8b20bf3fde4c62afa9f8a05b6df07661b750cc36054480850474fd Size (kdeartwork-4.14.3.tar.xz) = 140848704 bytes -SHA1 (patch-aa) = 9007028225dded2490e3181f853c17985bae9509 +SHA1 (patch-aa) = a5fe085b5e99b80bb574e5c0ffc799631088c54a +SHA1 (patch-kscreensaver_xsavers_CMakeLists.txt) = 22da4cfeb593c7c516dce6e025789cba2cef6c78 diff --git a/misc/kdeartwork4/patches/patch-aa b/misc/kdeartwork4/patches/patch-aa index 7a748453bc2..350fe02ca32 100644 --- a/misc/kdeartwork4/patches/patch-aa +++ b/misc/kdeartwork4/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/10/02 20:47:46 markd Exp $ +$NetBSD: patch-aa,v 1.2 2015/11/21 20:18:14 abs Exp $ ---- cmake/modules/FindXscreensaver.cmake.orig 2009-03-08 22:15:30.000000000 +1300 +--- cmake/modules/FindXscreensaver.cmake.orig 2009-02-07 20:34:16.000000000 +0000 +++ cmake/modules/FindXscreensaver.cmake -@@ -24,6 +24,7 @@ if (NOT XSCREENSAVER_FOUND) +@@ -25,6 +25,7 @@ bin/xscreensaver-hacks hacks) set(xscreensaver_alldirs ${xscreensaver_alldirs} ${xscreensaver_path}/${suffix}) endforeach(xscreensaver_path ${xscreensaver_checkdirs} ) endforeach(suffix lib${LIB_SUFFIX}/xscreensaver lib/xscreensaver lib64/xscreensaver libexec/xscreensaver bin/xscreensaver-hacks hacks) @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/10/02 20:47:46 markd Exp $ FIND_PATH(XSCREENSAVER_DIR deco ${xscreensaver_alldirs}) set(XSCREENSAVER_CONFIG_DIR) -@@ -48,7 +49,7 @@ if (NOT XSCREENSAVER_FOUND) +@@ -49,7 +50,7 @@ bin/xscreensaver-hacks hacks) set(XSCREENSAVER_CONFIG_DIR "${XSCREENSAVER_CONFIG_DECO}/config/") #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") endif(XSCREENSAVER_CONFIG_DECO) diff --git a/misc/kdeartwork4/patches/patch-kscreensaver_xsavers_CMakeLists.txt b/misc/kdeartwork4/patches/patch-kscreensaver_xsavers_CMakeLists.txt new file mode 100644 index 00000000000..707e0d839d6 --- /dev/null +++ b/misc/kdeartwork4/patches/patch-kscreensaver_xsavers_CMakeLists.txt @@ -0,0 +1,10 @@ +$NetBSD: patch-kscreensaver_xsavers_CMakeLists.txt,v 1.1 2015/11/21 20:18:14 abs Exp $ + +--- kscreensaver/xsavers/CMakeLists.txt.orig 2010-03-05 18:35:01.000000000 +0000 ++++ kscreensaver/xsavers/CMakeLists.txt +@@ -1,3 +1,5 @@ ++include(CheckIncludeFiles) ++ + check_include_files(memory.h HAVE_MEMORY_H) + configure_file (config-xsavers.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xsavers.h ) + -- cgit v1.2.3