From 94369d08870c242dd8f799ac58691cb33686bb1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafael=20Laboissi=C3=A8re?= Date: Sat, 5 Dec 2020 19:47:14 -0300 Subject: [PATCH] Disable building of the SWIG binding for Octave MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The Debian Octave Group is preparing the transtion Octave5 ⇒ Octave 6 [1] and mathgl is in the way. Now, mathgl uses SWIG for building its binding for Octave. However, SWIG is currently incompatible with Octave 6 and neither the Octave upstream authors [2] nor the SWIG upstream authors [3] are willing to fix the problem. The simple solution is to drop the Octave support of mathgl. At any rate, dropping Octave for mathgl will have absolutely no effect in the package, because the two *.oct files generated at building are not installed anywhere. Even though mathgl build-depends on liboctave-dev, none of the resulting binary package depend on Octave in any way. [1] https://bugs.debian.org/976386 [2] https://savannah.gnu.org/bugs/?func=detailitem&item_id=59422 [3] https://github.com/swig/swig/issues/1893 Closes: #976381 --- debian/control | 1 - debian/patches/CMakeLists.patch | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 45ae2c0..c882f4b 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,6 @@ Build-Depends: debhelper-compat (= 12), swig, cmake, libxft-dev, - liboctave-dev, fluid Standards-Version: 4.5.0 Homepage: http://mathgl.sourceforge.net/doc_en/Main.html diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch index f75ebae..34bc820 100644 --- a/debian/patches/CMakeLists.patch +++ b/debian/patches/CMakeLists.patch @@ -49,7 +49,7 @@ # msvc fwprintf print char* for the specifier of "%s" format if(MSVC AND MSVC_VERSION GREATER 1899) -@@ -243,11 +243,11 @@ +@@ -243,9 +243,9 @@ # endif(NOT enable-opengl) endif(enable-qt4 OR enable-qt5) @@ -60,8 +60,5 @@ +CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." ON "enable-json-sample" 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 "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( ${MathGL2_SOURCE_DIR}/include ${MathGL2_BINARY_DIR}/include) -- 2.30.2