# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1551047322 18000
# Node ID 3ef2868263e4ac69b09508acf07255e8fa397afb
# Parent  f5a1bf89669cfb4cc8bd0984c20ceb939043af2e
update octave-release for 5.1.0

* release-octave.mk: Update for 5.1.0.
* release-octave-1-defaults.patch: Delete.
* dist-files.mk: Update.

diff -r f5a1bf89669c -r 3ef2868263e4 dist-files.mk
--- a/dist-files.mk	Thu Feb 21 13:56:52 2019 -0500
+++ b/dist-files.mk	Sun Feb 24 17:28:42 2019 -0500
@@ -648,7 +648,6 @@
   readline-1-sigwinch.patch \
   readline-2-event-hook.patch \
   readline.mk \
-  release-octave-1-defaults.patch \
   release-octave-1-gnulib.patch \
   release-octave.mk \
   renderproto.mk \
diff -r f5a1bf89669c -r 3ef2868263e4 src/release-octave-1-defaults.patch
--- a/src/release-octave-1-defaults.patch	Thu Feb 21 13:56:52 2019 -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);
- 
diff -r f5a1bf89669c -r 3ef2868263e4 src/release-octave.mk
--- a/src/release-octave.mk	Thu Feb 21 13:56:52 2019 -0500
+++ b/src/release-octave.mk	Sun Feb 24 17:28:42 2019 -0500
@@ -7,7 +7,7 @@
 ## builds for Windows that are distributed on ftp.gnu.org, you must
 ## choose the revision of mxe-octave that matches the release you
 ## wish to reproduce.  Those should be tagged in the mxe-octave archive
-## with tags like "octave-release-4.4.0".  The options used to build are
+## with tags like "octave-release-5.1.0".  The options used to build are
 ##
 ##   --enable-octave=release
 ##   --enable-binary-packages
@@ -31,12 +31,17 @@
 ##   * 32-bit Windows build:
 ##
 ##       --disable-windows-64 --disable-64 --disable-fortran-int64
+##
+## The extra digit in the $(PKG)_WIN_VERSION variable may be used to
+## distinguish builds that use the same base Octave sources but include
+## updated dependencies or other minor patches applied specifically for
+## Windows.
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.4.1
-$(PKG)_WIN_VERSION := 4.4.1.0
-$(PKG)_CHECKSUM := 6d432c22c48a200214f4369f3c874dd779b1e70b
+$(PKG)_VERSION  := 5.1.0
+$(PKG)_WIN_VERSION := $($(PKG)_VERSION).0
+$(PKG)_CHECKSUM := 7b551647ff87add071cf0f13e7eb43a7125b5b11
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)