Simple cmocka update to 1.1.5. OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmocka/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile 11 Mar 2022 18:49:50 -0000 1.14
+++ Makefile 30 Aug 2022 08:58:26 -0000
@@ -1,8 +1,8 @@
COMMENT = elegant unit testing framework for C
-DISTNAME = cmocka-1.1.3
+DISTNAME = cmocka-1.1.5
-SHARED_LIBS += cmocka 0.3 # 0.5
+SHARED_LIBS += cmocka 0.4 # 0.5
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmocka/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 3 Oct 2018 13:40:38 -0000 1.6
+++ distinfo 30 Aug 2022 08:58:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmocka-1.1.3.tar.xz) = Q+q89yqcgOPQP3yKHATkCMGNLbUSHrBYo+9zKp36v68=
-SIZE (cmocka-1.1.3.tar.xz) = 78744
+SHA256 (cmocka-1.1.5.tar.xz) = 8MzYJC1V4v10sWulGDWRUfb4OD/4rvSXbkg5P3e7qLY=
+SIZE (cmocka-1.1.5.tar.xz) = 81004
Index: patches/patch-CompilerChecks_cmake
===================================================================
RCS file: /cvs/ports/devel/cmocka/patches/patch-CompilerChecks_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CompilerChecks_cmake
--- patches/patch-CompilerChecks_cmake 11 Mar 2022 18:49:50 -0000 1.3
+++ patches/patch-CompilerChecks_cmake 30 Aug 2022 08:58:26 -0000
@@ -41,12 +41,12 @@ Index: CompilerChecks.cmake
- add_c_compiler_flag("-Werror=strict-overflow" SUPPORTED_COMPILER_FLAGS)
add_c_compiler_flag("-Wstrict-overflow=2" SUPPORTED_COMPILER_FLAGS)
add_c_compiler_flag("-Wno-format-zero-length" SUPPORTED_COMPILER_FLAGS)
-
-@@ -48,7 +31,6 @@ if (UNIX)
+ add_c_compiler_flag("-Wmissing-field-initializers"
SUPPORTED_COMPILER_FLAGS)
+@@ -49,7 +32,6 @@ if (UNIX)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wformat")
endif()
add_c_compiler_flag("-Wformat-security" SUPPORTED_COMPILER_FLAGS)
- add_c_compiler_flag("-Werror=format-security" SUPPORTED_COMPILER_FLAGS)
# Allow zero for a variadic macro argument
- add_c_compiler_flag("-Wno-gnu-zero-variadic-macro-arguments"
SUPPORTED_COMPILER_FLAGS)
+ string(TOLOWER "${CMAKE_C_COMPILER_ID}" _C_COMPILER_ID)
Index: patches/patch-include_cmocka_h
===================================================================
RCS file: /cvs/ports/devel/cmocka/patches/patch-include_cmocka_h,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-include_cmocka_h
--- patches/patch-include_cmocka_h 11 Mar 2022 18:49:50 -0000 1.9
+++ patches/patch-include_cmocka_h 30 Aug 2022 08:58:26 -0000
@@ -3,7 +3,7 @@ Avoid a conflicting typedef on 32-bit ar
Index: include/cmocka.h
--- include/cmocka.h.orig
+++ include/cmocka.h
-@@ -57,7 +57,7 @@ int __stdcall IsDebuggerPresent();
+@@ -58,7 +58,7 @@ int __stdcall IsDebuggerPresent();
/* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
#ifndef __WORDSIZE
@@ -12,7 +12,7 @@ Index: include/cmocka.h
# define __WORDSIZE 64
# else
# define __WORDSIZE 32
-@@ -110,6 +110,9 @@ typedef uintmax_t LargestIntegralType;
+@@ -115,6 +115,9 @@ typedef uintmax_t LargestIntegralType;
#define cast_to_largest_integral_type(value) \
((LargestIntegralType)(value))
@@ -22,7 +22,7 @@ Index: include/cmocka.h
/* Smallest integral type capable of holding a pointer. */
#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
# if defined(_WIN32)
-@@ -138,6 +141,7 @@ typedef uintmax_t LargestIntegralType;
+@@ -143,6 +146,7 @@ typedef uintmax_t LargestIntegralType;
# define _UINTPTR_T
# define _UINTPTR_T_DEFINED
#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
