From 47d3fa61a8f953c0c641fea704bd330742c6af7a Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 28 Jul 2021 22:48:44 +0000
Subject: Wed Jul 28 22:48:44 UTC 2021

a/e2fsprogs-1.46.3-x86_64-1.txz:  Upgraded.
a/kernel-generic-5.13.6-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.13.6-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.13.6-x86_64-1.txz:  Upgraded.
a/libblockdev-2.26-x86_64-1.txz:  Upgraded.
ap/vim-8.2.3238-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.13.6-x86-1.txz:  Upgraded.
k/kernel-source-5.13.6-noarch-1.txz:  Upgraded.
l/libgnt-2.14.2-x86_64-1.txz:  Upgraded.
l/pulseaudio-15.0-x86_64-1.txz:  Upgraded.
n/ipset-7.14-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.3238-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/a/libblockdev/libblockdev.SlackBuild       |  5 +----
 source/a/libblockdev/libblockdev.glib-2.68.0.diff | 11 -----------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 source/a/libblockdev/libblockdev.glib-2.68.0.diff

(limited to 'source/a')

diff --git a/source/a/libblockdev/libblockdev.SlackBuild b/source/a/libblockdev/libblockdev.SlackBuild
index ccf0cc0fa..5f815f1d8 100755
--- a/source/a/libblockdev/libblockdev.SlackBuild
+++ b/source/a/libblockdev/libblockdev.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libblockdev
 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
@@ -79,9 +79,6 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-# Fix build with glib-2.68.0:
-zcat $CWD/libblockdev.glib-2.68.0.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/a/libblockdev/libblockdev.glib-2.68.0.diff b/source/a/libblockdev/libblockdev.glib-2.68.0.diff
deleted file mode 100644
index 029f70fb2..000000000
--- a/source/a/libblockdev/libblockdev.glib-2.68.0.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/plugins/vdo.c.orig	2021-01-11 04:48:35.000000000 -0600
-+++ ./src/plugins/vdo.c	2021-04-06 12:57:27.128009876 -0500
-@@ -81,7 +81,7 @@
- }
- 
- BDVDOStats* bd_vdo_stats_copy (BDVDOStats *stats) {
--    return g_memdup (stats, sizeof (BDVDOStats));
-+    return g_memdup2 (stats, sizeof (BDVDOStats));
- }
- 
- 
-- 
cgit v1.2.3