Wed Mar 31 23:43:20 UTC 202120210331234320

a/file-5.40-x86_64-1.txz:  Upgraded.
ap/ghostscript-9.54.0-x86_64-1.txz:  Upgraded.
d/help2man-1.48.3-x86_64-1.txz:  Upgraded.
l/at-spi2-core-2.40.0-x86_64-1.txz:  Upgraded.
l/dbus-glib-0.112-x86_64-1.txz:  Upgraded.
l/dconf-0.40.0-x86_64-1.txz:  Upgraded.
l/dconf-editor-3.38.3-x86_64-1.txz:  Upgraded.
l/gcr-3.40.0-x86_64-1.txz:  Upgraded.
l/gdk-pixbuf2-2.42.4-x86_64-1.txz:  Upgraded.
l/gjs-1.68.0-x86_64-1.txz:  Upgraded.
l/glib-networking-2.68.0-x86_64-1.txz:  Upgraded.
l/glib2-2.68.0-x86_64-1.txz:  Upgraded.
l/gobject-introspection-1.68.0-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.28-x86_64-1.txz:  Upgraded.
l/gvfs-1.48.0-x86_64-1.txz:  Upgraded.
l/netpbm-10.94.01-x86_64-1.txz:  Upgraded.
l/pygobject3-3.40.1-x86_64-1.txz:  Upgraded.
l/vte-0.64.0-x86_64-1.txz:  Upgraded.
n/curl-7.76.0-x86_64-1.txz:  Upgraded.
  This update fixes security issues:
  Authentication Bypass by Spoofing.
  Exposure of Private Personal Information to an Unauthorized Actor.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22890
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22876
  (* Security fix *)
xap/gimp-2.10.24-x86_64-1.txz:  Upgraded.
xap/seamonkey-2.53.7-x86_64-1.txz:  Upgraded.
  This update contains security fixes and improvements.
  For more information, see:
    https://www.seamonkey-project.org/releases/seamonkey2.53.7
  (* Security fix *)

22 files changed, 24 insertions, 824 deletions

diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild
index 204b04dc..2554d14b 100755
--- a/source/a/file/file.SlackBuild
+++ b/source/a/file/file.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=file
 VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch b/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch
deleted file mode 100644
index 66b5f655..00000000
--- a/source/ap/ghostscript/ghostscript-9.53.3-freetype_fix-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2020-10-20
-Initial Package Version: 9.53.3
-Upstream Status: Applied
-Origin: https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b#patch1
-Description: Fixes build failure with freetype-2.10.3 and later.
-
-diff --git a/base/fapi_ft.c b/base/fapi_ft.c
-index 65fa6dc..21aef2f 100644 (file)
---- a/base/fapi_ft.c
-+++ b/base/fapi_ft.c
-@@ -125,7 +125,7 @@ static void
- delete_inc_int_info(gs_fapi_server * a_server,
-                     FT_IncrementalRec * a_inc_int_info);
- 
--FT_CALLBACK_DEF(void *)
-+static void *
- FF_alloc(FT_Memory memory, long size)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size)
-     return (gs_malloc(mem, size, 1, "FF_alloc"));
- }
- 
--FT_CALLBACK_DEF(void *)
-+static void *
-     FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *)
-     return (tmp);
- }
- 
--FT_CALLBACK_DEF(void)
-+static void
-     FF_free(FT_Memory memory, void *block)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-
diff --git a/source/ap/ghostscript/ghostscript.SlackBuild b/source/ap/ghostscript/ghostscript.SlackBuild
index acb48bd8..485704b8 100755
--- a/source/ap/ghostscript/ghostscript.SlackBuild
+++ b/source/ap/ghostscript/ghostscript.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016, 2017, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ if [ -r gnu-ghostscript-*.tar.?z ]; then
   SRCPREFIX="gnu-"
 fi
 VERSION=${VERSION:-$(echo $SRCPREFIX$PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -76,9 +76,6 @@ cd ${SRCPREFIX}${PKGNAM}-$VERSION || exit 1
 # Remove unmaintained garbage:
 rm -rf freetype jpeg lcms2 libpng libtiff png tiff zlib
 
-# Fix build against freetype-2.10.3+:
-zcat $CWD/ghostscript-9.53.3-freetype_fix-1.patch.gz | patch -p1 --verbose || exit 1
-
 # Regenerate ./configure.  Needed if patched, or to prevent libtool mismatch.
 autoreconf --force --install
 ( cd jbig2dec ; autoreconf --force --install )
diff --git a/source/l/at-spi2-core/at-spi2-core.SlackBuild b/source/l/at-spi2-core/at-spi2-core.SlackBuild
index 89188400..7bfd84a9 100755
--- a/source/l/at-spi2-core/at-spi2-core.SlackBuild
+++ b/source/l/at-spi2-core/at-spi2-core.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=at-spi2-core
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/dbus-glib/dbus-glib.SlackBuild b/source/l/dbus-glib/dbus-glib.SlackBuild
index 72871d8c..41189382 100755
--- a/source/l/dbus-glib/dbus-glib.SlackBuild
+++ b/source/l/dbus-glib/dbus-glib.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dbus-glib
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/dconf-editor/dconf-editor.SlackBuild b/source/l/dconf-editor/dconf-editor.SlackBuild
index 605c52db..119b81cc 100755
--- a/source/l/dconf-editor/dconf-editor.SlackBuild
+++ b/source/l/dconf-editor/dconf-editor.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dconf-editor
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,9 +78,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# Fix for latest vala (all GtkChild widgets must be declared as unowned):
-cat $CWD/fdc90849223649509424bbefe14990de71db2b2b.patch | patch -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/l/dconf-editor/fdc90849223649509424bbefe14990de71db2b2b.patch b/source/l/dconf-editor/fdc90849223649509424bbefe14990de71db2b2b.patch
deleted file mode 100644
index a75bd30c..00000000
--- a/source/l/dconf-editor/fdc90849223649509424bbefe14990de71db2b2b.patch
+++ /dev/null
@@ -1,516 +0,0 @@
-From fdc90849223649509424bbefe14990de71db2b2b Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 16 Jan 2021 13:26:32 +0100
-Subject: [PATCH] Don't alter or try to write GtkChild fields
-
-See https://gitlab.gnome.org/GNOME/vala/issues/1121
----
- editor/bookmarks-headerbar.vala  |  4 +--
- editor/bookmarks-list.vala       |  4 +--
- editor/bookmarks.vala            | 12 +++----
- editor/delayed-setting-view.vala | 54 ++++++++++++++++----------------
- editor/overlayed-list.vala       | 38 +++++++++++-----------
- editor/pathentry.vala            | 24 +++++++-------
- editor/registry-list.vala        |  6 ++--
- editor/registry-search.vala      |  6 ++--
- editor/registry-view.vala        |  2 +-
- 9 files changed, 75 insertions(+), 75 deletions(-)
-
-diff --git a/editor/bookmarks-headerbar.vala b/editor/bookmarks-headerbar.vala
-index 54848a5d..0522c37e 100644
---- a/editor/bookmarks-headerbar.vala
-+++ b/editor/bookmarks-headerbar.vala
-@@ -24,7 +24,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget
-         install_action_entries ();
- 
-         add_bookmarks_revealer              (out bookmarks_revealer,
--                                             out bookmarks_button,              ref center_box);
-+                                             out bookmarks_button,              center_box);
-         connect_bookmarks_signals ();
-         add_bookmarks_controller            (out bookmarks_controller,          ref this);
- 
-@@ -58,7 +58,7 @@ private abstract class BookmarksHeaderBar : BrowserHeaderBar, AdaptativeWidget
-     private Bookmarks           bookmarks_button;
-     private BookmarksController bookmarks_controller;
- 
--    private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, ref Box center_box)
-+    private static void add_bookmarks_revealer (out Revealer bookmarks_revealer, out Bookmarks bookmarks_button, Box center_box)
-     {
-         bookmarks_revealer = new Revealer ();
-         bookmarks_revealer.transition_type = RevealerTransitionType.SLIDE_LEFT;
-diff --git a/editor/bookmarks-list.vala b/editor/bookmarks-list.vala
-index 393973b8..c9280d59 100644
---- a/editor/bookmarks-list.vala
-+++ b/editor/bookmarks-list.vala
-@@ -146,10 +146,10 @@ private class BookmarksList : OverlayedList
- 
-     internal bool create_bookmark_rows (Variant bookmarks_variant)
-     {
--        _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, ref main_list_box, ref bookmarks_hashtable);
-+        _create_bookmark_rows (bookmarks_variant, view_mode, ref main_list_store, main_list_box, ref bookmarks_hashtable);
-         return n_items == 0;
-     }
--    private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ref ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable)
-+    private static void _create_bookmark_rows (Variant bookmarks_variant, bool view_mode, ref GLib.ListStore main_list_store, ListBox main_list_box, ref HashTable<string, Bookmark> bookmarks_hashtable)
-     {
-         string saved_bookmark_name = "";
-         ListBoxRow? selected_row = main_list_box.get_selected_row ();
-diff --git a/editor/bookmarks.vala b/editor/bookmarks.vala
-index 153af104..d8cea7cc 100644
---- a/editor/bookmarks.vala
-+++ b/editor/bookmarks.vala
-@@ -84,7 +84,7 @@ private class Bookmarks : MenuButton
- 
-     construct
-     {
--        update_switch_label (ViewType.SEARCH, ViewType.FOLDER, ref switch_label); // init text with "Bookmark this Location"
-+        update_switch_label (ViewType.SEARCH, ViewType.FOLDER, switch_label); // init text with "Bookmark this Location"
- 
-         install_action_entries ();
- 
-@@ -184,7 +184,7 @@ private class Bookmarks : MenuButton
- 
-     internal void set_path (ViewType type, string path)
-     {
--        update_switch_label (current_type, type, ref switch_label);
-+        update_switch_label (current_type, type, switch_label);
- 
-         current_path = path;
-         current_type = type;
-@@ -392,7 +392,7 @@ private class Bookmarks : MenuButton
-     * * Bookmarks management
-     \*/
- 
--    private static void update_switch_label (ViewType old_type, ViewType new_type, ref Label switch_label)
-+    private static void update_switch_label (ViewType old_type, ViewType new_type, Label switch_label)
-     {
-         if (new_type == ViewType.SEARCH && old_type != ViewType.SEARCH)
-             switch_label.label = bookmark_this_search_text;
-@@ -414,18 +414,18 @@ private class Bookmarks : MenuButton
-         {
-             if (bookmarks_icon.icon_name != "starred-symbolic")
-                 bookmarks_icon.icon_name = "starred-symbolic";
--            update_switch_state (true, ref bookmarked_switch);
-+            update_switch_state (true, bookmarked_switch);
-             bookmarked_switch.set_detailed_action_name ("bookmarks.unbookmark(" + variant.print (true) + ")");
-         }
-         else
-         {
-             if (bookmarks_icon.icon_name != "non-starred-symbolic")
-                 bookmarks_icon.icon_name = "non-starred-symbolic";
--            update_switch_state (false, ref bookmarked_switch);
-+            update_switch_state (false, bookmarked_switch);
-             bookmarked_switch.set_detailed_action_name ("bookmarks.bookmark(" + variant.print (true) + ")");
-         }
-     }
--    private static void update_switch_state (bool bookmarked, ref Switch bookmarked_switch)
-+    private static void update_switch_state (bool bookmarked, Switch bookmarked_switch)
-     {
-         if (bookmarked == bookmarked_switch.active)
-             return;
-diff --git a/editor/delayed-setting-view.vala b/editor/delayed-setting-view.vala
-index add68525..b1f774ca 100644
---- a/editor/delayed-setting-view.vala
-+++ b/editor/delayed-setting-view.vala
-@@ -41,24 +41,24 @@ private class DelayedSettingView : OverlayedListRow
-         {
-             // at row creation, key is never ghost
-             _update_dconf_key_current_value (key_value,
--                                         ref key_value_label,
--                                         ref key_value_default);
-+                                             key_value_label,
-+                                             key_value_default);
- 
-             _update_dconf_key_planned_value (cool_planned_value,
--                                         ref planned_value_label,
--                                         ref planned_value_default);
-+                                             planned_value_label,
-+                                             planned_value_default);
-         }
-         else
-         {
-             _update_gsettings_key_current_value (key_value,
-                                                  has_schema_and_is_default,
--                                             ref key_value_label,
--                                             ref key_value_default);
-+                                                 key_value_label,
-+                                                 key_value_default);
- 
-             _update_gsettings_key_planned_value (cool_planned_value,
-                                                  (!) cool_default_value,
--                                             ref planned_value_label,
--                                             ref planned_value_default);
-+                                                 planned_value_label,
-+                                                 planned_value_default);
-         }
-     }
- 
-@@ -74,23 +74,23 @@ private class DelayedSettingView : OverlayedListRow
- 
-     private static inline void _update_gsettings_key_planned_value (string? cool_planned_value,
-                                                                     string  cool_default_value,
--                                                                ref Label   planned_value_label,
--                                                                ref Label   planned_value_default)
-+                                                                    Label   planned_value_label,
-+                                                                    Label   planned_value_default)
-     {
-         bool is_default = cool_planned_value == null;
-         planned_value_label.label = is_default ? cool_default_value : (!) cool_planned_value;
--        update_value_default_label (is_default, ref planned_value_default);
-+        update_value_default_label (is_default, planned_value_default);
-     }
- 
-     private static inline void _update_dconf_key_planned_value (string? cool_planned_value,
--                                                            ref Label   planned_value_label,
--                                                            ref Label   planned_value_default)
-+                                                                Label   planned_value_label,
-+                                                                Label   planned_value_default)
-     {
-         if (cool_planned_value == null)
--            update_labels_dconf_key_erased (ref planned_value_label, ref planned_value_default);
-+            update_labels_dconf_key_erased (planned_value_label, planned_value_default);
-         else
-             update_labels_dconf_key_values ((!) cool_planned_value,
--                                            ref planned_value_label, ref planned_value_default);
-+                                            planned_value_label, planned_value_default);
-     }
- 
-     /*\
-@@ -99,37 +99,37 @@ private class DelayedSettingView : OverlayedListRow
- 
-     internal void update_gsettings_key_current_value (Variant key_value, bool is_default)
-     {
--        _update_gsettings_key_current_value (key_value, is_default, ref key_value_label, ref key_value_default);
-+        _update_gsettings_key_current_value (key_value, is_default, key_value_label, key_value_default);
-     }
-     private static void _update_gsettings_key_current_value (Variant key_value,
-                                                              bool    is_default,
--                                                         ref Label   key_value_label,
--                                                         ref Label   key_value_default)
-+                                                             Label   key_value_label,
-+                                                             Label   key_value_default)
-     {
-         key_value_label.label = Key.cool_text_value_from_variant (key_value);
--        update_value_default_label (is_default, ref key_value_default);
-+        update_value_default_label (is_default, key_value_default);
-     }
- 
-     internal void update_dconf_key_current_value (Variant? key_value_or_null)
-     {
--        _update_dconf_key_current_value (key_value_or_null, ref key_value_label, ref key_value_default);
-+        _update_dconf_key_current_value (key_value_or_null, key_value_label, key_value_default);
-     }
-     private static void _update_dconf_key_current_value (Variant? key_value_or_null,
--                                                     ref Label    key_value_label,
--                                                     ref Label    key_value_default)
-+                                                         Label    key_value_label,
-+                                                         Label    key_value_default)
-     {
-         if (key_value_or_null == null)
--            update_labels_dconf_key_erased (ref key_value_label, ref key_value_default);
-+            update_labels_dconf_key_erased (key_value_label, key_value_default);
-         else
-             update_labels_dconf_key_values (Key.cool_text_value_from_variant ((!) key_value_or_null),
--                                            ref key_value_label, ref key_value_default);
-+                                            key_value_label, key_value_default);
-     }
- 
-     /*\
-     * * common utilities
-     \*/
- 
--    private static void update_labels_dconf_key_erased (ref Label value_label, ref Label value_default)
-+    private static void update_labels_dconf_key_erased (Label value_label, Label value_default)
-     {
-         value_label.visible = false;
-         /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for dconf keys */
-@@ -137,14 +137,14 @@ private class DelayedSettingView : OverlayedListRow
-         value_default.visible = true;
-     }
- 
--    private static void update_labels_dconf_key_values (string key_value, ref Label value_label, ref Label value_default)
-+    private static void update_labels_dconf_key_values (string key_value, Label value_label, Label value_default)
-     {
-         value_default.visible = false;
-         value_label.label = key_value;  // TODO move Key.cool_text_value_from_variant here?
-         value_label.visible = true;
-     }
- 
--    private static void update_value_default_label (bool is_default, ref Label value_default)
-+    private static void update_value_default_label (bool is_default, Label value_default)
-     {
-         if (is_default)
-             /* Translators: displayed in the list of pending changes (could be an in-window panel, or in the popover of the bottom bar); for gsettings keys */
-diff --git a/editor/overlayed-list.vala b/editor/overlayed-list.vala
-index 8b0ec51e..bcdfc3a0 100644
---- a/editor/overlayed-list.vala
-+++ b/editor/overlayed-list.vala
-@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
-     internal void set_window_size (AdaptativeWidget.WindowSize new_size)
-     {
-         if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
--            set_horizontal (ref main_context, ref edit_mode_box);
-+            set_horizontal (ref main_context, edit_mode_box);
-         else
--            set_vertical (ref main_context, ref edit_mode_box);
-+            set_vertical (ref main_context, edit_mode_box);
-     }
--    private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
-+    private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
-     {
-         main_context.remove_class ("vertical");
-         edit_mode_box.halign = Align.END;
-@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
-         edit_mode_box.width_request = 160;
-         main_context.add_class ("horizontal");
-     }
--    private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
-+    private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
-     {
-         main_context.remove_class ("horizontal");
-         edit_mode_box.halign = Align.CENTER;
-@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal bool next_match ()
-     {
--        return _next_match (ref main_list_box);
-+        return _next_match (main_list_box);
-     }
--    private static inline bool _next_match (ref ListBox main_list_box)
-+    private static inline bool _next_match (ListBox main_list_box)
-     {
-         ListBoxRow? row = main_list_box.get_selected_row ();    // TODO multiple rows and focus-only lists
-         if (row == null)
-@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-         if (row == null)
-         {
--            _scroll_bottom (ref main_list_box);
-+            _scroll_bottom (main_list_box);
-             return false;
-         }
-         main_list_box.select_row ((!) row);
-@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal bool previous_match ()
-     {
--        return _previous_match (ref main_list_box);
-+        return _previous_match (main_list_box);
-     }
--    private static inline bool _previous_match (ref ListBox main_list_box)
-+    private static inline bool _previous_match (ListBox main_list_box)
-     {
-         uint n_items = main_list_box.get_children ().length ();  // FIXME OverlayedList.n_items is unreliable
-         if (n_items == 0)
-@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     protected int [] get_selected_rows_indices ()
-     {
--        return _get_selected_rows_indices (ref main_list_box);
-+        return _get_selected_rows_indices (main_list_box);
-     }
--    private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
-+    private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
-     {
-         int [] indices = new int [0];
-         main_list_box.selected_foreach ((_list_box, selected_row) => {
-@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     protected void scroll_top ()
-     {
--        _scroll_top (ref main_list_box);
-+        _scroll_top (main_list_box);
-     }
--    private static inline void _scroll_top (ref ListBox main_list_box)
-+    private static inline void _scroll_top (ListBox main_list_box)
-     {
-         Adjustment adjustment = main_list_box.get_adjustment ();
-         adjustment.set_value (adjustment.get_lower ());
-@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     protected void scroll_bottom ()
-     {
--        _scroll_bottom (ref main_list_box);
-+        _scroll_bottom (main_list_box);
-     }
--    private static inline void _scroll_bottom (ref ListBox main_list_box)
-+    private static inline void _scroll_bottom (ListBox main_list_box)
-     {
-         Adjustment adjustment = main_list_box.get_adjustment ();
-         adjustment.set_value (adjustment.get_upper ());
-@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal bool handle_copy_text (out string copy_text)
-     {
--        return _handle_copy_text (out copy_text, ref main_list_box);
-+        return _handle_copy_text (out copy_text, main_list_box);
-     }
--    private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
-+    private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
-     {
-         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
-         OverlayedListRow row;
-@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
- 
-     internal SelectionState get_selection_state ()
-     {
--        return _get_selection_state (ref main_list_box, ref main_list_store);
-+        return _get_selection_state (main_list_box, ref main_list_store);
-     }
--    private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
-+    private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
-     {
-         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
-         uint n_selected_rows = selected_rows.length ();
-diff --git a/editor/pathentry.vala b/editor/pathentry.vala
-index 5000b21d..5c7efc56 100644
---- a/editor/pathentry.vala
-+++ b/editor/pathentry.vala
-@@ -133,9 +133,9 @@ private class PathEntry : Box, AdaptativeWidget
- 
-     internal void entry_grab_focus_without_selecting ()
-     {
--        _entry_grab_focus_without_selecting (ref search_entry);
-+        _entry_grab_focus_without_selecting (search_entry);
-     }
--    private static void _entry_grab_focus_without_selecting (ref BrowserEntry search_entry)
-+    private static void _entry_grab_focus_without_selecting (BrowserEntry search_entry)
-     {
-         if (search_entry.text_length != 0)
-         {
-@@ -172,36 +172,36 @@ private class PathEntry : Box, AdaptativeWidget
-         requires (search_changed_handler != 0)
-     {
-         SignalHandler.block (search_entry, search_changed_handler);
--        _prepare (mode, nullable_search, ref current_path, ref search_entry);
-+        _prepare (mode, nullable_search, ref current_path, search_entry);
-         SignalHandler.unblock (search_entry, search_changed_handler);
-     }
- 
-     private static inline void _prepare (SearchMode   mode,
-                                          string?      nullable_search,
-                                      ref string       current_path,
--                                     ref BrowserEntry search_entry)
-+                                         BrowserEntry search_entry)
-     {
-         string search;
-         switch (mode)
-         {
-             case SearchMode.EDIT_PATH_MOVE_END:
-                 search = nullable_search == null ? current_path : (!) nullable_search;
--                _prepare_move_end (ref search, ref search_entry);
-+                _prepare_move_end (ref search, search_entry);
-                 return;
- 
-             case SearchMode.EDIT_PATH_SELECT_ALL:
-                 search = nullable_search == null ? current_path : (!) nullable_search;
--                _prepare_search (ref search, ref search_entry);
-+                _prepare_search (ref search, search_entry);
-                 return;
- 
-             case SearchMode.EDIT_PATH_SELECT_LAST_WORD:
-                 search = current_path;
--                _prepare_select_last_word (ref search, ref search_entry);
-+                _prepare_select_last_word (ref search, search_entry);
-                 return;
- 
-             case SearchMode.SEARCH:
-                 search = "";
--                _prepare_search (ref search, ref search_entry);
-+                _prepare_search (ref search, search_entry);
-                 return;
- 
-             case SearchMode.UNCLEAR:
-@@ -210,19 +210,19 @@ private class PathEntry : Box, AdaptativeWidget
-         }
-     }
- 
--    private static inline void _prepare_move_end (ref string text, ref BrowserEntry search_entry)
-+    private static inline void _prepare_move_end (ref string text, BrowserEntry search_entry)
-     {
-         search_entry.text = text;
--        _entry_grab_focus_without_selecting (ref search_entry);
-+        _entry_grab_focus_without_selecting (search_entry);
-     }
- 
--    private static inline void _prepare_search (ref string text, ref BrowserEntry search_entry)
-+    private static inline void _prepare_search (ref string text, BrowserEntry search_entry)
-     {
-         search_entry.text = text;
-         search_entry.grab_focus ();
-     }
- 
--    private static inline void _prepare_select_last_word (ref string current_path, ref BrowserEntry search_entry)
-+    private static inline void _prepare_select_last_word (ref string current_path, BrowserEntry search_entry)
-     {
-         search_entry.move_cursor (MovementStep.DISPLAY_LINE_ENDS, -1, false);
-         search_entry.text = current_path;
-diff --git a/editor/registry-list.vala b/editor/registry-list.vala
-index 74b7f992..54aa6fa6 100644
---- a/editor/registry-list.vala
-+++ b/editor/registry-list.vala
-@@ -291,9 +291,9 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget
- 
-     internal bool handle_copy_text (out string copy_text) // can compile with "private", but is public 1/2
-     {
--        return _handle_copy_text (out copy_text, ref key_list_box);
-+        return _handle_copy_text (out copy_text, key_list_box);
-     }
--    private bool _handle_copy_text (out string copy_text, ref ListBox key_list_box)
-+    private bool _handle_copy_text (out string copy_text, ListBox key_list_box)
-     {
-         ListBoxRow? selected_row = (ListBoxRow?) key_list_box.get_selected_row ();
-         if (selected_row == null)
-@@ -1138,7 +1138,7 @@ private abstract class RegistryList : Grid, BrowsableView, AdaptativeWidget
-     * * headers
-     \*/
- 
--    protected static bool is_first_row (int row_index, ref unowned ListBoxRow? before)
-+    protected static bool is_first_row (int row_index, ListBoxRow? before)
-     {
-         bool is_first_row = row_index == 0;
-         if (is_first_row != (before == null))
-diff --git a/editor/registry-search.vala b/editor/registry-search.vala
-index 220583fd..eb8e6f2a 100644
---- a/editor/registry-search.vala
-+++ b/editor/registry-search.vala
-@@ -48,7 +48,7 @@ private class RegistrySearch : RegistryList
- 
-     internal bool handle_alt_copy_text (out string copy_text)
-     {
--        return _handle_alt_copy_text (out copy_text, ref key_list_box);
-+        return _handle_alt_copy_text (out copy_text, key_list_box);
-     }
- 
-     internal void clean ()
-@@ -145,7 +145,7 @@ private class RegistrySearch : RegistryList
-     * * Keyboard calls
-     \*/
- 
--    private static bool _handle_alt_copy_text (out string copy_text, ref ListBox key_list_box)
-+    private static bool _handle_alt_copy_text (out string copy_text, ListBox key_list_box)
-     {
-         ListBoxRow? selected_row = key_list_box.get_selected_row ();
-         if (selected_row == null)
-@@ -521,7 +521,7 @@ private class RegistrySearch : RegistryList
-     private void update_row_header (ListBoxRow row, ListBoxRow? before)
-     {
-         int row_index = row.get_index ();
--        if (is_first_row (row_index, ref before))
-+        if (is_first_row (row_index, before))
-             return;
- 
-         if (search_is_path_search)
-diff --git a/editor/registry-view.vala b/editor/registry-view.vala
-index e0ff379e..7d9eb1f0 100644
---- a/editor/registry-view.vala
-+++ b/editor/registry-view.vala
-@@ -114,7 +114,7 @@ private class RegistryView : RegistryList
- 
-     private void update_row_header (ListBoxRow row, ListBoxRow? before)
-     {
--        if (is_first_row (row.get_index (), ref before))
-+        if (is_first_row (row.get_index (), before))
-             return;
-         update_row_header_with_context (row, (!) before, modifications_handler.model, /* local search header */ false);
-     }
diff --git a/source/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild
index b8de929c..c0ad9a1c 100755
--- a/source/l/dconf/dconf.SlackBuild
+++ b/source/l/dconf/dconf.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dconf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/gcr/gcr.SlackBuild b/source/l/gcr/gcr.SlackBuild
index dd54ca8a..857116c7 100755
--- a/source/l/gcr/gcr.SlackBuild
+++ b/source/l/gcr/gcr.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gcr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
index b2c0d8d6..08bf9a8c 100755
--- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
+++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gdk-pixbuf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -94,7 +94,7 @@ meson setup \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --buildtype=release \
-  -Ddocs=true \
+  -Dgtk_doc=false \
   -Dgir=true \
   -Dx11=true \
   -Dinstalled_tests=false \
diff --git a/source/l/gjs/gjs.SlackBuild b/source/l/gjs/gjs.SlackBuild
index c4dca63e..3786e79d 100755
--- a/source/l/gjs/gjs.SlackBuild
+++ b/source/l/gjs/gjs.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gjs
-VERSION=${VERSION:-$(echo gjs-*.tar.lz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo gjs-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf gjs-$VERSION
-tar xvf $CWD/gjs-${VERSION}.tar.lz || exit 1
+tar xvf $CWD/gjs-${VERSION}.tar.?z || exit 1
 cd gjs-$VERSION
 
 # Make sure ownerships and permissions are sane:
diff --git a/source/l/gjs/gjs.url b/source/l/gjs/gjs.url
index 325e4b40..a007c92e 100644
--- a/source/l/gjs/gjs.url
+++ b/source/l/gjs/gjs.url
@@ -1 +1 @@
-https://ftp.gnome.org/pub/GNOME/sources/gjs/1.66/gjs-1.66.1.tar.xz
+https://ftp.gnome.org/pub/GNOME/sources/gjs
diff --git a/source/l/glib-networking/glib-networking.SlackBuild b/source/l/glib-networking/glib-networking.SlackBuild
index 58c4d26e..aac7b0b8 100755
--- a/source/l/glib-networking/glib-networking.SlackBuild
+++ b/source/l/glib-networking/glib-networking.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=glib-networking
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index 42910af4..ca7b1431 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=glib2
 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/gobject-introspection/gobject-introspection.SlackBuild b/source/l/gobject-introspection/gobject-introspection.SlackBuild
index aaf84951..9396474d 100755
--- a/source/l/gobject-introspection/gobject-introspection.SlackBuild
+++ b/source/l/gobject-introspection/gobject-introspection.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gobject-introspection
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild
index 7676253c..199ebdbf 100755
--- a/source/l/gvfs/gvfs.SlackBuild
+++ b/source/l/gvfs/gvfs.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gvfs
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/netpbm/netpbm-pamtojpeg2k.patch b/source/l/netpbm/netpbm-pamtojpeg2k.patch
deleted file mode 100644
index 7eeed542..00000000
--- a/source/l/netpbm/netpbm-pamtojpeg2k.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff --git a/converter/other/jpeg2000/pamtojpeg2k.c b/converter/other/jpeg2000/pamtojpeg2k.c
-index 4d73316..a53573f 100644
---- a/converter/other/jpeg2000/pamtojpeg2k.c
-+++ b/converter/other/jpeg2000/pamtojpeg2k.c
-@@ -98,7 +98,7 @@ parseCommandLine(int argc, char ** argv,
-     char * modeOpt;
- 
-     unsigned int option_def_index;
--
-+    
-     MALLOCARRAY_NOFAIL(option_def, 100);
- 
-     option_def_index = 0;   /* incremented by OPTENTRY */
-@@ -134,25 +134,25 @@ parseCommandLine(int argc, char ** argv,
-             &numrlvlsSpec,       0);
-     OPTENT3(0, "numgbits",     OPT_UINT,   &cmdlineP->numgbits,
-             &numgbitsSpec,       0);
--    OPTENT3(0, "nomct",        OPT_FLAG,   NULL,
-+    OPTENT3(0, "nomct",        OPT_FLAG,   NULL, 
-             &cmdlineP->nomct,    0);
--    OPTENT3(0, "sop",          OPT_FLAG,   NULL,
-+    OPTENT3(0, "sop",          OPT_FLAG,   NULL, 
-             &cmdlineP->sop,      0);
--    OPTENT3(0, "eph",          OPT_FLAG,   NULL,
-+    OPTENT3(0, "eph",          OPT_FLAG,   NULL, 
-             &cmdlineP->eph,      0);
--    OPTENT3(0, "lazy",         OPT_FLAG,   NULL,
-+    OPTENT3(0, "lazy",         OPT_FLAG,   NULL, 
-             &cmdlineP->lazy,     0);
--    OPTENT3(0, "termall",      OPT_FLAG,   NULL,
-+    OPTENT3(0, "termall",      OPT_FLAG,   NULL, 
-             &cmdlineP->termall,  0);
--    OPTENT3(0, "segsym",       OPT_FLAG,   NULL,
-+    OPTENT3(0, "segsym",       OPT_FLAG,   NULL, 
-             &cmdlineP->segsym,    0);
--    OPTENT3(0, "vcausal",      OPT_FLAG,   NULL,
-+    OPTENT3(0, "vcausal",      OPT_FLAG,   NULL, 
-             &cmdlineP->vcausal,   0);
--    OPTENT3(0, "pterm",        OPT_FLAG,   NULL,
-+    OPTENT3(0, "pterm",        OPT_FLAG,   NULL, 
-             &cmdlineP->pterm,     0);
--    OPTENT3(0, "resetprob",    OPT_FLAG,   NULL,
-+    OPTENT3(0, "resetprob",    OPT_FLAG,   NULL, 
-             &cmdlineP->resetprob, 0);
--    OPTENT3(0, "verbose",      OPT_FLAG,   NULL,
-+    OPTENT3(0, "verbose",      OPT_FLAG,   NULL, 
-             &cmdlineP->verbose,   0);
-     OPTENT3(0, "debuglevel",   OPT_UINT,   &cmdlineP->debuglevel,
-             &debuglevelSpec,      0);
-@@ -223,7 +223,7 @@ parseCommandLine(int argc, char ** argv,
-         cmdlineP->inputFilename = strdup("-");  /* he wants stdin */
-     else if (argc - 1 == 1)
-         cmdlineP->inputFilename = strdup(argv[1]);
--    else
-+    else 
-         pm_error("Too many arguments.  The only argument accepted\n"
-                  "is the input file specification");
- 
-@@ -232,7 +232,7 @@ parseCommandLine(int argc, char ** argv,
- 
- 
- static void
--createJasperRaster(struct pam *  const inpamP,
-+createJasperRaster(struct pam *  const inpamP, 
-                    jas_image_t * const jasperP) {
- /*----------------------------------------------------------------------------
-    Create the raster in the *jasperP object, reading the raster from the
-@@ -254,7 +254,7 @@ createJasperRaster(struct pam *  const inpamP,
-         if (matrix[plane] == NULL)
-             pm_error("Unable to create matrix for plane %u.  "
-                      "jas_matrix_create() failed.", plane);
--    }
-+    }   
-     tuplerow = pnm_allocpamrow(inpamP);
- 
-     jasperMaxval = pm_bitstomaxval(pm_maxvaltobits(inpamP->maxval));
-@@ -271,7 +271,7 @@ createJasperRaster(struct pam *  const inpamP,
-                 unsigned int jasperSample;
- 
-                 if (oddMaxval)
--                    jasperSample = tuplerow[col][plane] *
-+                    jasperSample = tuplerow[col][plane] * 
-                         jasperMaxval / inpamP->maxval;
-                 else
-                     jasperSample = tuplerow[col][plane];
-@@ -279,16 +279,16 @@ createJasperRaster(struct pam *  const inpamP,
-                 jas_matrix_set(matrix[plane], 0, col, jasperSample);
-             }
-         }
--        {
-+        { 
-             unsigned int plane;
- 
-             for (plane = 0; plane < inpamP->depth; ++plane) {
-                 int rc;
--                rc = jas_image_writecmpt(jasperP, plane, 0, row,
-+                rc = jas_image_writecmpt(jasperP, plane, 0, row, 
-                                          inpamP->width, 1,
-                                          matrix[plane]);
-                 if (rc != 0)
--                    pm_error("jas_image_writecmpt() of plane %u failed.",
-+                    pm_error("jas_image_writecmpt() of plane %u failed.", 
-                              plane);
-             }
-         }
-@@ -297,14 +297,14 @@ createJasperRaster(struct pam *  const inpamP,
-     pnm_freepamrow(tuplerow);
-     for (plane = 0; plane < inpamP->depth; ++plane)
-         jas_matrix_destroy(matrix[plane]);
--
-+    
-     free(matrix);
- }
- 
- 
- 
- static void
--createJasperImage(struct pam *   const inpamP,
-+createJasperImage(struct pam *   const inpamP, 
-                   jas_image_t ** const jasperPP) {
- 
- 	jas_image_cmptparm_t * cmptparms;
-@@ -322,7 +322,7 @@ createJasperImage(struct pam *   const inpamP,
-         cmptparms[plane].prec = pm_maxvaltobits(inpamP->maxval);
-         cmptparms[plane].sgnd = 0;
-     }
--    *jasperPP =
-+    *jasperPP = 
-         jas_image_create(inpamP->depth, cmptparms, JAS_CLRSPC_UNKNOWN);
-     if (*jasperPP == NULL)
-         pm_error("Unable to create jasper image structure.  "
-@@ -371,7 +371,7 @@ convertToJasperImage(struct pam *   const inpamP,
- 
- 
- static void
--writeJpc(jas_image_t *      const jasperP,
-+writeJpc(jas_image_t *      const jasperP, 
-          struct cmdlineInfo const cmdline,
-          FILE *             const ofP) {
- 
-@@ -383,8 +383,8 @@ writeJpc(jas_image_t *      const jasperP,
- 
-     /* Note: ilyrrates is a hack because we're too lazy to properly parse
-        command line options to get the information and then compose
--       a proper input to Jasper.  So the user can screw things up by
--       specifying garbage for the -ilyrrates option
-+       a proper input to Jasper.  So the user can screw things up by 
-+       specifying garbage for the -ilyrrates option 
-     */
-     if (strlen(cmdline.ilyrrates) > 0)
-         pm_asprintf(&ilyrratesOpt, "ilyrrates=%s", cmdline.ilyrrates);
-@@ -410,7 +410,7 @@ writeJpc(jas_image_t *      const jasperP,
-         */
-         rateOpt[0] = '\0';
-     }
--    pm_asprintf(&options,
-+    pm_asprintf(&options, 
-                 "imgareatlx=%u "
-                 "imgareatly=%u "
-                 "tilegrdtlx=%u "
-@@ -428,7 +428,7 @@ writeJpc(jas_image_t *      const jasperP,
-                 "numrlvls=%u "
-                 "numgbits=%u "
-                 "%s %s %s %s %s %s %s %s %s",
--
-+                
-                 cmdline.imgareatlx,
-                 cmdline.imgareatly,
-                 cmdline.tilegrdtlx,
-@@ -471,8 +471,8 @@ writeJpc(jas_image_t *      const jasperP,
-             pm_message("Using Jasper to encode to 'jpc' format with options "
-                        "'%s'", options);
- 
--        rc = jas_image_encode(jasperP, outStreamP,
--                              jas_image_strtofmt((char*)"jpc"),
-+        rc = jas_image_encode(jasperP, outStreamP, 
-+                              jas_image_strtofmt((char*)"jpc"), 
-                               (char *)options);
-         if (rc != 0)
-             pm_error("jas_image_encode() failed to encode the JPEG 2000 "
-@@ -484,11 +484,11 @@ writeJpc(jas_image_t *      const jasperP,
-         int rc;
- 
-         rc = jas_stream_close(outStreamP);
--
-+            
-         if (rc != 0)
-             pm_error("Failed to close output stream, "
-                      "jas_stream_close() rc = %d", rc);
--    }
-+    }                     
- 
- 	jas_image_clearfmts();
- 
-@@ -506,33 +506,31 @@ main(int argc, char **argv)
-     jas_image_t * jasperP;
- 
-     pnm_init(&argc, argv);
--
-+    
-     parseCommandLine(argc, argv, &cmdline);
--
--    {
-+    
-+    { 
-         int rc;
--
-+        
-         rc = jas_init();
-         if ( rc != 0 )
-             pm_error("Failed to initialize Jasper library.  "
-                      "jas_init() returns rc %d", rc );
-     }
--
-+    
-     jas_setdbglevel(cmdline.debuglevel);
--
-+    
-     ifP = pm_openr(cmdline.inputFilename);
--
-+    
-     pnm_readpaminit(ifP, &inpam, PAM_STRUCT_SIZE(tuple_type));
--
-+    
-     convertToJasperImage(&inpam, &jasperP);
--
-+    
-     writeJpc(jasperP, cmdline, stdout);
--
-+    
- 	jas_image_destroy(jasperP);
- 
-     pm_close(ifP);
- 
--    pm_close(stdout);
--
-     return 0;
- }
diff --git a/source/l/netpbm/netpbm.SlackBuild b/source/l/netpbm/netpbm.SlackBuild
index 9bce529c..fd7fb444 100755
--- a/source/l/netpbm/netpbm.SlackBuild
+++ b/source/l/netpbm/netpbm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2015, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -85,7 +85,6 @@ zcat $CWD/netpbm-multilib.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/netpbm-glibc.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/netpbm-docfix.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/netpbm-cmuwtopbm.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/netpbm-pamtojpeg2k.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/netpbm-manfix.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/netpbm-manual-pages.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/netpbm-libdir-so.patch.gz | patch -p1 --verbose || exit 1
diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild
index a8ca327e..40b5aa99 100755
--- a/source/l/vte/vte.SlackBuild
+++ b/source/l/vte/vte.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=vte
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -67,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index 130e835d..0c08d89f 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=curl
 VERSION=${VERSION:-$(echo curl-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index b16b62a0..c854d342 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gimp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild
index b5ea0a4f..546dc904 100755
--- a/source/xap/seamonkey/seamonkey.SlackBuild
+++ b/source/xap/seamonkey/seamonkey.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=seamonkey
 TARBALLVER=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)}
 # Strip the end from beta versions:
 VERSION=$(echo $TARBALLVER | cut -f 1 -d b)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then