From ef2de8343c889e83102859cd057955e94e508a85 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 29 Sep 2019 12:25:28 +0200
Subject: [PATCH] cmocka: bump version.

---
 ...mocka-1.1.3.recipe => cmocka-1.1.5.recipe} |  4 ++--
 ...a-1.1.3.patchset => cmocka-1.1.5.patchset} | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename dev-util/cmocka/{cmocka-1.1.3.recipe => cmocka-1.1.5.recipe} (94%)
 rename dev-util/cmocka/patches/{cmocka-1.1.3.patchset => cmocka-1.1.5.patchset} (80%)

diff --git a/dev-util/cmocka/cmocka-1.1.3.recipe b/dev-util/cmocka/cmocka-1.1.5.recipe
similarity index 94%
rename from dev-util/cmocka/cmocka-1.1.3.recipe
rename to dev-util/cmocka/cmocka-1.1.5.recipe
index 8be626cf4..033c1b85a 100644
--- a/dev-util/cmocka/cmocka-1.1.3.recipe
+++ b/dev-util/cmocka/cmocka-1.1.5.recipe
@@ -9,13 +9,13 @@ COPYRIGHT="2008 Google Inc.
 LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://cmocka.org/files/${portVersion%.*}/cmocka-$portVersion.tar.xz"
-CHECKSUM_SHA256="43eabcf72a9c80e3d03f7c8a1c04e408c18d2db5121eb058a3ef732a9dfabfaf"
+CHECKSUM_SHA256="f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6"
 PATCHES="cmocka-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="0.5.1"
+libVersion="0.7.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
diff --git a/dev-util/cmocka/patches/cmocka-1.1.3.patchset b/dev-util/cmocka/patches/cmocka-1.1.5.patchset
similarity index 80%
rename from dev-util/cmocka/patches/cmocka-1.1.3.patchset
rename to dev-util/cmocka/patches/cmocka-1.1.5.patchset
index b5fa57db5..73e978773 100644
--- a/dev-util/cmocka/patches/cmocka-1.1.3.patchset
+++ b/dev-util/cmocka/patches/cmocka-1.1.5.patchset
@@ -1,37 +1,37 @@
-From c9baba9780c62161b0c60994e967d431c5b82614 Mon Sep 17 00:00:00 2001
+From e998618a66374bcd29069dbc794e45597496f996 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 26 Sep 2018 13:33:44 +0200
 Subject: Haiku: include sdint.h to define uintptr_t.
 
 
 diff --git a/include/cmocka.h b/include/cmocka.h
-index e6861c8..32a651a 100644
+index 9b47ceb..e88c9f8 100644
 --- a/include/cmocka.h
 +++ b/include/cmocka.h
-@@ -117,6 +117,8 @@ typedef uintmax_t LargestIntegralType;
+@@ -122,6 +122,8 @@ typedef uintmax_t LargestIntegralType;
      typedef unsigned int uintptr_t;
  # elif defined(_WIN64)
-     typedef unsigned long int uintptr_t
+     typedef unsigned long int uintptr_t;
 +# elif defined(__HAIKU__)
 +    #include <stdint.h>
  # else /* _WIN32 */
  
  /* ILP32 and LP64 platforms */
 -- 
-2.19.1
+2.21.0
 
 
-From c02eb77ae626a44487461c6c8c7e2d7201e66ba9 Mon Sep 17 00:00:00 2001
+From d184362784d72fb2a2ac7b5d1e4aaff99417bdaa Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Fri, 22 Mar 2019 21:14:31 +0100
 Subject: disable stack protector for Haiku
 
 
 diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake
-index f07929c..4c5f9ff 100644
+index b326807..70ff254 100644
 --- a/CompilerChecks.cmake
 +++ b/CompilerChecks.cmake
-@@ -62,7 +62,7 @@ if (UNIX)
+@@ -66,7 +66,7 @@ if (UNIX)
          endif()
      endif()
  
@@ -40,7 +40,7 @@ index f07929c..4c5f9ff 100644
      if (WITH_STACK_PROTECTOR_STRONG)
          list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
          # This is needed as Solaris has a seperate libssp
-@@ -70,7 +70,7 @@ if (UNIX)
+@@ -74,7 +74,7 @@ if (UNIX)
              list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
          endif()
      else (WITH_STACK_PROTECTOR_STRONG)
@@ -50,5 +50,5 @@ index f07929c..4c5f9ff 100644
              list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
              # This is needed as Solaris has a seperate libssp
 -- 
-2.19.1
+2.21.0