summaryrefslogtreecommitdiffstats
path: root/source/l/brotli
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/brotli')
-rwxr-xr-xsource/l/brotli/brotli.SlackBuild7
-rw-r--r--source/l/brotli/brotli.no.unrecognized.R.diff32
2 files changed, 2 insertions, 37 deletions
diff --git a/source/l/brotli/brotli.SlackBuild b/source/l/brotli/brotli.SlackBuild
index 051f0d5cb..9bce33362 100755
--- a/source/l/brotli/brotli.SlackBuild
+++ b/source/l/brotli/brotli.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2019 Eric Hameleers, Eindhoven, NL
-# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=brotli
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -86,9 +86,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Remove -R that is not accepted by the C compiler:
-zcat $CWD/brotli.no.unrecognized.R.diff.gz | patch -p1 --verbose || exit 1
-
# Configure, build, and install:
mkdir cmake-build
cd cmake-build
diff --git a/source/l/brotli/brotli.no.unrecognized.R.diff b/source/l/brotli/brotli.no.unrecognized.R.diff
deleted file mode 100644
index 3d2835a68..000000000
--- a/source/l/brotli/brotli.no.unrecognized.R.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u -r --new-file brotli-1.0.9.orig/scripts/libbrotlicommon.pc.in brotli-1.0.9/scripts/libbrotlicommon.pc.in
---- brotli-1.0.9.orig/scripts/libbrotlicommon.pc.in 2020-08-27 09:12:55.000000000 -0500
-+++ brotli-1.0.9/scripts/libbrotlicommon.pc.in 2020-11-26 14:45:56.933004919 -0600
-@@ -7,5 +7,5 @@
- URL: https://github.com/google/brotli
- Description: Brotli common dictionary library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlicommon
-+Libs: -L${libdir} -lbrotlicommon
- Cflags: -I${includedir}
-diff -u -r --new-file brotli-1.0.9.orig/scripts/libbrotlidec.pc.in brotli-1.0.9/scripts/libbrotlidec.pc.in
---- brotli-1.0.9.orig/scripts/libbrotlidec.pc.in 2020-08-27 09:12:55.000000000 -0500
-+++ brotli-1.0.9/scripts/libbrotlidec.pc.in 2020-11-26 14:45:56.933004919 -0600
-@@ -7,6 +7,6 @@
- URL: https://github.com/google/brotli
- Description: Brotli decoder library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlidec
-+Libs: -L${libdir} -lbrotlidec
- Requires.private: libbrotlicommon >= 1.0.2
- Cflags: -I${includedir}
-diff -u -r --new-file brotli-1.0.9.orig/scripts/libbrotlienc.pc.in brotli-1.0.9/scripts/libbrotlienc.pc.in
---- brotli-1.0.9.orig/scripts/libbrotlienc.pc.in 2020-08-27 09:12:55.000000000 -0500
-+++ brotli-1.0.9/scripts/libbrotlienc.pc.in 2020-11-26 14:45:56.933004919 -0600
-@@ -7,6 +7,6 @@
- URL: https://github.com/google/brotli
- Description: Brotli encoder library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlienc
-+Libs: -L${libdir} -lbrotlienc
- Requires.private: libbrotlicommon >= 1.0.2
- Cflags: -I${includedir}