Add -qbuttongroup patch to fix FTBFS.

This commit is contained in:
Jerry James 2018-06-02 14:51:14 -06:00
parent f3e519677e
commit 215f4cd777
2 changed files with 15 additions and 0 deletions

11
octave-qbuttongroup.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up octave-4.2.2/libgui/src/settings-dialog.cc.orig octave-4.2.2/libgui/src/settings-dialog.cc
--- octave-4.2.2/libgui/src/settings-dialog.cc.orig 2018-02-28 11:41:44.000000000 -0700
+++ octave-4.2.2/libgui/src/settings-dialog.cc 2018-06-02 14:09:38.138706993 -0600
@@ -36,6 +36,7 @@ along with Octave; see the file COPYING.
#include <QHash>
#include <QMessageBox>
#include <QTextCodec>
+#include <QButtonGroup>
#if defined (HAVE_QSCINTILLA)
# include "octave-qscintilla.h"

View File

@ -40,6 +40,8 @@ Source2: xorg.conf
Patch2: octave-appdata.patch Patch2: octave-appdata.patch
# Add needed #include <math.h> to bring in gnulib # Add needed #include <math.h> to bring in gnulib
Patch4: octave-gnulib.patch Patch4: octave-gnulib.patch
# Add #include <QButtonGroup> to fix build with latest Qt
Patch5: octave-qbuttongroup.patch
Provides: octave(api) = %{octave_api} Provides: octave(api) = %{octave_api}
Provides: bundled(gnulib) Provides: bundled(gnulib)
@ -205,6 +207,7 @@ This package contains documentation for Octave.
%setup -q -n %{name}-%{version}%{?rctag} %setup -q -n %{name}-%{version}%{?rctag}
%patch2 -p1 -b .appdata %patch2 -p1 -b .appdata
%patch4 -p1 -b .gnulib %patch4 -p1 -b .gnulib
%patch5 -p1 -b .qbuttongroup
# __osmesa_print__ test is triggering a crash in libgcc, disable it # __osmesa_print__ test is triggering a crash in libgcc, disable it
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78409 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78409
#sed -i -e '/^%!/d' libinterp/dldfcn/__osmesa_print__.cc #sed -i -e '/^%!/d' libinterp/dldfcn/__osmesa_print__.cc
@ -441,6 +444,7 @@ fi
* Sat Jun 2 2018 Jerry James <loganjerry@gmail.com> - 6:4.2.2-2 * Sat Jun 2 2018 Jerry James <loganjerry@gmail.com> - 6:4.2.2-2
- Rebuild for glpk 4.65 - Rebuild for glpk 4.65
- Use ldconfig macros - Use ldconfig macros
- Add -qbuttongroup patch to fix FTBFS
* Wed Mar 14 2018 Orion Poplawski <orion@cora.nwra.com> - 6:4.2.2-1 * Wed Mar 14 2018 Orion Poplawski <orion@cora.nwra.com> - 6:4.2.2-1
- Update to 4.2.2 - Update to 4.2.2