Mercurial > mxe-octave

changeset 7197:e03680baccc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 15 May 2024 13:07:42 +0200
parents 0247b4ede541 (current diff) 1fe8ec23243a (diff)
children ea296e38047a
files dist-files.mk
diffstat 3 files changed, 3 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri May 10 13:52:05 2024 +0200
+++ b/dist-files.mk	Wed May 15 13:07:42 2024 +0200
@@ -526,7 +526,6 @@
   of-quaternion-1-cross-fixes.patch \
   of-quaternion-2-dev-fixes.patch \
   of-quaternion.mk \
-  of-queueing-1-octave7.patch \
   of-queueing.mk \
   of-signal-1-cassert.patch \
   of-signal.mk \
--- a/src/of-queueing-1-octave7.patch	Fri May 10 13:52:05 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-Description: Fix FTBFS against Octave 7
- print_usage() was called within a logical expression. Since it does not return
- a value, this fails with Octave 7 since the latter does stricter checks on
- number of output arguments.
- This patch uses an if/endif conditional rather than a logical short-circuit
- expression.
-Author: Sébastien Villemot <sebastien@debian.org>
-Bug: https://savannah.gnu.org/bugs/?62314
-Bug-Debian: https://bugs.debian.org/1009135
-Last-Update: 2022-04-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/inst/qnmknode.m
-+++ b/inst/qnmknode.m
-@@ -126,22 +126,25 @@ function Q = qnmknode( node, S, varargin
-     endif
-   elseif ( strcmp(node, "-/g/1-lcfs-pr") )
-     ## -/G/1-LCFS-PR node
--    ( 2 == nargin || 3 == nargin ) || ...
--	print_usage();
-+    if ~( 2 == nargin || 3 == nargin )
-+      print_usage();
-+    endif
-     if ( 3 == nargin ) 
-       s2 = varargin{1};
-     endif
-   elseif ( strcmp(node, "-/g/1-ps") )
-     ## -/G/1-PS (processor sharing) node
--    ( 2 == nargin || 3 == nargin ) || ...
--	print_usage();
-+    if ~( 2 == nargin || 3 == nargin )
-+      print_usage();
-+    endif
-     if ( 3 == nargin )
-       s2 = varargin{1};
-     endif
-   elseif ( strcmp(node, "-/g/inf") )
-     ## -/G/inf (Infinite Server) node
--    ( 2 == nargin || 3 == nargin ) || ...
--	print_usage();
-+    if ~( 2 == nargin || 3 == nargin )
-+      print_usage();
-+    endif
-     if ( 3 == nargin )
-       s2 = varargin{1};
-     endif
--- a/src/of-queueing.mk	Fri May 10 13:52:05 2024 +0200
+++ b/src/of-queueing.mk	Wed May 15 13:07:42 2024 +0200
@@ -3,12 +3,12 @@
 
 PKG             := of-queueing
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.7
-$(PKG)_CHECKSUM := 4f5d6956f9ceb6b612b42aaabcbbaece1eec87fb
+$(PKG)_VERSION  := 1.2.8
+$(PKG)_CHECKSUM := 6d7677d7d0807023e58d91da6683d37f50d48b0f
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := queueing
 $(PKG)_FILE     := queueing-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
+$(PKG)_URL      := https://github.com/mmarzolla/queueing/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)