From dd20bd823fed770fb7d2ab989223362a64ce7bef Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Mon, 11 Aug 2014 00:19:41 +0300 Subject: [PATCH] Comment out QT5 related line in widgets/qt.cpp file --- CMakeLists.txt | 7 +++- debian/patches/CMakeLists.txt.patch | 57 +++++------------------------ debian/patches/series | 1 + debian/patches/widgets.patch | 11 ++++++ widgets/qt.cpp | 2 +- 5 files changed, 27 insertions(+), 51 deletions(-) create mode 100644 debian/patches/widgets.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index e465bad..8aa7bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON) #set(MathGL_VERSION_MINOR 2.2) set(MathGL_SOVERSION 7.3.0) +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro") MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2) IF(${option}_ISSET MATCHES "^${option}_ISSET$") @@ -59,7 +62,7 @@ include(CMakeDependentOption) set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory") option(enable-double "Enable double precision in MathGL library" ON) -option(enable-mpi "Enable mpi") +option(enable-mpi "Enable mpi" ON) option(enable-opengl "Enable OpenGL support" ON) option(enable-all-docs "Enable all documentation building") #option(enable-doc "Enable documentation building") @@ -92,7 +95,7 @@ CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON) CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) -CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) +CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-all-widgets" ON) CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON) CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) diff --git a/debian/patches/CMakeLists.txt.patch b/debian/patches/CMakeLists.txt.patch index 039a84a..dd00659 100644 --- a/debian/patches/CMakeLists.txt.patch +++ b/debian/patches/CMakeLists.txt.patch @@ -1,8 +1,8 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,9 @@ - set(MathGL_VERSION_MINOR 2.2) - set(MathGL_SOVERSION 7.2.0) + #set(MathGL_VERSION_MINOR 2.2) + set(MathGL_SOVERSION 7.3.0) +set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro") @@ -10,60 +10,21 @@ MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2) IF(${option}_ISSET MATCHES "^${option}_ISSET$") -@@ -60,15 +63,15 @@ +@@ -59,7 +62,7 @@ + set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory") option(enable-double "Enable double precision in MathGL library" ON) - option(enable-simple "Slightly increase drawing speed but disable mglDataA class") -option(enable-mpi "Enable mpi") +option(enable-mpi "Enable mpi" ON) option(enable-opengl "Enable OpenGL support" ON) option(enable-all-docs "Enable all documentation building") #option(enable-doc "Enable documentation building") - option(enable-all "Enable all core features") - option(enable-all-widgets "Enable all Widgets") - option(enable-all-swig "Enable all SWIG based interfaces") --option(enable-pthread "Enable POSIX threads support" OFF) --option(enable-openmp "Enable OpenMP support" ON) -+option(enable-pthread "Enable POSIX threads support" ON) -+option(enable-openmp "Enable OpenMP support" OFF) - option(enable-lgpl "Enable only LGPL part of MathGL") - option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") - #option(enable-ltdl "Enable loading modules support") -@@ -83,25 +86,25 @@ - - CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON) - CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" OFF "NOT enable-all" ON) --MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) --MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) --MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) +@@ -92,7 +95,7 @@ + CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) + CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) + CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) -CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON) -+MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) -+MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) -+MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) -+CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON) -+CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON) -+CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON) +CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-all-widgets" ON) CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) -+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF) - - if(enable-qt4 OR enable-qt5) - set(enable-qt ON) - endif(enable-qt4 OR enable-qt5) + CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) - CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF) --MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -+MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) diff --git a/debian/patches/series b/debian/patches/series index a160cc9..bc9da25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ CMakeLists.txt.patch +widgets.patch diff --git a/debian/patches/widgets.patch b/debian/patches/widgets.patch new file mode 100644 index 0000000..9808d7c --- /dev/null +++ b/debian/patches/widgets.patch @@ -0,0 +1,11 @@ +--- a/widgets/qt.cpp ++++ b/widgets/qt.cpp +@@ -46,7 +46,7 @@ + #define MGL_MAX_LINES (INT_MAX-1000) + #if !defined(WIN32) && !defined(__APPLE__) + #include +-#include ++//#include + #endif + //----------------------------------------------------------------------------- + /// Base class for windows containing MathGL graphics diff --git a/widgets/qt.cpp b/widgets/qt.cpp index aea5f7c..8e8306b 100644 --- a/widgets/qt.cpp +++ b/widgets/qt.cpp @@ -46,7 +46,7 @@ #define MGL_MAX_LINES (INT_MAX-1000) #if !defined(WIN32) && !defined(__APPLE__) #include -#include +//#include #endif //----------------------------------------------------------------------------- /// Base class for windows containing MathGL graphics -- 2.30.2