diff --git a/files/octave-qscintilla-qt5.patch b/files/octave-qscintilla-qt5.patch deleted file mode 100644 --- a/files/octave-qscintilla-qt5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- octave-4.2.1/m4/acinclude.m4.orig 2017-03-01 11:05:40.106105555 +0000 -+++ octave-4.2.1/m4/acinclude.m4 2017-03-01 11:06:05.612735530 +0000 -@@ -1346,7 +1346,7 @@ - ;; - 5) - QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" -- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" -+ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2_qt5" - ;; - *) - AC_MSG_ERROR([Unrecognized Qt version $qt_version]) diff --git a/files/octave.desktop b/files/octave.desktop deleted file mode 100644 --- a/files/octave.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=GNU Octave -Comment=Scientific Computing using GNU Octave -TryExec=/usr/bin/octave -Exec=/usr/bin/octave --force-gui %f -Icon=/usr/share/icons/hicolor/512x512/apps/octave.png -Terminal=false -Type=Application -Categories=Education;Science;Math; -StartupNotify=false -MimeType=text/x-octave;text/x-matlab; -Keywords=science;math;matrix;numerical computation;plotting; diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,12 +1,11 @@ name : octave -version : 4.2.1 -release : 17 +version : 4.2.2 +release : 18 source : - - https://ftp.gnu.org/gnu/octave/octave-4.2.1.tar.lz : 225d7e775c19abfc9bbc685c3dbe5ca22d2622e83fee34b8f583cb742083f027 + - https://ftp.gnu.org/gnu/octave/octave-4.2.2.tar.lz : 57ffe229bb591a19e5f3cfce798fc0a63f2998053881e5dc8d07eaaf76f8735e license : GPL-2.0 component : programming.tools -summary : GNU Octave is a high-level interpreted language, primarily intended for - numerical computations. +summary : GNU Octave is a high-level interpreted language, primarily intended for numerical computations. description: | GNU Octave is a high-level interpreted language, primarily intended for numerical computations. builddeps : @@ -18,6 +17,7 @@ - pkgconfig(GraphicsMagick) - pkgconfig(Qt5UiTools) - pkgconfig(Qt5Widgets) + - pkgconfig(lcms2) - pkgconfig(libcurl) - pkgconfig(librsvg-2.0) - pkgconfig(portaudio-2.0) @@ -42,10 +42,9 @@ - texlive-fonts-extra setup : | %patch -p1 < $pkgfiles/octave-gnulib.patch - %patch -p1 < $pkgfiles/octave-qscintilla-qt5.patch %reconfigure --prefix=/usr --with-qt=5 build : | %make install : | %make_install - install -D -m 00644 $pkgfiles/octave.desktop $installdir/usr/share/applications/octave.desktop + install -D -m 00644 etc/icons/octave.desktop $installdir/usr/share/applications/octave.desktop diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -20,40 +20,40 @@ programming.tools /usr/bin - /usr/lib64/octave/4.2.1/liboctave.so - /usr/lib64/octave/4.2.1/liboctave.so.4 - /usr/lib64/octave/4.2.1/liboctave.so.4.0.0 - /usr/lib64/octave/4.2.1/liboctgui.so - /usr/lib64/octave/4.2.1/liboctgui.so.2 - /usr/lib64/octave/4.2.1/liboctgui.so.2.0.0 - /usr/lib64/octave/4.2.1/liboctinterp.so - /usr/lib64/octave/4.2.1/liboctinterp.so.4 - /usr/lib64/octave/4.2.1/liboctinterp.so.4.0.0 - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/PKG_ADD - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__delaunayn__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__eigs__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__fltk_uigetfile__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__glpk__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__init_fltk__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__init_gnuplot__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__osmesa_print__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/__voronoi__.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/amd.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/audiodevinfo.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/audioread.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/ccolamd.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/chol.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/colamd.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/convhulln.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/dmperm.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/fftw.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/gzip.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/qr.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/symbfact.oct - /usr/lib64/octave/4.2.1/oct/x86_64-solus-linux-gnu/symrcm.oct - /usr/lib64/octave/4.2.1/site/oct/x86_64-solus-linux-gnu - /usr/lib64/octave/octave/4.2.1/exec/x86_64-solus-linux-gnu/octave-gui - /usr/lib64/octave/octave/4.2.1/site/exec/x86_64-solus-linux-gnu + /usr/lib64/octave/4.2.2/liboctave.so + /usr/lib64/octave/4.2.2/liboctave.so.4 + /usr/lib64/octave/4.2.2/liboctave.so.4.0.0 + /usr/lib64/octave/4.2.2/liboctgui.so + /usr/lib64/octave/4.2.2/liboctgui.so.2 + /usr/lib64/octave/4.2.2/liboctgui.so.2.0.0 + /usr/lib64/octave/4.2.2/liboctinterp.so + /usr/lib64/octave/4.2.2/liboctinterp.so.4 + /usr/lib64/octave/4.2.2/liboctinterp.so.4.0.0 + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/PKG_ADD + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__delaunayn__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__eigs__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__fltk_uigetfile__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__glpk__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__init_fltk__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__init_gnuplot__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__osmesa_print__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/__voronoi__.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/amd.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/audiodevinfo.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/audioread.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/ccolamd.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/chol.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/colamd.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/convhulln.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/dmperm.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/fftw.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/gzip.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/qr.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/symbfact.oct + /usr/lib64/octave/4.2.2/oct/x86_64-solus-linux-gnu/symrcm.oct + /usr/lib64/octave/4.2.2/site/oct/x86_64-solus-linux-gnu + /usr/lib64/octave/octave/4.2.2/exec/x86_64-solus-linux-gnu/octave-gui + /usr/lib64/octave/octave/4.2.2/site/exec/x86_64-solus-linux-gnu /usr/lib64/octave/octave/api-v51/site/exec/x86_64-solus-linux-gnu /usr/lib64/octave/octave/site/exec/x86_64-solus-linux-gnu /usr/lib64/octave/site/oct/api-v51/x86_64-solus-linux-gnu @@ -82,19 +82,19 @@ programming.devel - octave + octave /usr/include/ - - 2018-02-02 - 4.2.1 + + 2018-03-15 + 4.2.2 Packaging update Pierre-Yves pyu@riseup.net \ No newline at end of file