From fd3adc2a98891f83c180b92ea43b49b9f70c2502 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 28 Jan 2017 13:02:01 +0100 Subject: [PATCH] ponpokodiff: fix build on x86_64. --- .../patches/ponpokodiff-0.2.0.patchset | 46 +++++++++++++++++++ .../ponpokodiff/ponpokodiff-0.2.0.recipe | 5 +- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 haiku-apps/ponpokodiff/patches/ponpokodiff-0.2.0.patchset diff --git a/haiku-apps/ponpokodiff/patches/ponpokodiff-0.2.0.patchset b/haiku-apps/ponpokodiff/patches/ponpokodiff-0.2.0.patchset new file mode 100644 index 000000000..886705fd3 --- /dev/null +++ b/haiku-apps/ponpokodiff/patches/ponpokodiff-0.2.0.patchset @@ -0,0 +1,46 @@ +From 9e5b2e17499dd861adc310c8b42cba6720e438aa Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 28 Jan 2017 12:58:07 +0100 +Subject: x86_64 build fix. + + +diff --git a/LineSeparatedText.cpp b/LineSeparatedText.cpp +index e3d6334..925cde5 100644 +--- a/LineSeparatedText.cpp ++++ b/LineSeparatedText.cpp +@@ -34,6 +34,7 @@ + #include "LineSeparatedText.h" + #include + #include ++#include + #include "Exception.h" + #include "ExceptionCode.h" + +diff --git a/NPDiff.cpp b/NPDiff.cpp +index 2e1920f..c440914 100644 +--- a/NPDiff.cpp ++++ b/NPDiff.cpp +@@ -32,6 +32,8 @@ + + #include "Prefix.h" + #include "NPDiff.h" ++#include ++#include + #include "Exception.h" + #include "ExceptionCode.h" + +diff --git a/Substring.cpp b/Substring.cpp +index fb47379..dd389ed 100644 +--- a/Substring.cpp ++++ b/Substring.cpp +@@ -32,6 +32,7 @@ + + #include "Prefix.h" + #include "Substring.h" ++#include + + /** + * @brief 開始点と終了点を指定するコンストラクタ +-- +2.10.2 + diff --git a/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe index 0533b5f8f..ef55bd2bb 100644 --- a/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe +++ b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe @@ -7,12 +7,13 @@ PonpokoDiff can also be used as an external diff command of Subversion \ HOMEPAGE="https://github.com/HaikuArchives/PonpokoDiff" COPYRIGHT="2008 PonpokoDiff Project Contributors" LICENSE="MIT" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/HaikuArchives/PonpokoDiff/archive/ca95f7a820d54ec54d9ae4b3ca1a1d8a48dd7f44.tar.gz" CHECKSUM_SHA256="f2716c94007030fd92ee54429ac5b1830ac89301687b3614955c7d649bfda657" SOURCE_DIR="PonpokoDiff-ca95f7a820d54ec54d9ae4b3ca1a1d8a48dd7f44/source" +PATCHES="ponpokodiff-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" ponpokodiff = $portVersion