summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkfg2023-06-02 20:22:00 +0200
committerkfg2023-06-02 21:14:35 +0200
commit1d60378731e59f99c9bfe921e5e654d6c2ff2c65 (patch)
treedb24ce0325f526f6d29c8c478e907f5b59829a19
parent8373bd564732d867b80cf780c6218505ec75a95c (diff)
downloadaur-mingw-w64-cmocka.tar.gz
upgpkg: mingw-w64-cmocka 1.1.7-1
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD10
-rw-r--r--cmake.patch33
3 files changed, 33 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 759cb9896c4f..542545c4075e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mingw-w64-cmocka
pkgdesc = Elegant unit testing framework for C with support for mock objects (mingw-w64)
- pkgver = 1.1.5
- pkgrel = 2
+ pkgver = 1.1.7
+ pkgrel = 1
url = https://cmocka.org/
arch = any
license = Apache
@@ -12,12 +12,12 @@ pkgbase = mingw-w64-cmocka
options = !strip
options = !buildflags
options = staticlibs
- source = https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
- source = https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz.asc
+ source = https://cmocka.org/files/1.1/cmocka-1.1.7.tar.xz
+ source = https://cmocka.org/files/1.1/cmocka-1.1.7.tar.xz.asc
source = cmake.patch
validpgpkeys = 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
- sha512sums = cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
+ sha512sums = fe451893474dce1270e12af707a9a8fe1f0217e1782b4e1a67d25dadf56ff4a5e7dbc9ba4431f774aedffa46a40a28a6a0488df24feefb2f93e90fd2369c2c88
sha512sums = SKIP
- sha512sums = a9f959ca9f489c3ca57e7671e249064c28b45a00df95395ac46ba0cea5bfc8760253a708a470e04e6c1f9a6f5a882b75fbceef7933b8e200da3579b1580cd671
+ sha512sums = a7e862f1b68ee72a10c6820c3739e01eab0cef8d4014b605ea1c14d4869891b854197ba8ee823a12e886c232bf117d028904e737a0597eca48d1072330bfa00d
pkgname = mingw-w64-cmocka
diff --git a/PKGBUILD b/PKGBUILD
index ead8e8870104..526d2b7c6315 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
pkgname=mingw-w64-cmocka
-pkgver=1.1.5
-pkgrel=2
+pkgver=1.1.7
+pkgrel=1
pkgdesc='Elegant unit testing framework for C with support for mock objects (mingw-w64)'
url='https://cmocka.org/'
arch=('any')
@@ -13,10 +13,10 @@ depends=('mingw-w64-crt')
makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-wine')
options=(!strip !buildflags staticlibs)
source=(https://cmocka.org/files/1.1/cmocka-${pkgver}.tar.xz{,.asc}
- 'cmake.patch')
-sha512sums=('cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd'
+ 'cmake.patch')
+sha512sums=('fe451893474dce1270e12af707a9a8fe1f0217e1782b4e1a67d25dadf56ff4a5e7dbc9ba4431f774aedffa46a40a28a6a0488df24feefb2f93e90fd2369c2c88'
'SKIP'
- 'a9f959ca9f489c3ca57e7671e249064c28b45a00df95395ac46ba0cea5bfc8760253a708a470e04e6c1f9a6f5a882b75fbceef7933b8e200da3579b1580cd671')
+ 'a7e862f1b68ee72a10c6820c3739e01eab0cef8d4014b605ea1c14d4869891b854197ba8ee823a12e886c232bf117d028904e737a0597eca48d1072330bfa00d')
validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org>
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
diff --git a/cmake.patch b/cmake.patch
index 30bd16867901..dbc5b30c31b6 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,12 +1,23 @@
-diff -ruN cmocka-1.1.3/src/CMakeLists.txt patched/src/CMakeLists.txt
---- cmocka-1.1.3/src/CMakeLists.txt 2018-09-27 15:27:59.000000000 +0200
-+++ patched/src/CMakeLists.txt 2018-10-01 23:39:21.928642794 +0200
-@@ -74,6 +74,8 @@
+--- cmocka-1.1.7/src/CMakeLists.txt 2023-02-23 15:05:42.000000000 +0100
++++ patched/src/CMakeLists.txt 2023-06-02 20:57:57.103331604 +0200
+@@ -78,7 +78,7 @@
+ NAMESPACE cmocka::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cmocka)
- install(TARGETS
- ${CMOCKA_SHARED_LIBRARY}
-+ RUNTIME DESTINATION
-+ ${BIN_INSTALL_DIR}
- ARCHIVE DESTINATION
- ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION
+-if (UNIT_TESTING)
++#if (UNIT_TESTING)
+ # Internal library
+ add_library(cmocka-static STATIC ${cmocka_SRCS})
+
+@@ -103,4 +103,10 @@
+ target_link_libraries(cmocka-static PRIVATE ${CMOCKA_LINK_LIBRARIES})
+
+ add_library(cmocka::static ALIAS cmocka-static)
+-endif()
++#endif()
++
++install(TARGETS cmocka-static
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ COMPONENT ${PROJECT_NAME})