70 lines
2.4 KiB
Plaintext
70 lines
2.4 KiB
Plaintext
From 6c76022bdd932a046d38bf4e4936d02a95d48466 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 Oct 2020 17:31:53 +0200
|
|
Subject: fix pkgconfig scripts regression
|
|
|
|
|
|
diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
|
|
index 10ca969..2a8cf7a 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 e7c3124..6f8ef2e 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 4dd0811..2098afe 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}
|
|
--
|
|
2.28.0
|
|
|
|
|
|
From 7741f18ea2f7baac29f67d421ce9dfb88be27a22 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 20 Oct 2020 16:56:04 +0200
|
|
Subject: c89 fix
|
|
|
|
|
|
diff --git a/c/tools/brotli.c b/c/tools/brotli.c
|
|
index 7c678d3..c4efc43 100644
|
|
--- a/c/tools/brotli.c
|
|
+++ b/c/tools/brotli.c
|
|
@@ -889,8 +889,9 @@ static BROTLI_BOOL DecompressFile(Context* context, BrotliDecoderState* s) {
|
|
} else if (result == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
|
|
if (!ProvideOutput(context)) return BROTLI_FALSE;
|
|
} else if (result == BROTLI_DECODER_RESULT_SUCCESS) {
|
|
+ int has_more_input;
|
|
if (!FlushOutput(context)) return BROTLI_FALSE;
|
|
- int has_more_input =
|
|
+ has_more_input =
|
|
(context->available_in != 0) || (fgetc(context->fin) != EOF);
|
|
if (has_more_input) {
|
|
fprintf(stderr, "corrupt input [%s]\n",
|
|
--
|
|
2.28.0
|
|
|