+ $program_string
+@@ -244,7 +248,7 @@
+
+ # Dummy title command
+ # Ignore title. Title is handled through ffmpeg_begin_file().
+-set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
++texinfo_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
+ sub ffmpeg_title($$$$)
+ {
+ return '';
+@@ -253,6 +257,8 @@
+ texinfo_register_command_formatting('titlefont',
+ \&ffmpeg_title);
+
++use lib '/usr/share/texinfo/Texinfo/Convert';
++
+ # Customized float command. Part of code borrowed from GNU Texinfo.
+ sub ffmpeg_float($$$$$)
+ {
+@@ -262,8 +268,9 @@
+ my $args = shift;
+ my $content = shift;
+
+- my ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
++my ($caption, $prepended) = Texinfo::Convert::Converter::float_name_caption($self,
+ $command);
++
+ my $caption_text = '';
+ my $prepended_text;
+ my $prepended_save = '';
+@@ -335,24 +342,31 @@
+ $caption->{'args'}->[0], 'float caption');
+ }
+ if ($prepended_text.$caption_text ne '') {
+- $prepended_text = $self->_attribute_class('div','float-caption'). '>'
+- . $prepended_text;
++ $prepended_text = '' . $prepended_text;
+ $caption_text .= '
';
++
+ }
+- my $html_class = '';
+- if ($prepended_save =~ /NOTE/) {
+- $html_class = 'info';
+- $prepended_text = '';
+- $caption_text = '';
+- } elsif ($prepended_save =~ /IMPORTANT/) {
+- $html_class = 'warning';
+- $prepended_text = '';
+- $caption_text = '';
+- }
+- return $self->_attribute_class('div', $html_class). '>' . "\n" .
+- $prepended_text . $caption_text . $content . '';
+-}
++ my $html_class = [];
+
++if ($prepended_save =~ /NOTE/) {
++ $html_class = ['info'];
++ $prepended_text = '';
++ $caption_text = '';
++} elsif ($prepended_save =~ /IMPORTANT/) {
++ $html_class = ['warning'];
++ $prepended_text = '';
++ $caption_text = '';
++} elsif ($prepended_save =~ /Top/) {
++ $html_class = [grep { $_ ne 'Top' } @$html_class]; # Remove "Top" class
++ $prepended_text = '';
++ $caption_text = '';
++}
++
++# Set the class attribute directly in the HTML
++return $self->html_attribute_class('div', $html_class) . '>' . "\n" .
++ $prepended_text . $caption_text . $content . '';
++
++}
+ texinfo_register_command_formatting('float',
+ \&ffmpeg_float);
+
diff --git a/source/n/nghttp2/nghttp2.url b/source/n/nghttp2/nghttp2.url
index 0c81348dc..72e9f8158 100644
--- a/source/n/nghttp2/nghttp2.url
+++ b/source/n/nghttp2/nghttp2.url
@@ -1,2 +1,2 @@
https://github.com/nghttp2/nghttp2
-https://github.com/nghttp2/nghttp2/releases/download/v1.57.0/nghttp2-1.57.0.tar.xz
+https://github.com/nghttp2/nghttp2/releases/download/v1.58.0/nghttp2-1.58.0.tar.xz
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index d2138c0a4..236436465 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=geeqie
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Download the geeqie Git head if there's no tarball:
if ! /bin/ls $CWD/geeqie*tar* 1> /dev/null 2> /dev/null ; then