Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2017-07-21 22:49:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Fri Jul 21 22:49:57 2017 rev:49 rq:511535 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2017-02-28 23:51:44.971280281 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-07-21 22:49:59.491715417 +0200 @@ -1,0 +2,23 @@ +Mon Jul 10 22:09:11 UTC 2017 - badshah...@gmail.com + +- Edit _constraints file to require at least 2GB physical memory, + builds on 32-bit systems fail otherwise; see + https://savannah.gnu.org/bugs/index.php?51436; fixes build + failures on i586 for openSUSE > 1320. +- Drop suitesparse-devel BuildRequires; this pulls in openblas, + which is not recommended by upstream. See comment #2 in + https://savannah.gnu.org/bugs/index.php?51436. + +------------------------------------------------------------------- +Mon Jun 26 14:12:29 UTC 2017 - badshah...@gmail.com + +- Add octave-also-check-for-qscintilla2_qt5.patch: When checking + for the availibility of QT5 bindings for scintilla, also check + for qscintilla2_qt5 (which is the shlib name used by openSUSE), + otherwise this causes the in-built editor to be disabled; patch + taken from upstream. Since patch modifies m4 files, regenerate + configure before executing it (add BuildRequires on automake, + autoconf and libtool). All changes applied conditionally only + when building against Qt5. + +------------------------------------------------------------------- New: ---- octave-also-check-for-qscintilla2_qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.pFGzTH/_old 2017-07-21 22:50:00.515570989 +0200 +++ /var/tmp/diff_new_pack.pFGzTH/_new 2017-07-21 22:50:00.519570425 +0200 @@ -63,6 +63,8 @@ Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz Source2: octave.pc.in Source3: octave.macros +# PATCH-FIX-UPSTREAM octave-also-check-for-qscintilla2_qt5.patch badshah...@gmail.com -- When checking for the availibility of QT5 bindings for scintilla, also check for qscintilla2_qt5 (which is the name used by openSUSE); patch taken from upstream +Patch0: octave-also-check-for-qscintilla2_qt5.patch BuildRequires: arpack-ng-devel BuildRequires: bison BuildRequires: blas-devel @@ -87,7 +89,6 @@ BuildRequires: qhull-devel BuildRequires: qrupdate-devel BuildRequires: readline-devel -BuildRequires: suitesparse-devel BuildRequires: termcap BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(zlib) @@ -102,6 +103,11 @@ BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files %if 0%{?with_qt5gui} +# Required for Patch0 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +# BuildRequires: libqscintilla-qt5-devel BuildRequires: libqt5-linguist BuildRequires: pkgconfig(Qt5Core) @@ -212,7 +218,16 @@ %prep %setup -q -n %{name}-%{src_ver} +%if 0%{?with_qt5gui} +%patch0 -p1 +%endif + %build +# Patch0 edits m4 files, so regenerate configure +%if 0%{?with_qt5gui} +autoreconf -fvi +%endif + export CPPFLAGS="-DH5_USE_16_API" %configure \ --libexecdir=%{_libdir} \ ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.pFGzTH/_old 2017-07-21 22:50:00.555565348 +0200 +++ /var/tmp/diff_new_pack.pFGzTH/_new 2017-07-21 22:50:00.555565348 +0200 @@ -1,5 +1,8 @@ <constraints> <hardware> + <physicalmemory> + <size unit="G">2</size> + </physicalmemory> <disk> <size unit="G">7</size> </disk> ++++++ octave-also-check-for-qscintilla2_qt5.patch ++++++ # HG changeset patch # User Rik <r...@octave.org> # Date 1492620233 25200 # Node ID a759896c2b53ef0f831b46a7c910c4532a9e0901 # Parent 7ca04e85f9e3194b721c4a7e1371d61105617955 acinclude.m4: Look for "qscintilla_qt5" as another name for Qt5 scintilla library. * acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Add "qscintilla2_qt5" to list of possible Qt5 QScintilla library names. diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -1346,7 +1346,7 @@ ;; 5) QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" - octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" + octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2" ;; *) AC_MSG_ERROR([Unrecognized Qt version $qt_version])
