summaryrefslogtreecommitdiffstats
path: root/source/a/libblockdev
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-06 22:01:59 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-07 08:59:49 +0200
commit06a5fa6da374cc3dafd95295c5e7448f1cea9f88 (patch)
tree7d02c04eea3d5e5f844606e50be1e2518d4be33f /source/a/libblockdev
parent928db52b4905b2f48ad28d9965f859ef8247ad3e (diff)
downloadcurrent-06a5fa6da374cc3dafd95295c5e7448f1cea9f88.tar.gz
current-06a5fa6da374cc3dafd95295c5e7448f1cea9f88.tar.xz
Tue Apr 6 22:01:59 UTC 202120210406220159
a/sysvinit-scripts-2.1-noarch-41.txz: Rebuilt. rc.S: don't clear /var/run. Thanks to upnort. kde/digikam-7.2.0-x86_64-2.txz: Rebuilt. Recompiled against opencv-4.5.2 (apparently the ABI changed). Thanks to etienne.
Diffstat (limited to 'source/a/libblockdev')
-rwxr-xr-xsource/a/libblockdev/libblockdev.SlackBuild3
-rw-r--r--source/a/libblockdev/libblockdev.glib-2.68.0.diff11
2 files changed, 14 insertions, 0 deletions
diff --git a/source/a/libblockdev/libblockdev.SlackBuild b/source/a/libblockdev/libblockdev.SlackBuild
index 812f29226..ccf0cc0fa 100755
--- a/source/a/libblockdev/libblockdev.SlackBuild
+++ b/source/a/libblockdev/libblockdev.SlackBuild
@@ -79,6 +79,9 @@ 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
new file mode 100644
index 000000000..029f70fb2
--- /dev/null
+++ b/source/a/libblockdev/libblockdev.glib-2.68.0.diff
@@ -0,0 +1,11 @@
+--- ./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));
+ }
+
+