[med-svn] [beads] 04/04: Use Debian packaged CImg.h

[Andreas Tille]

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

tille pushed a commit to branch master
in repository beads.

commit 49df1ab20874c03cea57c0834a90acaf219d0911
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 20 12:50:16 2017 +0200

    Use Debian packaged CImg.h
---
 debian/patches/series                     |  1 +
 debian/patches/use_debian_packaged_cimg.h | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 912bc1f..d2962c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 qt5.patch
+use_debian_packaged_cimg.h
diff --git a/debian/patches/use_debian_packaged_cimg.h b/debian/patches/use_debian_packaged_cimg.h
new file mode 100644
index 0000000..d6bcd5b
--- /dev/null
+++ b/debian/patches/use_debian_packaged_cimg.h
@@ -0,0 +1,25 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 19 Oct 2017 14:58:04 +0200
+Description: Use Debian packaged CImg.h from cimg-dev package since
+ the code copy shipped together with upstream is outdated and does not
+ build with recent gcc
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -35,7 +35,6 @@ SET( BEADS_CPP
+ 	spot_document_gnumeric
+ 	spotSvgDocument
+ 	images/imageDeNovo
+-	CImg
+ )
+ IF(WIN32)
+ ELSE(WIN32)
+@@ -63,7 +62,7 @@ IF(WIN32)
+ 	target_link_libraries (beads ${EXTRA_CIMG_LIBRARY} ${QT_LIBRARIES} )
+ ELSE(WIN32)
+ 	 # Link the executable to the Hello library.
+-	target_link_libraries (beads ${X11_LIBRARIES} m ${PTHREADS_LIBRARY} ${EXTRA_CIMG_LIBRARY} ${QT_LIBRARIES} Qt5::Core Qt5::Widgets )
++	target_link_libraries (beads ${X11_LIBRARIES} m ${PTHREADS_LIBRARY} ${QT_LIBRARIES} Qt5::Core Qt5::Widgets )
+ ENDIF(WIN32)
+ 
+ SUBDIRS (qtbeads)

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