Mon Feb 21 20:21:38 UTC 202220220221202138

a/aaa_glibc-solibs-2.35-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20220218_c53073d-noarch-1.txz:  Upgraded.
ap/flac-1.3.4-x86_64-1.txz:  Upgraded.
  This update fixes overflow issues with encoding and decoding.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0499
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0561
  (* Security fix *)
ap/ksh93-1.0_20220219_bc6c5dbd-x86_64-1.txz:  Upgraded.
ap/mariadb-10.6.7-x86_64-2.txz:  Rebuilt.
  Removed dangling symlink.
ap/vim-8.2.4428-x86_64-1.txz:  Upgraded.
  Patched ctags for glibc-2.35. Thanks to nobodino.
d/autoconf-2.71-noarch-1.txz:  Upgraded.
d/automake-1.16.5-noarch-1.txz:  Upgraded.
d/binutils-2.38-x86_64-2.txz:  Rebuilt.
  Fixed the SlackBuild to not run autoconf in the libiberty and intl
  subdirectories. It doesn't work with the latest autoconf, and there
  doesn't seem to be any need for it anyway.
d/cmake-3.22.2-x86_64-1.txz:  Upgraded.
d/meson-0.61.2-x86_64-1.txz:  Upgraded.
d/rcs-5.10.0-x86_64-4.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
d/scons-4.3.0-x86_64-1.txz:  Upgraded.
e/emacs-27.2-x86_64-2.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
kde/digikam-7.5.0-x86_64-2.txz:  Rebuilt.
  Recompiled against jasper-3.0.2.
kde/wacomtablet-20220124_dd28b27-x86_64-1.txz:  Upgraded.
l/LibRaw-0.20.2-x86_64-4.txz:  Rebuilt.
  Recompiled against jasper-3.0.2.
l/accountsservice-22.07.5-x86_64-1.txz:  Upgraded.
l/dconf-editor-3.38.3-x86_64-2.txz:  Rebuilt.
  Fixed build errors with meson.
l/expat-2.4.6-x86_64-1.txz:  Upgraded.
l/fuse-2.9.9-x86_64-4.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
l/gcr-3.40.0-x86_64-2.txz:  Rebuilt.
  Fixed build errors with meson.
l/gdk-pixbuf2-2.42.6-x86_64-2.txz:  Rebuilt.
  Fixed meson options.
l/gdk-pixbuf2-xlib-2.40.2-x86_64-4.txz:  Rebuilt.
  Fixed meson options.
l/gegl-0.4.34-x86_64-3.txz:  Rebuilt.
  Recompiled against jasper-3.0.2.
l/glade-3.38.2-x86_64-6.txz:  Rebuilt.
  Fixed build errors with meson.
  Removed duplicated 'da' from help/LINGUAS.
l/glibc-2.35-x86_64-1.txz:  Upgraded.
l/glibc-i18n-2.35-x86_64-1.txz:  Upgraded.
l/glibc-profile-2.35-x86_64-1.txz:  Upgraded.
l/gobject-introspection-1.71.0-x86_64-1.txz:  Upgraded.
  This update was needed to solve failing tests with the new meson.
l/gtk+2-2.24.33-x86_64-3.txz:  Rebuilt.
  Changed build/host to $ARCH-slackware-linux-gnu.
l/gtk4-4.4.1-x86_64-2.txz:  Rebuilt.
  Fixed meson options.
l/gvfs-1.48.1-x86_64-2.txz:  Rebuilt.
  Fixed build errors with meson.
l/imagemagick-7.1.0_26-x86_64-1.txz:  Upgraded.
l/jasper-3.0.2-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/json-glib-1.6.6-x86_64-2.txz:  Rebuilt.
  Fixed meson options.
l/libsecret-0.20.5-x86_64-1.txz:  Upgraded.
l/netpbm-10.97.04-x86_64-1.txz:  Upgraded.
l/qt5-5.15.3_20211130_014c375b-x86_64-3.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
  Recompiled against jasper-3.0.2.
l/shared-mime-info-2.1-x86_64-4.txz:  Rebuilt.
  Fixed build errors with meson.
n/gpgme-1.17.0-x86_64-1.txz:  Upgraded.
n/ntp-4.2.8p15-x86_64-9.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
x/libinput-1.19.3-x86_64-2.txz:  Rebuilt.
  Recompiled against libwacom-2.1.0.
x/libva-2.14.0-x86_64-1.txz:  Upgraded.
x/libva-utils-2.14.0-x86_64-1.txz:  Upgraded.
x/libwacom-2.1.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
x/motif-2.3.8-x86_64-6.txz:  Rebuilt.
  Fixed build with LEXLIB="-lfl".
x/vulkan-sdk-1.2.176.1-x86_64-3.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
x/xf86-input-wacom-1.0.0-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.24.0-x86_64-3.txz:  Rebuilt.
  Fixed build errors with meson.
xap/vim-gvim-8.2.4428-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

3 files changed, 33 insertions, 5 deletions

diff --git a/source/l/glade/glade.SlackBuild b/source/l/glade/glade.SlackBuild
index 4f6a0a73e..2cb458c54 100755
--- a/source/l/glade/glade.SlackBuild
+++ b/source/l/glade/glade.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Slackware build script for glade
-
 # Copyright 2011, 2020  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2022  Patrick J. Volkerding, Sebeka, MN, USA
+# 
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=glade
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -79,8 +79,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# Well, this is dumb:
-sed -i "s,python-3.8-embed,python-3.9-embed," meson.build
+zcat $CWD/glade.ftbfs.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/glade.remove.extra.da.from.LINGUAS.diff.gz | patch -p1 --verbose || exit 1
 
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
@@ -100,6 +100,7 @@ meson setup \
   --localstatedir=/var \
   --buildtype=release \
   -Dgladeui=true \
+  -Dgtk_doc=false \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG $NINJA install || exit 1
diff --git a/source/l/glade/glade.ftbfs.diff b/source/l/glade/glade.ftbfs.diff
new file mode 100644
index 000000000..d9516925d
--- /dev/null
+++ b/source/l/glade/glade.ftbfs.diff
@@ -0,0 +1,18 @@
+--- ./data/meson.build.orig	2020-11-20 15:02:11.854337200 -0600
++++ ./data/meson.build	2022-02-16 13:40:12.980091649 -0600
+@@ -2,7 +2,6 @@
+ desktop_conf.set('VERSION', glade_version)
+ 
+ i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@
+ appdata = glade_name + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Glade.appdata.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
diff --git a/source/l/glade/glade.remove.extra.da.from.LINGUAS.diff b/source/l/glade/glade.remove.extra.da.from.LINGUAS.diff
new file mode 100644
index 000000000..e9679abeb
--- /dev/null
+++ b/source/l/glade/glade.remove.extra.da.from.LINGUAS.diff
@@ -0,0 +1,9 @@
+--- ./help/LINGUAS.orig	2020-11-20 15:02:11.862337000 -0600
++++ ./help/LINGUAS	2022-02-16 13:50:32.440105506 -0600
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs