Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2015-02-24 13:02:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2014-11-13 09:18:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2015-02-24 13:07:16.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 23 20:30:07 UTC 2015 - [email protected] + +- Fix unzipping compressed info files when running the gui [boo#918942] + * octave-unzip-info-in-gui.patch +- Disable JIT compilation by default +- Set build settings for SLE11 + +------------------------------------------------------------------- New: ---- octave-unzip-info-in-gui.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.K0aC5p/_old 2015-02-24 13:07:17.000000000 +0100 +++ /var/tmp/diff_new_pack.K0aC5p/_new 2015-02-24 13:07:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,19 +20,21 @@ %define with_native_graphics 1 # Build GUI %define with_gui 1 -# JIT support -# Works only on x86 and x86_64 -%ifarch %ix86 x86_64 -%define with_jit 1 -%else +# JIT compilation %define with_jit 0 -%endif # JAVA support %define with_java 1 # Image processing library # Default variant - GraphicsMagick %define with_imagemagick 0 +# SLE11 +%if 0%{?suse_version} == 1110 +%define with_gui 0 +%define with_jit 0 +%define with_imagemagick 1 +%endif + # SLE12 %if 0%{?suse_version} == 1315 %define with_gui 0 @@ -54,6 +56,8 @@ Patch1: octave-3.8.0-llvm-3.4.patch # PATCH-FIX-UPSTREAM octave-suitesparse-4.4.patch -- http://savannah.gnu.org/bugs/?43063 Patch2: octave-suitesparse-4.4.patch +# PATCH-FIX-UPSTREAM octave-unzip-info-in-gui.patch +Patch3: octave-unzip-info-in-gui.patch BuildRequires: arpack-ng-devel BuildRequires: bison BuildRequires: blas-devel @@ -186,6 +190,7 @@ %if %( echo `rpm -q --queryformat %%{version} suitesparse-devel`| tr -d '.' ) > 421 %patch2 -p1 %endif +%patch3 %build export CPPFLAGS="-DH5_USE_16_API" ++++++ octave-unzip-info-in-gui.patch ++++++ # HG changeset patch # User Torsten <[email protected]> # Date 1424496143 18000 # Node ID be7b05f95d7c606fd28d6d703d35c64cfdb5e1c9 # Parent a9952a647d52671a38d0fac48bc7831a9ad0065d fix unzipping compressed info files when running the gui (bug #38305) * parser.cc (parser::open_file): Use iprocstream instead of QProcess to handle compressed info files. Index: libgui/src/qtinfo/parser.cc =================================================================== --- libgui/src/qtinfo/parser.cc.orig 2014-08-06 19:57:55.000000000 +0200 +++ libgui/src/qtinfo/parser.cc 2015-02-23 10:03:37.158505745 +0100 @@ -29,12 +29,12 @@ #endif #include "parser.h" +#include "procstream.h" #include <QFileInfo> #include <QDir> #include <QFile> #include <QUrl> #include <QRegExp> -#include <QProcess> #include <QBuffer> parser::parser(QObject *p) @@ -79,13 +79,20 @@ QIODevice *iodevice = 0; if ( _compressors_map.contains(file_info.suffix ())) { - QProcess gzip; - gzip.start (_compressors_map.value (file_info.suffix ()).arg (file_info.absoluteFilePath ())); + QString command = _compressors_map.value (file_info.suffix ()).arg (file_info.absoluteFilePath ()); + iprocstream ips (command.toStdString ()); - if (!gzip.waitForFinished ()) + if (ips.bad ()) return 0; - QByteArray result = gzip.readAll (); + QByteArray result; + char buffer[1024]; + + while (! ips.eof ()) + { + ips.read (buffer, sizeof (buffer)); + result.append (buffer, ips.gcount ()); + } QBuffer *io = new QBuffer (this); io->setData (result); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
