diff --git a/sys-apps/texinfo/patches/texinfo-6.1.patchset b/sys-apps/texinfo/patches/texinfo-6.1.patchset index 98caf0a29..4b8619e26 100644 --- a/sys-apps/texinfo/patches/texinfo-6.1.patchset +++ b/sys-apps/texinfo/patches/texinfo-6.1.patchset @@ -1,11 +1,11 @@ -From 3382b1db7529d426aae4efb2c9f7e07ce65833fc Mon Sep 17 00:00:00 2001 +From becfe6a5d9bbf0041cc6f287bd0409f605987756 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 22 Dec 2015 11:52:48 +0000 Subject: Haiku patch diff --git a/system.h b/system.h -index e5c7f27..5f785fa 100644 +index 11cac6d..7ce87ab 100644 --- a/system.h +++ b/system.h @@ -204,6 +204,10 @@ extern int kill (pid_t, int); @@ -20,5 +20,36 @@ index e5c7f27..5f785fa 100644 #ifndef ALSO_NULL_DEVICE # define ALSO_NULL_DEVICE "" -- -2.2.2 +2.7.0 + + +From a53a2c5bd82c983db75433f6ada98bcceecb9f11 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Mar 2016 08:51:25 +0100 +Subject: Fix gcc2 build. + + +diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c b/tp/Texinfo/Convert/XSParagraph/xspara.c +index 47b2e4f..bc4fe12 100644 +--- a/tp/Texinfo/Convert/XSParagraph/xspara.c ++++ b/tp/Texinfo/Convert/XSParagraph/xspara.c +@@ -389,6 +389,7 @@ xspara_get_state (HV *hash) + /* Don't do anything. */ + return; + ++{ + dTHX; /* Perl boilerplate. */ + + val = newSViv (state.end_sentence); +@@ -402,7 +403,7 @@ xspara_get_state (HV *hash) + + val = newSViv (state.lines_counter); + STORE("lines_counter"); +- ++} + return; + + +-- +2.7.0