diff --git a/dev-vcs/git/patches/git-1.8.3.4.patchset b/dev-vcs/git/patches/git-1.8.3.4.patchset index d7aed2420..dc8fc68ed 100644 --- a/dev-vcs/git/patches/git-1.8.3.4.patchset +++ b/dev-vcs/git/patches/git-1.8.3.4.patchset @@ -1,4 +1,4 @@ -From 54aaa3773f83a1706140ef842e537b5dc5f37568 Mon Sep 17 00:00:00 2001 +From f7163c64a9dfa46d22a81945486c0199d90b015f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -23,7 +23,7 @@ index 1d72ec7..e3f254c 100755 1.8.3.4 -From e42686b933c0999c3c83cac79ceff073ce2bbc32 Mon Sep 17 00:00:00 2001 +From b88713702e6a551f36a85afae6eba95e84976392 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 21:03:59 +0200 Subject: On Haiku use the user settings directory instead of HOME @@ -77,7 +77,7 @@ index 04ff148..8668534 100644 1.8.3.4 -From 80ed8e810eaebbecf10a20bac95c1e43fc14d2d5 Mon Sep 17 00:00:00 2001 +From 5f5ff9533c6ef8729088056c0399269e939cb248 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 15 Oct 2013 21:34:09 +0200 Subject: Ensure config-directory exists before using it. @@ -111,3 +111,26 @@ index 7a85ebd..10be1af 100644 -- 1.8.3.4 + +From 38c0f4ef61601e810a1060861ce5d6b281c44656 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 17 Sep 2014 09:35:49 +0200 +Subject: strings.h fix. + + +diff --git a/mailmap.c b/mailmap.c +index 2a7b366..feaf37a 100644 +--- a/mailmap.c ++++ b/mailmap.c +@@ -2,6 +2,8 @@ + #include "string-list.h" + #include "mailmap.h" + ++#include ++ + #define DEBUG_MAILMAP 0 + #if DEBUG_MAILMAP + #define debug_mm(...) fprintf(stderr, __VA_ARGS__) +-- +1.8.3.4 +