[Pkg-cmake-commits] [cmake] 04/05: Drop FindImageMagick_find_program.patch, the underlying issue has been fixed upstream.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository cmake.

commit 58a70f017bf46afb830db51af8453f7391150da6
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Aug 20 09:59:27 2016 +0200

    Drop FindImageMagick_find_program.patch, the underlying issue has been fixed upstream.
---
 debian/changelog                                  |  2 ++
 debian/patches/FindImageMagick_find_program.patch | 32 -----------------------
 debian/patches/series                             |  1 -
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63da2b3..704b883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cmake (3.6.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop FindImageMagick_find_program.patch, the underlying issue has been
+    fixed upstream.
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 20 Aug 2016 09:57:50 +0200
 
diff --git a/debian/patches/FindImageMagick_find_program.patch b/debian/patches/FindImageMagick_find_program.patch
deleted file mode 100644
index 09a1b3c..0000000
--- a/debian/patches/FindImageMagick_find_program.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: FindImageMagick: Use find_program instead of find_path
- Since cmake 3.6 find_path doesn't use the system search paths anymore.
- As a result FindImageMagick wasn't able to get the executable dir.
-Author: Felix Geyer <fgeyer at debian.org>
-Forwarded: https://gitlab.kitware.com/cmake/cmake/merge_requests/30
-
---- a/Modules/FindImageMagick.cmake
-+++ b/Modules/FindImageMagick.cmake
-@@ -185,17 +185,21 @@ endfunction()
- # Start Actual Work
- #---------------------------------------------------------------------
- # Try to find a ImageMagick installation binary path.
--find_path(ImageMagick_EXECUTABLE_DIR
-+find_program(ImageMagick_EXECUTABLE_FILENAME
-   NAMES mogrify${CMAKE_EXECUTABLE_SUFFIX}
-   PATHS
-     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]"
-   DOC "Path to the ImageMagick binary directory."
-   NO_DEFAULT_PATH
-   )
--find_path(ImageMagick_EXECUTABLE_DIR
-+find_program(ImageMagick_EXECUTABLE_FILENAME
-   NAMES mogrify${CMAKE_EXECUTABLE_SUFFIX}
-   )
- 
-+if(ImageMagick_EXECUTABLE_FILENAME)
-+  get_filename_component(ImageMagick_EXECUTABLE_DIR "${ImageMagick_EXECUTABLE_FILENAME}" DIRECTORY)
-+endif()
-+
- # Find each component. Search for all tools in same dir
- # <ImageMagick_EXECUTABLE_DIR>; otherwise they should be found
- # independently and not in a cohesive module such as this one.
diff --git a/debian/patches/series b/debian/patches/series
index f58b484..e9e2070 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 FindBoost_add_-lpthread_#563479.diff
 qt_import_dir_variable.diff
 fix-ftbfs-on-kfreebsd.patch
-FindImageMagick_find_program.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cmake/cmake.git