From 9b906307deaeeb6ceef5d5c11abdc1f0770dca02 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 17 Oct 2022 00:42:43 +0000
Subject: Mon Oct 17 00:42:43 UTC 2022

a/gettext-0.21.1-x86_64-1.txz:  Upgraded.
a/glibc-zoneinfo-2022e-noarch-1.txz:  Upgraded.
  This package provides the latest timezone updates.
d/gettext-tools-0.21.1-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.0_51-x86_64-1.txz:  Upgraded.
---
 source/a/FTBFSlog                         |  3 +++
 source/a/f2fs-tools/f2fs-tools.SlackBuild |  4 +++-
 source/a/f2fs-tools/f2fs.ftbfs.diff       | 17 +++++++++++++++++
 source/a/gettext/gettext-tools.SlackBuild |  4 ++--
 source/a/gettext/gettext.SlackBuild       |  4 ++--
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 source/a/f2fs-tools/f2fs.ftbfs.diff

(limited to 'source/a')

diff --git a/source/a/FTBFSlog b/source/a/FTBFSlog
index 859555ed5..fe0ad8dc4 100644
--- a/source/a/FTBFSlog
+++ b/source/a/FTBFSlog
@@ -1,3 +1,6 @@
+Sun Oct 16 18:39:12 UTC 2022
+  f2fs-tools: patch to build with newer lz4. Thanks to nobodino.
++--------------------------+
 Mon Feb  7 20:57:55 UTC 2022
   All packages tested and found to compile properly.
 +--------------------------+
diff --git a/source/a/f2fs-tools/f2fs-tools.SlackBuild b/source/a/f2fs-tools/f2fs-tools.SlackBuild
index def4c4512..2587f8f3c 100755
--- a/source/a/f2fs-tools/f2fs-tools.SlackBuild
+++ b/source/a/f2fs-tools/f2fs-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2018, 2022  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -85,6 +85,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+zcat $CWD/f2fs.ftbfs.diff.gz | patch -p1 --verbose || exit 1
+
 NOCONFIGURE=1 sh ./autogen.sh
 
 # Configure, build, and install:
diff --git a/source/a/f2fs-tools/f2fs.ftbfs.diff b/source/a/f2fs-tools/f2fs.ftbfs.diff
new file mode 100644
index 000000000..b628e962e
--- /dev/null
+++ b/source/a/f2fs-tools/f2fs.ftbfs.diff
@@ -0,0 +1,17 @@
+diff -aurN f2fs-tools-1.15.0/fsck/compress.c f2fs-tools-1.15.0-mod/fsck/compress.c
+--- f2fs-tools-1.15.0/fsck/compress.c	2022-05-13 19:50:41.000000000 +0200
++++ f2fs-tools-1.15.0-mod/fsck/compress.c	2022-08-19 12:15:48.037589094 +0200
+@@ -32,10 +32,10 @@
+ #ifdef HAVE_LIBLZ4
+ #define LZ4_MEMORY_USAGE		14
+ #define LZ4_MAX_INPUT_SIZE		0x7E000000 /* 2 113 929 216 bytes */
+-#ifndef LZ4_STREAMSIZE
+-#define LZ4_STREAMSIZE			(LZ4_STREAMSIZE_U64 * sizeof(long long))
++#ifndef LZ4_STREAM_MINSIZE
++#define LZ4_STREAM_MINSIZE  ((1UL << LZ4_MEMORY_USAGE) + 32)  /* static size, for inter-version compatibility */
+ #endif
+-#define LZ4_MEM_COMPRESS		LZ4_STREAMSIZE
++#define LZ4_MEM_COMPRESS               LZ4_STREAM_MINSIZE 
+ #define LZ4_ACCELERATION_DEFAULT	1
+ #define LZ4_WORK_SIZE			ALIGN_UP(LZ4_MEM_COMPRESS, 8)
+ #endif
diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild
index 8cda0d009..977004639 100755
--- a/source/a/gettext/gettext-tools.SlackBuild
+++ b/source/a/gettext/gettext-tools.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gettext-tools
-VERSION=0.21
-BUILD=${BUILD:-3}
+VERSION=0.21.1
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild
index 6cd772780..deaae7654 100755
--- a/source/a/gettext/gettext.SlackBuild
+++ b/source/a/gettext/gettext.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gettext
-VERSION=0.21
-BUILD=${BUILD:-3}
+VERSION=0.21.1
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
-- 
cgit v1.2.3-65-gdbad