# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1511300720 18000
# Node ID 2a8b5cf2085cc25d30a4f8eeafa8e32723fb186f
# Parent  58c55baead8f4af628b561881e1fa3e25104a5f2
allow stable-octave to build from hg

diff -r 58c55baead8f -r 2a8b5cf2085c dist-files.mk
--- a/dist-files.mk	Tue Nov 21 12:26:13 2017 -0500
+++ b/dist-files.mk	Tue Nov 21 16:45:20 2017 -0500
@@ -653,7 +653,6 @@
   src-msys-zip.mk \
   src-msys-zlib.mk \
   stable-octave-1-gnulib.patch \
-  stable-octave-2-appid-version.patch \
   stable-octave.mk \
   suitesparse-1.patch \
   suitesparse.mk \
diff -r 58c55baead8f -r 2a8b5cf2085c hg-octave-dist.mk
--- a/hg-octave-dist.mk	Tue Nov 21 12:26:13 2017 -0500
+++ b/hg-octave-dist.mk	Tue Nov 21 16:45:20 2017 -0500
@@ -40,12 +40,15 @@
 	$(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' all && \
 	$(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' install && \
 	$(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' dist && \
-	mv '$(default-octave_FILE)' '$(PKG_DIR)'
+	mv '$($(OCTAVE_TARGET)_FILE)' '$(PKG_DIR)'
 
 .PHONY: update-hg-octave-repo
 update-hg-octave-repo:
 	if [ -d octave-hg-repo ]; then \
-	  cd octave-hg-repo && hg pull -u; \
+	  cd octave-hg-repo \
+	    && hg pull && hg update $(hg-octave-branch); \
 	else \
-	  hg clone http://octave.org/hg/octave octave-hg-repo; \
+	  hg clone http://octave.org/hg/octave octave-hg-repo \
+	    && cd octave-hg-repo \
+	    && hg pull && hg update $(hg-octave-branch); \
 	fi
diff -r 58c55baead8f -r 2a8b5cf2085c src/stable-octave-2-appid-version.patch
--- a/src/stable-octave-2-appid-version.patch	Tue Nov 21 12:26:13 2017 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -r a3447dba35c3 libinterp/corefcn/sysdep.cc
---- a/libinterp/corefcn/sysdep.cc	Fri Mar 17 13:46:16 2017 -0400
-+++ b/libinterp/corefcn/sysdep.cc	Fri Mar 17 14:57:02 2017 -0400
-@@ -196,7 +196,7 @@
-                                            "SetCurrentProcessExplicitAppUserModelID"));
- 
-       if (pfnSetCurrentProcessExplicitAppUserModelID)
--        pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave");
-+        pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave." VERSION);
- 
-       FreeLibrary (hShell);
-     }
diff -r 58c55baead8f -r 2a8b5cf2085c src/stable-octave.mk
--- a/src/stable-octave.mk	Tue Nov 21 12:26:13 2017 -0500
+++ b/src/stable-octave.mk	Tue Nov 21 16:45:20 2017 -0500
@@ -1,10 +1,12 @@
 # This file is part of MXE.
 # See index.html for further information.
 
+## This can now build from hg stable so we omit the package checksum.
+
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 4.2.1
-$(PKG)_CHECKSUM := 057dbaa30d0ef75e84db30aeda623a2561b0d547
+$(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)