diff --git a/mingw-w64-cereal/PKGBUILD b/mingw-w64-cereal/PKGBUILD index 33a83e29ba..5b2cb6f900 100644 --- a/mingw-w64-cereal/PKGBUILD +++ b/mingw-w64-cereal/PKGBUILD @@ -3,26 +3,24 @@ _realname=cereal pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.2.2 +pkgver=1.3.0 pkgrel=1 pkgdesc="A C++11 library for serialization (mingw-w64)" arch=('any') url="https://uscilab.github.io/cereal/" license=('New BSD license') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-cmake") depends=("${MINGW_PACKAGE_PREFIX}-boost") checkdepends=("${MINGW_PACKAGE_PREFIX}-gflags") source=("${_realname}-${pkgver}.tar.gz::https://github.com/USCiLab/cereal/archive/v${pkgver}.tar.gz" - "${_realname}-1.2.2.patch" - "build-fixes.patch") -sha256sums=('1921f26d2e1daf9132da3c432e2fd02093ecaedf846e65d7679ddf868c7289c4' - '5454976ffdc81051f59065431998fcfc717d8b4489f39c212c3d06ae52746306' - '9d2ae6a04d9b3773f2f6c5344d79d9554306a871fc2a1aa763ac1d2e377042ff') + "${_realname}-1.2.2.patch") +sha256sums=('329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5' + '3a7f7a6e6d8e092c5ffb7b0342d0bfa8675a57985dc1c9e5a4209ce434156767') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/${_realname}-1.2.2.patch" - patch -Np1 -i "${srcdir}/build-fixes.patch" } build() { @@ -30,10 +28,13 @@ build() { mkdir "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" + CFLAGS+=" -Wno-unused-variable" + CXXFLAGS+=" -Wno-unused-variable" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_BUILD_TYPE="Release" \ "../${_realname}-${pkgver}" make @@ -47,4 +48,6 @@ check() { package() { cd "${srcdir}/build-${MINGW_CHOST}" make DESTDIR="${pkgdir}" install + + install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE } diff --git a/mingw-w64-cereal/cereal-1.2.2.patch b/mingw-w64-cereal/cereal-1.2.2.patch index c598a180fa..706906af48 100644 --- a/mingw-w64-cereal/cereal-1.2.2.patch +++ b/mingw-w64-cereal/cereal-1.2.2.patch @@ -58,3 +58,24 @@ diff -Naur cereal-1.2.2/unittests/CMakeLists.txt cereal-1.2.2-patched/unittests/ if(NOT CMAKE_VERSION VERSION_LESS 3.0) add_test(test_cmake_config_module ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake-config-module.cmake) +diff -Naur cereal-1.3.0/unittests/boost/CMakeLists.txt cereal-1.3.0-patched/unittests/boost/CMakeLists.txt +--- cereal-1.3.0/unittests/boost/CMakeLists.txt 2020-06-11 01:06:58.000000000 +0300 ++++ cereal-1.3.0-patched/unittests/boost/CMakeLists.txt 2020-06-11 22:45:34.970358200 +0300 +@@ -12,7 +12,7 @@ + add_test("${TEST_TARGET}" "${TEST_TARGET}") + + # If we are on a 64-bit machine, create an extra 32-bit version of the test if portability testing is enabled +- if((NOT MSVC) AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8) AND (NOT SKIP_PORTABILITY_TEST)) ++ if((NOT WIN32) AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8) AND (NOT SKIP_PORTABILITY_TEST)) + add_executable(${TEST_TARGET}_32 ${TEST_SOURCE}) + set_target_properties(${TEST_TARGET}_32 PROPERTIES + COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") +@@ -21,7 +21,7 @@ + + endforeach() + +-if(NOT MSVC) ++if(NOT WIN32) + # add tests to coverage + foreach(TEST_SOURCE ${TESTS}) + string(REPLACE ".cpp" "" COVERAGE_TARGET "${TEST_SOURCE}")