Atri Bhattacharya
673fd2b45a
* Update to version 2.5. * Minor rebase of mathgl-fix-python-module-path.patch to apply cleanly against updated version. * Bump library so version appropriately. * Enable python3 bindings: now supported by upstream; build only for default python3 flavour. * Disable python bindings for Leap, since python >= 3.8 is required whereas Leap 15.2/3 only have python 3.6. * Re-enable octave bindings. * Rename python sub-package to have name consistent with openSUSE's python3 package naming guidelines. * Update _constraints to require 8 GB disk space as required by updated version. * Drop sed fix for location of numpy header file: no longer needed. OBS-URL: https://build.opensuse.org/request/show/943351 OBS-URL: https://build.opensuse.org/package/show/science/mathgl?expand=0&rev=111
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
Subject: Do not mark a Qt version as default if it's the only one built
|
|
|
|
We do not package the plain "qt" plugin, as it's just a copy of either
|
|
"qt4" or "qt5". It's not possible to do this with a cmake invocation,
|
|
as the deleted lines override it otherwise.
|
|
|
|
Index: mathgl-2.4.4+svn1661/CMakeLists.txt
|
|
===================================================================
|
|
--- mathgl-2.4.4+svn1661.orig/CMakeLists.txt
|
|
+++ mathgl-2.4.4+svn1661/CMakeLists.txt
|
|
@@ -260,12 +260,6 @@ if(enable-qt4 OR enable-qt5)
|
|
if(enable-qt4asqt AND enable-qt5asqt)
|
|
message(SEND_ERROR "You cannot make Qt4 and Qt5 as qt at the same time.")
|
|
endif(enable-qt4asqt AND enable-qt5asqt)
|
|
- if(enable-qt4 AND NOT enable-qt5)
|
|
- set(enable-qt4asqt TRUE)
|
|
- endif(enable-qt4 AND NOT enable-qt5)
|
|
- if(enable-qt5 AND NOT enable-qt4)
|
|
- set(enable-qt5asqt TRUE)
|
|
- endif(enable-qt5 AND NOT enable-qt4)
|
|
# if(NOT enable-opengl)
|
|
# message(SEND_ERROR "You cannot build MathGL with Qt4 or Qt5 without OpenGL enabled.")
|
|
# endif(NOT enable-opengl)
|