summaryrefslogtreecommitdiffstats
path: root/src/libarchive-1-fixes.patch
blob: 8d9423ef26266d37d4c7f76ec7be7c36e1bd1cd2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
This file is part of MXE. See LICENSE.md for licensing information.

Contains ad hoc patches for cross building.

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Tue, 14 Feb 2012 12:40:24 +0100
Subject: [PATCH] fix pkg-config


diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in
index 1111111..2222222 100644
--- a/build/pkgconfig/libarchive.pc.in
+++ b/build/pkgconfig/libarchive.pc.in
@@ -8,4 +8,4 @@ Description: library that can create and read several streaming archive formats
 Version: @VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -larchive
-Libs.private: @LIBS@
+Libs.private: @LIBS@ -liconv

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 16 Jul 2017 16:10:08 -0700
Subject: [PATCH] Issue #924: fix capitalization of bcrypt.h header

taken from:
https://github.com/libarchive/libarchive/commit/06052e47e500ef4c8c937c4c8b987433a647cb4c

diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h
index 1111111..2222222 100644
--- a/libarchive/archive_cryptor_private.h
+++ b/libarchive/archive_cryptor_private.h
@@ -64,7 +64,7 @@ typedef struct {
 } archive_crypto_ctx;
 
 #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
-#include <Bcrypt.h>
+#include <bcrypt.h>
 
 /* Common in other bcrypt implementations, but missing from VS2008. */
 #ifndef BCRYPT_SUCCESS