[PR PATCH] brotli: add backport patch to address issue google/brotli#836

[PR PATCH] brotli: add backport patch to address issue google/brotli#836

[circhioz]

[-- Attachment #1: Type: text/plain, Size: 638 bytes --]

There is a new pull request by circhioz against master on the void-packages repository

https://github.com/circhioz/void-packages brotli
https://github.com/void-linux/void-packages/pull/24950

brotli: add backport patch to address issue google/brotli#836
`brotli` has a fairly bad regression, breaking builds that depend on `brotli` and `pkg-config` (for example `libsoup` as I mentioned in #24260).

There's already a fix on master, which is where this patch came from, so this patch can be discarded whenever `brotli` does their next release.

A patch file from https://github.com/void-linux/void-packages/pull/24950.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-brotli-24950.patch --]
[-- Type: text/x-diff, Size: 3391 bytes --]

From c148548de7eea986775f1126d758b92d0ff62da1 Mon Sep 17 00:00:00 2001
From: Francesco Circhetta <francesco.circhetta@gmail.com>
Date: Wed, 16 Sep 2020 23:31:47 +0200
Subject: [PATCH] brotli: add backport patch to address issue google/brotli#836

---
 ...time-linker-path-to-pkg-config-files.patch | 47 +++++++++++++++++++
 srcpkgs/brotli/template                       |  3 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/brotli/patches/Revert-Add-runtime-linker-path-to-pkg-config-files.patch

diff --git a/srcpkgs/brotli/patches/Revert-Add-runtime-linker-path-to-pkg-config-files.patch b/srcpkgs/brotli/patches/Revert-Add-runtime-linker-path-to-pkg-config-files.patch
new file mode 100644
index 00000000000..8ecf2e4c9b9
--- /dev/null
+++ b/srcpkgs/brotli/patches/Revert-Add-runtime-linker-path-to-pkg-config-files.patch
@@ -0,0 +1,47 @@
+From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
+From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
+Date: Wed, 2 Sep 2020 10:49:49 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in    | 2 +-
+ scripts/libbrotlienc.pc.in    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969e..2a8cf7a3 100644
+--- a/scripts/libbrotlicommon.pc.in
++++ b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ 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 --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124f..6f8ef2e4 100644
+--- a/scripts/libbrotlidec.pc.in
++++ b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ 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 --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811b..2098afe2 100644
+--- a/scripts/libbrotlienc.pc.in
++++ b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ 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}
diff --git a/srcpkgs/brotli/template b/srcpkgs/brotli/template
index 9d59beba7ed..12b80d767fd 100644
--- a/srcpkgs/brotli/template
+++ b/srcpkgs/brotli/template
@@ -1,7 +1,7 @@
 # Template file for 'brotli'
 pkgname=brotli
 version=1.0.9
-revision=1
+revision=2
 build_style=cmake
 short_desc="Generic-purpose lossless compression algorithm"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,6 +9,7 @@ license="MIT"
 homepage="https://github.com/google/brotli"
 distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz"
 checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+patch_args="-p1"
 
 post_install() {
 	vlicense LICENSE

Re: [PR PATCH] [Merged]: brotli: add backport patch to address issue google/brotli#836

[q66]

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

There's a merged pull request on the void-packages repository

brotli: add backport patch to address issue google/brotli#836
https://github.com/void-linux/void-packages/pull/24950

Description:
`brotli` has a fairly bad regression, breaking builds that depend on `brotli` and `pkg-config` (for example `libsoup` as I mentioned in #24260).

There's already a fix on master, which is where this patch came from, so this patch can be discarded whenever `brotli` does their next release.