Hello community, here is the log from the commit of package octave-forge-generate_html for openSUSE:Factory checked in at 2020-08-13 10:24:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave-forge-generate_html (Old) and /work/SRC/openSUSE:Factory/.octave-forge-generate_html.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-generate_html" Thu Aug 13 10:24:03 2020 rev:6 rq:826125 version:0.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/octave-forge-generate_html/octave-forge-generate_html.changes 2017-08-28 15:13:04.487216360 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-generate_html.new.3399/octave-forge-generate_html.changes 2020-08-13 10:26:40.194898242 +0200 @@ -1,0 +2,6 @@ +Fri Aug 7 17:52:00 UTC 2020 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 0.3.2: + * Fix empty '{}' to work with Octave >= 6. + +------------------------------------------------------------------- Old: ---- generate_html-0.3.1.tar.gz New: ---- generate_html-0.3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave-forge-generate_html.spec ++++++ --- /var/tmp/diff_new_pack.fsq8RR/_old 2020-08-13 10:26:40.946898222 +0200 +++ /var/tmp/diff_new_pack.fsq8RR/_new 2020-08-13 10:26:40.950898222 +0200 @@ -1,7 +1,7 @@ # # spec file for package octave-forge-generate_html # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define octpkg generate_html Name: octave-forge-%{octpkg} -Version: 0.3.1 +Version: 0.3.2 Release: 0 Summary: Generate HTML web page from help texts -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Scientific/Math -Url: http://octave.sourceforge.net +URL: http://octave.sourceforge.net Source0: http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz BuildArch: noarch BuildRequires: octave-devel ++++++ generate_html-0.3.1.tar.gz -> generate_html-0.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/DESCRIPTION new/generate_html-0.3.2/DESCRIPTION --- old/generate_html-0.3.1/DESCRIPTION 2017-06-17 16:10:46.211667703 +0200 +++ new/generate_html-0.3.2/DESCRIPTION 2020-05-18 15:58:54.000000000 +0200 @@ -1,6 +1,6 @@ Name: generate_html -Version: 0.3.1 -Date: 2017-06-17 +Version: 0.3.2 +Date: 2020-05-18 Author: Søren Hauberg <so...@hauberg.org> and others Maintainer: Octave-Forge community <maintain...@octave.org> Title: Generate HTML web page from help texts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/NEWS new/generate_html-0.3.2/NEWS --- old/generate_html-0.3.1/NEWS 2017-06-17 16:10:46.211667703 +0200 +++ new/generate_html-0.3.2/NEWS 2020-05-18 15:58:54.000000000 +0200 @@ -1,3 +1,8 @@ +Summary of important user-visible changes for generate_html 0.3.2: +------------------------------------------------------------------- + + ** Fix empty '{}' to work with Octave >= 6.. + Summary of important user-visible changes for generate_html 0.3.1: ------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/inst/check_duplicates.m new/generate_html-0.3.2/inst/check_duplicates.m --- old/generate_html-0.3.1/inst/check_duplicates.m 2017-06-17 16:10:46.211667703 +0200 +++ new/generate_html-0.3.2/inst/check_duplicates.m 2020-05-18 15:58:54.000000000 +0200 @@ -105,7 +105,7 @@ ## check for unknown option names known = {"excl"; "syms"; "text_only"; "url"; "browser"}; if (numel (unknown = setdiff (fieldnames (opts), known))) - warning ("unknown option(s):%s", sprintf (" %s", unknown{})); + warning ("unknown option(s):%s", sprintf (" %s", unknown{:})); endif ## set option values diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/inst/generate_package_html.m new/generate_html-0.3.2/inst/generate_package_html.m --- old/generate_html-0.3.1/inst/generate_package_html.m 2017-06-17 16:10:46.215667807 +0200 +++ new/generate_html-0.3.2/inst/generate_package_html.m 2020-05-18 15:58:54.000000000 +0200 @@ -90,7 +90,7 @@ ## We don't want a dependency on the struct package for ## generate_html, otherwise the following could be: ## - ## list = cell2struct (all_list.', {structcat(1, all_list{}).name}, 1).(packname) + ## list = cell2struct (all_list.', {structcat(1, all_list{:}).name}, 1).(packname) ## ## But probably pkg ("list") should not return a cell array of ## structures anyway. @@ -911,6 +911,6 @@ endfor json = sprintf ([indent "{" tmpl "\n" indent "}"], - vertcat (fns.', struct2cell (map).'){}); + vertcat (fns.', struct2cell (map).'){:}); endfunction diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/inst/of-website-files/footer.js new/generate_html-0.3.2/inst/of-website-files/footer.js --- old/generate_html-0.3.1/inst/of-website-files/footer.js 2017-06-17 16:10:46.215667807 +0200 +++ new/generate_html-0.3.2/inst/of-website-files/footer.js 2020-05-18 15:58:54.000000000 +0200 @@ -22,8 +22,8 @@ document.write (` <div id="sf_logo"> - <a href="https://sourceforge.net"><img src="https://sourceforge.net/sflogo.php?group_id=2888&type=1" - width="88" height="31" style="border: 0;" alt="SourceForge.net Logo"/></a> + <a href="https://sourceforge.net"><img src="https://sourceforge.net/sflogo.php?group_id=2888&type=13" + width="120" height="30" style="border: 0;" alt="SourceForge.net Logo"/></a> </div> `); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/inst/private/__html_help_text__.m new/generate_html-0.3.2/inst/private/__html_help_text__.m --- old/generate_html-0.3.1/inst/private/__html_help_text__.m 2017-06-17 16:10:46.219667894 +0200 +++ new/generate_html-0.3.2/inst/private/__html_help_text__.m 2020-05-18 15:58:54.000000000 +0200 @@ -118,80 +118,6 @@ endfunction -function [text, images] = get_output (demo_num, ... - code, imagedir, full_imagedir, fileprefix) - - ## Clear everything - close all - diary_file = "__diary__.txt"; - if (exist (diary_file, "file")) - delete (diary_file); - endif - - unwind_protect - ## Hide figures only if gnuplot is in use - ## (fltk doesn't currently support offscreen printing; see bug #33180) - def = get (0, "defaultfigurevisible"); - if strcmp (graphics_toolkit, "gnuplot") - set (0, "defaultfigurevisible", "off"); - endif - - ## Pager off - more_val = page_screen_output (false); - - ## Evaluate the code - diary (diary_file); - eval (code); - diary ("off"); - - ## Read the results - fid = fopen (diary_file, "r"); - diary_data = char (fread (fid).'); - fclose (fid); - - ## Remove 'diary ("off");' from the diary - idx = strfind (diary_data, "diary (\"off\");"); - if (isempty (idx)) - text = diary_data; - else - text = diary_data (1:idx (end)-1); - endif - text = strtrim (text); - - ## Save figures - if (!isempty (get (0, "currentfigure")) && !exist (full_imagedir, "dir")) - [succ, msg] = mkdir (full_imagedir); - if (!succ) - error ("Unable to create directory %s:\n %s", full_imagedir, msg); - endif - endif - - ## For @class methods: Clean up fileprefix - fileprefix = strrep (fileprefix, filesep (), '_'); - - images = {}; - r = demo_num * 100; - while (!isempty (get (0, "currentfigure"))) - r = r + 1; - fig = gcf (); - name = sprintf ("%s_%d.png", fileprefix, r); - full_filename = fullfile (full_imagedir, name); - filename = fullfile (imagedir, name); - print (fig, full_filename); - images{end+1} = filename; - close (fig); - endwhile - - ## Reverse image list, since we got them latest-first - images = images (end:-1:1); - - unwind_protect_cleanup - delete (diary_file); - set (0, "defaultfigurevisible", def); - page_screen_output (more_val); - end_unwind_protect -endfunction - function text = images_in_html (images) header = "<table class=\"images\">\n<tr>\n"; footer = "</tr></table>\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/inst/private/get_output.m new/generate_html-0.3.2/inst/private/get_output.m --- old/generate_html-0.3.1/inst/private/get_output.m 1970-01-01 01:00:00.000000000 +0100 +++ new/generate_html-0.3.2/inst/private/get_output.m 2020-05-18 15:58:54.000000000 +0200 @@ -0,0 +1,99 @@ +## Copyright (C) 2008 Soren Hauberg <so...@hauberg.org> +## Copyright (C) 2014, 2015 Julien Bect <jb...@users.sourceforge.net> +## +## This program is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## This program is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +## -*- texinfo -*- +## @deftypefn {Function File} get_output () +## undocumented internal function +## @end deftypefn + +function [text, images] = get_output (demo_num, ... + code, imagedir, full_imagedir, fileprefix) + +### This function must not be a subfunction, since declaring variables +### in eval'ed code is not allowed (anymore). See +### http://savannah.gnu.org/bugs/?52632 + + ## Clear everything + close all + diary_file = "__diary__.txt"; + if (exist (diary_file, "file")) + delete (diary_file); + endif + + unwind_protect + ## Hide figures only if gnuplot is in use + ## (fltk doesn't currently support offscreen printing; see bug #33180) + def = get (0, "defaultfigurevisible"); + if strcmp (graphics_toolkit, "gnuplot") + set (0, "defaultfigurevisible", "off"); + endif + + ## Pager off + more_val = page_screen_output (false); + + ## Evaluate the code + diary (diary_file); + eval (code); + diary ("off"); + + ## Read the results + fid = fopen (diary_file, "r"); + diary_data = char (fread (fid).'); + fclose (fid); + + ## Remove 'diary ("off");' from the diary + idx = strfind (diary_data, "diary (\"off\");"); + if (isempty (idx)) + text = diary_data; + else + text = diary_data (1:idx (end)-1); + endif + text = strtrim (text); + + ## Save figures + if (!isempty (get (0, "currentfigure")) && !exist (full_imagedir, "dir")) + [succ, msg] = mkdir (full_imagedir); + if (!succ) + error ("Unable to create directory %s:\n %s", full_imagedir, msg); + endif + endif + + ## For @class methods: Clean up fileprefix + fileprefix = strrep (fileprefix, filesep (), '_'); + + images = {}; + r = demo_num * 100; + while (!isempty (get (0, "currentfigure"))) + r = r + 1; + fig = gcf (); + name = sprintf ("%s_%d.png", fileprefix, r); + full_filename = fullfile (full_imagedir, name); + filename = fullfile (imagedir, name); + print (fig, full_filename); + images{end+1} = filename; + close (fig); + endwhile + + ## Reverse image list, since we got them latest-first + images = images (end:-1:1); + + unwind_protect_cleanup + delete (diary_file); + set (0, "defaultfigurevisible", def); + page_screen_output (more_val); + end_unwind_protect +endfunction diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/generate_html-0.3.1/inst/urlview.m new/generate_html-0.3.2/inst/urlview.m --- old/generate_html-0.3.1/inst/urlview.m 2017-06-17 16:10:46.223667975 +0200 +++ new/generate_html-0.3.2/inst/urlview.m 2020-05-18 15:58:54.000000000 +0200 @@ -69,7 +69,7 @@ ## check for unknown option names known = {"browser"}; if (numel (unknown = setdiff (fieldnames (opts), known))) - warning ("unknown option(s):%s", sprintf (" %s", unknown{})); + warning ("unknown option(s):%s", sprintf (" %s", unknown{:})); endif ## set option values @@ -77,8 +77,8 @@ if (isempty (browser)) for cmd = {"firefox", "epiphany"} - if (! ([err, path] = system (sprintf ("which %s", cmd{})))) - browser = cmd{}; + if (! ([err, path] = system (sprintf ("which %s", cmd{:})))) + browser = cmd{:}; break endif endfor @@ -92,7 +92,7 @@ endif if (strcmp (method, "get") - && numel (url) + npars + numel ([pars{}]) > 2048) + && numel (url) + npars + numel ([pars{:}]) > 2048) error ("url size limit 2048 of method 'get' exceeded") endif @@ -108,7 +108,7 @@ if (npars) data = ... - sprintf (' <input type="hidden" name="%s" value="%s">', pars{}); + sprintf (' <input type="hidden" name="%s" value="%s">', pars{:}); else data = ""; endif