jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

passwordsafe: update to 1.13.0, enable testing

Browse source
This commit is contained in:
yopito 2021-02-25 22:50:32 +01:00 committed by Érico Nogueira Rolim
parent e719fb5615
commit 1aaa418140
2 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
srcpkgs/passwordsafe/patches/use-gtest-from-package.patch Normal file
View file

@ -0,0 +1,37 @@
--- CMakeLists.txt.ORIG 2021-02-25 23:45:37.917034534 +0100
+++ CMakeLists.txt 2021-02-26 00:05:34.138397928 +0100
@@ -255,34 +255,6 @@
endif (USE_ASAN)
endif (MSVC)
-if (NOT NO_GTEST)
- # Download and unpack googletest at configure time
- # See https://crascit.com/2015/07/25/cmake-gtest/
- configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
- execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
- execute_process(COMMAND "${CMAKE_COMMAND}" --build .
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
-
- # Prevent GoogleTest from overriding our compiler/linker options
- # when building with Visual Studio
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- # Set some other gtest configurations:
- set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
- set(BUILD_GTEST ON CACHE BOOL "" FORCE)
- set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
-
- # Add googletest directly to our build. This adds
- # the following targets: gtest, gtest_main, gmock
- # and gmock_main
- add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
- "${CMAKE_BINARY_DIR}/googletest-build")
-
- include_directories("${gtest_SOURCE_DIR}/include"
-# "${gmock_SOURCE_DIR}/include"
- )
-endif(NOT NO_GTEST)
-
if (WIN32 AND NOT WX_WINDOWS)
set(VERSION_IN "${PROJECT_SOURCE_DIR}/src/ui/Windows/version.in")
else (WIN32 AND NOT WX_WINDOWS)

13
srcpkgs/passwordsafe/template
View file

@ -1,22 +1,27 @@
# Template file for 'passwordsafe' # Template file for 'passwordsafe'
pkgname=passwordsafe pkgname=passwordsafe
version=1.12.0 version=1.13.0
revision=1 revision=1
wrksrc="pwsafe-${version}" wrksrc="pwsafe-${version}"
build_style=cmake build_style=cmake
build_helper=cmake-wxWidgets-gtk3 build_helper=cmake-wxWidgets-gtk3
# testing disabled: want to build gtest from source (package gtest-devel useless)
configure_args="-DNO_GTEST=ON"
# build process uses perl to generate core_st.cpp and zip to generate help files # build process uses perl to generate core_st.cpp and zip to generate help files
hostmakedepends="perl zip pkg-config gettext" hostmakedepends="perl zip pkg-config gettext"
makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel" libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
checkdepends="gtest-devel"
short_desc="Simple & Secure Password Management" short_desc="Simple & Secure Password Management"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>" maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="Artistic-2.0" license="Artistic-2.0"
homepage="https://pwsafe.org" homepage="https://pwsafe.org"
distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz" distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz"
checksum=8d331019170f2920a28ccda08ae420c78e016f41d3ccedb7b4dba1f5f7f25bcb checksum=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DNO_GTEST=OFF"
else
configure_args+=" -DNO_GTEST=ON"
fi
pre_configure() { pre_configure() {
# ykpers-1 includes are hardcoded, add cross base # ykpers-1 includes are hardcoded, add cross base