From 7b070f235c9125d04b6adecf7c47fae5b598b3ad Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 13 Jan 2018 22:25:26 +0100 Subject: [PATCH] rapidjson: fix build --- ...ve-march-native-from-CMAKE_CXX_FLAGS.patch | 4 +-- srcpkgs/rapidjson/patches/fallthrough.patch | 29 +++++++++++++++++++ srcpkgs/rapidjson/template | 3 +- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/rapidjson/patches/fallthrough.patch diff --git a/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch b/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch index eb0b76b21e8..cc17cbb6ca2 100644 --- a/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch +++ b/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ceda71b1..9fc52736 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +--- CMakeLists.txt ++++ CMakeLists.txt @@ -50,7 +50,7 @@ if(CCACHE_FOUND) endif(CCACHE_FOUND) diff --git a/srcpkgs/rapidjson/patches/fallthrough.patch b/srcpkgs/rapidjson/patches/fallthrough.patch new file mode 100644 index 00000000000..55061ba64d6 --- /dev/null +++ b/srcpkgs/rapidjson/patches/fallthrough.patch @@ -0,0 +1,29 @@ +--- include/rapidjson/internal/regex.h.orig 2016-08-25 09:59:05.000000000 +0200 ++++ include/rapidjson/internal/regex.h 2018-01-13 21:51:33.959472047 +0100 +@@ -300,7 +300,7 @@ + case '\\': // Escape character + if (!CharacterEscape(ds, &codepoint)) + return; // Unsupported escape character +- // fall through to default ++ // fall-through + + default: // Pattern character + PushOperand(operandStack, codepoint); +@@ -534,7 +534,7 @@ + } + else if (!CharacterEscape(ds, &codepoint)) + return false; +- // fall through to default ++ // fall-through + + default: + switch (step) { +@@ -543,7 +543,7 @@ + step++; + break; + } +- // fall through to step 0 for other characters ++ // fall-through + + case 0: + { diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template index 14f3e9f5234..a29c7ff4054 100644 --- a/srcpkgs/rapidjson/template +++ b/srcpkgs/rapidjson/template @@ -1,9 +1,8 @@ # Template build file for 'rapidjson'. pkgname=rapidjson version=1.1.0 -revision=1 +revision=2 build_style=cmake -patch_args="-Np1" noarch=yes short_desc="A fast JSON parser/generator for C++ with both SAX/DOM style API" maintainer="Alexander Egorenkov "