rebuilt with libqhull 2015 and libGrapicsMagick 1.3.24 [release 4.0.3-2mamba;Mon Aug 01 2016]

This commit is contained in:
Silvan Calarco 2024-01-06 08:06:12 +01:00
parent 610efd24cf
commit cb2acdad9b
2 changed files with 102 additions and 6 deletions

View File

@ -0,0 +1,38 @@
diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs octave-4.0.0/libinterp/corefcn/pr-output.cc
--- octave-4.0.0/libinterp/corefcn/pr-output.cc.abs 2015-05-23 08:21:53.000000000 -0600
+++ octave-4.0.0/libinterp/corefcn/pr-output.cc 2016-02-21 08:59:30.966291273 -0700
@@ -21,7 +21,7 @@ along with Octave; see the file COPYING.
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <cfloat>
@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t)
PRINT_INT_SCALAR_INTERNAL (int64_t)
PRINT_INT_SCALAR_INTERNAL (uint64_t)
+inline unsigned int abs (unsigned int x) { return x; }
+inline long unsigned int abs (long unsigned int x) { return x; }
+inline long long unsigned int abs (long long unsigned int x) { return x; }
+inline short unsigned int abs (short unsigned int x) { return x; }
+inline unsigned char abs (unsigned char x) { return x; }
+inline signed char abs (signed char x) { return abs((int)x); }
+inline short int abs (short int x) { return abs((int)x); }
+
template <class T>
/* static */ inline void
octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda,
diff -up octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh
--- octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib 2015-05-23 08:21:53.000000000 -0600
+++ octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh 2016-02-19 19:50:04.693811663 -0700
@@ -27,6 +27,7 @@
#ifndef FADDEEVA_HH
#define FADDEEVA_HH 1
+#include <math.h>
#include <complex>
namespace Faddeeva {

View File

@ -1,6 +1,6 @@
Name: octave Name: octave
Version: 4.0.1 Version: 4.0.3
Release: 1mamba Release: 2mamba
Summary: A high-level language, primarily intended for numerical computations Summary: A high-level language, primarily intended for numerical computations
Group: Applications/Mathematics Group: Applications/Mathematics
Vendor: openmamba Vendor: openmamba
@ -10,39 +10,78 @@ URL: http://www.octave.org
Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.xz Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.xz
Source1: octave.png Source1: octave.png
Patch0: %{name}-3.4.2-curl_remove_include.patch Patch0: %{name}-3.4.2-curl_remove_include.patch
Patch1: octave-4.0.3-gcc-6.1.0.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: GraphicsMagick-devel
BuildRequires: gcc-fortran BuildRequires: gcc-fortran
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libGL-devel BuildRequires: libGL-devel
BuildRequires: libGLU-devel BuildRequires: libGLU-devel
BuildRequires: libGraphicsMagick-devel
BuildRequires: libICE-devel
BuildRequires: libOSMesa-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXcursor-devel
BuildRequires: libXdmcp-devel
BuildRequires: libXext-devel BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libXft-devel BuildRequires: libXft-devel
BuildRequires: libXinerama-devel BuildRequires: libXinerama-devel
BuildRequires: libXrender-devel
BuildRequires: libalsa-devel
BuildRequires: libatlas-devel BuildRequires: libatlas-devel
BuildRequires: libblas-devel BuildRequires: libblas-devel
BuildRequires: libbsd-devel
BuildRequires: libbzip2-devel
BuildRequires: libcares-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libexpat-devel
BuildRequires: libfftw-devel BuildRequires: libfftw-devel
BuildRequires: libflac-devel
BuildRequires: libfltk-devel BuildRequires: libfltk-devel
BuildRequires: libfontconfig-devel BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libglib-devel
BuildRequires: libglpk-devel BuildRequires: libglpk-devel
BuildRequires: libgomp-devel BuildRequires: libgomp-devel
BuildRequires: libgraphite2-devel
BuildRequires: libgss-devel
BuildRequires: libharfbuzz-devel
BuildRequires: libhdf5-devel BuildRequires: libhdf5-devel
BuildRequires: libncurses-devel BuildRequires: libidn-devel
BuildRequires: libjack-devel
BuildRequires: liblcms2-devel
BuildRequires: libltdl-devel
BuildRequires: liblzma-devel
BuildRequires: libncurses5
BuildRequires: libogg-devel
BuildRequires: libopenldap-devel
BuildRequires: libopenssl-devel
BuildRequires: libpcre-devel BuildRequires: libpcre-devel
BuildRequires: libpng-devel
BuildRequires: libportaudio-devel
BuildRequires: libqhull-devel BuildRequires: libqhull-devel
BuildRequires: libqrupdate-devel
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
BuildRequires: libquadmath-devel BuildRequires: libquadmath-devel
BuildRequires: libreadline-devel BuildRequires: libreadline-devel
BuildRequires: librtmp-devel
BuildRequires: libsasl2-devel
BuildRequires: libsndfile-devel
BuildRequires: libssh2-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libsuitesparse-devel BuildRequires: libsuitesparse-devel
BuildRequires: libuuid-devel
BuildRequires: libvorbis-devel
BuildRequires: libxcb-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: qscintilla-devel BuildRequires: qscintilla-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libGraphicsMagick-devel >= 1.3.24
BuildRequires: libqhull-devel >= 2015-1mamba
BuildRequires: libglpk-devel >= 4.58-1mamba BuildRequires: libglpk-devel >= 4.58-1mamba
BuildRequires: libcares-devel BuildRequires: libcares-devel
BuildRequires: libidn-devel BuildRequires: libidn-devel
@ -76,18 +115,28 @@ This package contains static libraries and header files need for development.
%prep %prep
%setup -q %setup -q
#-D -T
#:<< _EOF
#%patch0 -p1 #%patch0 -p1
# FIX for gcc 6.1 (Fedora)
%patch1 -p1
find -name \*.cc -o -name \*.h -o -name \*.yy | xargs sed -i -e 's/#include <c\(math\|stdlib\)>/#include <\1.h>/'
find -name \*.h -o -name \*.cc | xargs sed -i -e 's/<config.h>/"config.h"/' -e 's/<base-list.h>/"base-list.h"/'
# FIXME: i586 workaround: comment #include <math.h> in # FIXME: i586 workaround: comment #include <math.h> in
# /usr/include/suitesparse/SuiteSparse_config.h # /usr/include/suitesparse/SuiteSparse_config.h
%build %build
#:<< _EOF
autoreconf -fi
%configure \ %configure \
--enable-shared=yes \ --enable-shared=yes \
--enable-static=no \ --enable-static=no \
UIC=uic-qt4 \ UIC=uic-qt4 \
MOC=moc-qt4 MOC=moc-qt4
#_EOF
# \ # \
# QT_CFLAGS="`pkg-config --cflags Qt5Core Qt5Gui Qt5Network`" \ # QT_CFLAGS="`pkg-config --cflags Qt5Core Qt5Gui Qt5Network`" \
# QT_LDFLAGS="`pkg-config --libs Qt5Core Qt5Gui Qt5Network`" # QT_LDFLAGS="`pkg-config --libs Qt5Core Qt5Gui Qt5Network`"
@ -156,6 +205,15 @@ install -D -m 644 %{SOURCE1} \
%doc ChangeLog README NEWS INSTALL %doc ChangeLog README NEWS INSTALL
%changelog %changelog
* Mon Aug 01 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.3-2mamba
- rebuilt with libqhull 2015 and libGrapicsMagick 1.3.24
* Sun Jul 24 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.3-1mamba
- update to 4.0.3
* Sun Jul 24 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-2mamba
- rebuilt by autoport with build requirements: libqhull-devel>=2015-1mamba
* Tue Mar 22 2016 Automatic Build System <autodist@mambasoft.it> 4.0.1-1mamba * Tue Mar 22 2016 Automatic Build System <autodist@mambasoft.it> 4.0.1-1mamba
- automatic version update by autodist - automatic version update by autodist