From: Dimitrios Eftaxiopoulos Date: Sun, 19 Jul 2015 08:10:30 +0000 (+0300) Subject: Transition from Qt4 to Qt5 (Closes: #784495) X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~98 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bafb875c073fcd8633b8c87b71fe3a68aea94457;p=mathgl.git Transition from Qt4 to Qt5 (Closes: #784495) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6035d4a..d42271c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,6 @@ set(MathGL_VERSION_MAJOR 2) set(MathGL_VERSION_MINOR 3.3) set(MathGL_SOVERSION 7.4.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$") @@ -73,7 +70,7 @@ option(enable-all-docs "Enable all 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-rvalue "Enable move constructor support (need C++11)" OFF) +option(enable-rvalue "Enable move constructor support (need C++11)" ON) option(enable-pthread "Enable POSIX threads support" ON) option(enable-openmp "Enable OpenMP support" OFF) @@ -83,7 +80,7 @@ endif(enable-pthread AND enable-openmp) 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") +option(enable-ltdl "Enable loading modules support" ON) CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON) CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON) CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" OFF "NOT enable-all-docs" ON) @@ -105,9 +102,9 @@ 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-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) +CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" ON "NOT enable-all-widgets" ON) +CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" ON) if(UNIX AND enable-rvalue) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") @@ -119,10 +116,10 @@ if(enable-qt4 OR enable-qt5) set(enable-qt ON) endif(enable-qt4 OR enable-qt5) -CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" ON) -MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) +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-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" ON "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) include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) @@ -398,6 +395,8 @@ else(enable-glut) set(MGL_HAVE_GLUT 0) endif(enable-glut) +set(FLTK_FLUID_EXECUTABLE usr/bin/fluid) + if(enable-fltk) set(MGL_HAVE_FLTK 1) include(FindFLTK) diff --git a/debian/changelog b/debian/changelog index 894a771..0f07307 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mathgl (2.3.3-1) UNRELEASED; urgency=medium + + * Imported Upstream version 2.3.3 + + -- Dimitrios Eftaxiopoulos Sat, 18 Jul 2015 17:37:08 +0300 + mathgl (2.3.2-1) experimental; urgency=medium * Imported Upstream version 2.3.2 diff --git a/debian/control b/debian/control index 86cf399..9e3ad7b 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Maintainer: Debian Science Maintainers Build-Depends: debhelper (>= 9), libltdl-dev, libgsl0-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, - libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt4-dev, libwxgtk3.0-dev, + libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt5webkit5-dev, libwxgtk3.0-dev, texinfo, texlive, texlive-generic-recommended, liboctave-dev, liblua5.1-dev, libgif-dev, python-dev, python-numpy, libfontconfig1-dev, libqtwebkit-dev, libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev, - mpi-default-dev, swig, cmake, libxft-dev, libssl1.0.0 (<< 1.0.2) + mpi-default-dev, swig, cmake, libxft-dev Standards-Version: 3.9.6 Homepage: http://mathgl.sourceforge.net/doc_en/Main.html Vcs-Git: git://anonscm.debian.org/debian-science/packages/mathgl.git diff --git a/debian/libmgl-qt7.4.0.install b/debian/libmgl-qt7.4.0.install index 1a85e9a..5a60566 100644 --- a/debian/libmgl-qt7.4.0.install +++ b/debian/libmgl-qt7.4.0.install @@ -1,2 +1,2 @@ debian/tmp/usr/lib/libmgl-qt.so.* -debian/tmp/usr/lib/libmgl-qt4.so.* \ No newline at end of file +debian/tmp/usr/lib/libmgl-qt5.so.* \ No newline at end of file diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch index d8a063a..4802dd7 100644 --- a/debian/patches/CMakeLists.patch +++ b/debian/patches/CMakeLists.patch @@ -1,18 +1,7 @@ -Enable several, build with support, features --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -15,6 +15,9 @@ - #set(MathGL_VERSION_MINOR 2.2) - set(MathGL_SOVERSION 7.4.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$") -@@ -62,7 +65,7 @@ - set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory") +@@ -63,16 +63,16 @@ + string(TIMESTAMP MGL_NIGHT "%d.%m.%y") option(enable-double "Enable double precision in MathGL library" ON) -option(enable-mpi "Enable mpi") @@ -20,18 +9,28 @@ Enable several, build with support, features option(enable-opengl "Enable OpenGL support" ON) option(enable-all-docs "Enable all documentation building") #option(enable-doc "Enable documentation building") -@@ -70,8 +73,8 @@ + 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-rvalue "Enable move constructor support (need C++11)" OFF) +-option(enable-rvalue "Enable move constructor support (need C++11)" OFF) -option(enable-pthread "Enable POSIX threads support" OFF) -option(enable-openmp "Enable OpenMP support" ON) ++option(enable-rvalue "Enable move constructor support (need C++11)" ON) +option(enable-pthread "Enable POSIX threads support" ON) +option(enable-openmp "Enable OpenMP support" OFF) if(enable-pthread AND enable-openmp) message(SEND_ERROR "You can't enable POSIX threads and OpenMP at the same time!") -@@ -92,16 +95,16 @@ +@@ -80,7 +80,7 @@ + + 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") ++option(enable-ltdl "Enable loading modules support" ON) + CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON) + CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON) + CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" OFF "NOT enable-all-docs" ON) +@@ -93,18 +93,18 @@ 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) @@ -44,7 +43,6 @@ Enable several, build with support, features -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) @@ -54,21 +52,20 @@ Enable several, build with support, features +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) - -@@ -115,10 +118,10 @@ - set(enable-qt ON) - endif(enable-qt4 OR enable-qt5) + CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "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-qt5 "Enable Qt5 widget" ON "NOT enable-all-widgets" ON) ++CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" ON) --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) -+CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" 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 "Enable octave interface" ON "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) + if(UNIX AND enable-rvalue) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +@@ -395,6 +395,8 @@ + set(MGL_HAVE_GLUT 0) + endif(enable-glut) - include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) ++set(FLTK_FLUID_EXECUTABLE usr/bin/fluid) ++ + if(enable-fltk) + set(MGL_HAVE_FLTK 1) + include(FindFLTK) diff --git a/debian/patches/series b/debian/patches/series index 178fa79..879efc6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -udav.patch CMakeLists.patch diff --git a/debian/patches/udav.patch b/debian/patches/udav.patch deleted file mode 100644 index 29df8a1..0000000 --- a/debian/patches/udav.patch +++ /dev/null @@ -1,12 +0,0 @@ -Add file argument to udav Exec ---- a/udav/udav.desktop -+++ b/udav/udav.desktop -@@ -4,7 +4,7 @@ - Terminal=false - Icon=udav - Name=UDAV --Exec=udav -+Exec=udav %f - MimeType=text/mgl; - Comment=Data handling and plotting tool - Comment[en_US]=Data handling and plotting tool diff --git a/debian/udav.install b/debian/udav.install index 0f9086d..fc1b1d8 100644 --- a/debian/udav.install +++ b/debian/udav.install @@ -1,4 +1,4 @@ debian/tmp/usr/bin/udav debian/tmp/usr/share/pixmaps/udav.png -debian/tmp/usr/share/applications/udav.desktop +udav/udav.desktop /usr/share/applications debian/tmp/usr/share/udav/udav_ru.qm \ No newline at end of file diff --git a/udav/udav.desktop b/udav/udav.desktop index dbc6da8..3565b80 100755 --- a/udav/udav.desktop +++ b/udav/udav.desktop @@ -4,7 +4,7 @@ Type=Application Terminal=false Icon=udav Name=UDAV -Exec=udav %f +Exec=udav MimeType=text/mgl; Comment=Data handling and plotting tool Comment[en_US]=Data handling and plotting tool