[med-svn] [beads] 03/10: CImg patch: fix QMetaType::Bool errors and missing -lX11

[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 a31e8dcbd666c4f690d741a4cdb3fcd4d1ae58f4
Author: Andreas Tille <tille at debian.org>
Date:   Sat Oct 21 13:56:47 2017 +0200

    CImg patch: fix QMetaType::Bool errors and missing -lX11
---
 debian/patches/use_debian_packaged_cimg.h | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/patches/use_debian_packaged_cimg.h b/debian/patches/use_debian_packaged_cimg.h
index c35d8ad..b992b1b 100644
--- a/debian/patches/use_debian_packaged_cimg.h
+++ b/debian/patches/use_debian_packaged_cimg.h
@@ -6,7 +6,7 @@ Description: Use Debian packaged CImg.h from cimg-dev package since
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -35,7 +35,6 @@ SET( BEADS_CPP
+@@ -29,7 +29,6 @@
  	spot_document_gnumeric
  	spotSvgDocument
  	images/imageDeNovo
@@ -14,18 +14,9 @@ Description: Use Debian packaged CImg.h from cimg-dev package since
  )
  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)
 --- a/src/qtbeads/CMakeLists.txt
 +++ b/src/qtbeads/CMakeLists.txt
-@@ -33,7 +33,6 @@ SET( BEADS_FOR_QT_CPP
+@@ -30,7 +30,6 @@
  	../spot_document_gnumeric
  	../spotSvgDocument
  	../images/imageDeNovo
@@ -35,14 +26,26 @@ Description: Use Debian packaged CImg.h from cimg-dev package since
  # with SET() command you can change variables or define new ones
 --- a/src/images/imageCode.h
 +++ b/src/images/imageCode.h
-@@ -3,8 +3,8 @@
+@@ -3,8 +3,10 @@
  
  #include "../config.h"
  
 -#include "../CImg.h"
 -//#include <CImg.h>
-+//#include "../CImg.h"
 +#include <CImg.h>
++//CImg.h includes Xlib.h, which has evil "#define Bool int" that
++//interferes with QMetaType::Bool in files generated by Qt MOC!
++#undef Bool
  
  //Images pour lesquelles les valeurs des pixels sont des codes et non des valeurs quantitatives
  //Sont des codes: l'image des directions, l'image des numeros
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,6 +78,7 @@
+ 	FIND_PACKAGE(Pthreads REQUIRED)
+ 	SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+ 	SET ( CIMG_OS 1)
++	SET(EXTRA_CIMG_LIBRARY "X11")
+ ENDIF(WIN32)
+ 
+ #

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