From 215f4cd777235f5e13942b5aab25ac9573dfc73f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 2 Jun 2018 14:51:14 -0600 Subject: [PATCH] Add -qbuttongroup patch to fix FTBFS. --- octave-qbuttongroup.patch | 11 +++++++++++ octave.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 octave-qbuttongroup.patch diff --git a/octave-qbuttongroup.patch b/octave-qbuttongroup.patch new file mode 100644 index 0000000..7be5b0d --- /dev/null +++ b/octave-qbuttongroup.patch @@ -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 + #include + #include ++#include + + #if defined (HAVE_QSCINTILLA) + # include "octave-qscintilla.h" diff --git a/octave.spec b/octave.spec index c66a801..fe4beb5 100644 --- a/octave.spec +++ b/octave.spec @@ -40,6 +40,8 @@ Source2: xorg.conf Patch2: octave-appdata.patch # Add needed #include to bring in gnulib Patch4: octave-gnulib.patch +# Add #include to fix build with latest Qt +Patch5: octave-qbuttongroup.patch Provides: octave(api) = %{octave_api} Provides: bundled(gnulib) @@ -205,6 +207,7 @@ This package contains documentation for Octave. %setup -q -n %{name}-%{version}%{?rctag} %patch2 -p1 -b .appdata %patch4 -p1 -b .gnulib +%patch5 -p1 -b .qbuttongroup # __osmesa_print__ test is triggering a crash in libgcc, disable it # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78409 #sed -i -e '/^%!/d' libinterp/dldfcn/__osmesa_print__.cc @@ -441,6 +444,7 @@ fi * Sat Jun 2 2018 Jerry James - 6:4.2.2-2 - Rebuild for glpk 4.65 - Use ldconfig macros +- Add -qbuttongroup patch to fix FTBFS * Wed Mar 14 2018 Orion Poplawski - 6:4.2.2-1 - Update to 4.2.2