changeset 4911:28dd120605d9

stable-octave.mk: Update for version 5.0.1 (bug #55262).
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 22 Dec 2018 10:07:07 +0100
parents 030e6ff3eac5
children dc299f683995
files src/stable-octave-1-defaults.patch src/stable-octave.mk
diffstat 2 files changed, 2 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/src/stable-octave-1-defaults.patch	Wed Dec 19 10:39:43 2018 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-diff --git a/libgui/src/resource-manager.cc b/libgui/src/resource-manager.cc
---- a/libgui/src/resource-manager.cc
-+++ b/libgui/src/resource-manager.cc
-@@ -233,6 +233,20 @@ namespace octave
-         QString default_family = "courier";
- #endif
- 
-+        std::string env_default_family
-+          = sys::env::getenv ("OCTAVE_DEFAULT_FONT");
-+
-+        if (! env_default_family.empty ())
-+          default_family = QString::fromStdString (env_default_family);
-+
-+        QString default_font_size = "10";
-+
-+        std::string env_default_font_size
-+          = sys::env::getenv ("OCTAVE_DEFAULT_FONT_SIZE");
-+
-+        if (! env_default_font_size.empty ())
-+          default_font_size = QString::fromStdString (env_default_font_size);
-+
-         // Get the default custom editor
- #if defined (Q_OS_WIN32)
-         QString custom_editor = "notepad++ -n%l %f";
-@@ -240,10 +254,16 @@ namespace octave
-         QString custom_editor = "emacs +%l %f";
- #endif
- 
-+        std::string env_default_editor
-+          = sys::env::getenv ("OCTAVE_DEFAULT_EDITOR");
-+
-+        if (! env_default_editor.empty ())
-+          custom_editor = QString::fromStdString (env_default_editor);
-+
-         // Replace placeholders
-         settings_text.replace ("__default_custom_editor__", custom_editor);
-         settings_text.replace ("__default_font__", default_family);
--        settings_text.replace ("__default_font_size__", "10");
-+        settings_text.replace ("__default_font_size__", default_font_size);
- 
-         QFile user_settings (m_settings_file);
- 
--- a/src/stable-octave.mk	Wed Dec 19 10:39:43 2018 -0500
+++ b/src/stable-octave.mk	Sat Dec 22 10:07:07 2018 +0100
@@ -13,8 +13,8 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.4.1
-$(PKG)_WIN_VERSION := 4.4.1.90
+$(PKG)_VERSION  := 5.0.1
+$(PKG)_WIN_VERSION := $(PKG)_VERSION
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz