* [PR PATCH] passwordsafe: update to 1.13.0, enable testing
@ 2021-02-25 23:54 yopito
2021-02-26 4:47 ` [PR REVIEW] " ericonr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: yopito @ 2021-02-25 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
There is a new pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages passwordsafe-1.13.0
https://github.com/void-linux/void-packages/pull/29066
passwordsafe: update to 1.13.0, enable testing
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [ ] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/29066.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-passwordsafe-1.13.0-29066.patch --]
[-- Type: text/x-diff, Size: 3724 bytes --]
From d2a5a382d332fe0c2eb1d59cbfaf7260c4431414 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Thu, 25 Feb 2021 22:50:32 +0100
Subject: [PATCH] passwordsafe: update to 1.13.0, enable testing
---
.../patches/use-gtest-from-package.patch | 37 +++++++++++++++++++
srcpkgs/passwordsafe/template | 13 +++++--
2 files changed, 46 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/passwordsafe/patches/use-gtest-from-package.patch
diff --git a/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch b/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch
new file mode 100644
index 00000000000..240d3fd0e32
--- /dev/null
+++ b/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch
@@ -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)
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..2cd6ee12a11 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,22 +1,27 @@
# Template file for 'passwordsafe'
pkgname=passwordsafe
-version=1.12.0
+version=1.13.0
revision=1
wrksrc="pwsafe-${version}"
build_style=cmake
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
hostmakedepends="perl zip pkg-config gettext"
makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+checkdepends="gtest-devel"
short_desc="Simple & Secure Password Management"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="Artistic-2.0"
homepage="https://pwsafe.org"
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() {
# ykpers-1 includes are hardcoded, add cross base
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR REVIEW] passwordsafe: update to 1.13.0, enable testing
2021-02-25 23:54 [PR PATCH] passwordsafe: update to 1.13.0, enable testing yopito
@ 2021-02-26 4:47 ` ericonr
2021-02-26 4:48 ` [PR PATCH] [Merged]: " ericonr
2021-02-26 6:42 ` [PR REVIEW] " yopito
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-02-26 4:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29066#discussion_r583381167
Comment:
Maybe we can get a flag to disable this upstream?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: passwordsafe: update to 1.13.0, enable testing
2021-02-25 23:54 [PR PATCH] passwordsafe: update to 1.13.0, enable testing yopito
2021-02-26 4:47 ` [PR REVIEW] " ericonr
@ 2021-02-26 4:48 ` ericonr
2021-02-26 6:42 ` [PR REVIEW] " yopito
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-02-26 4:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1449 bytes --]
There's a merged pull request on the void-packages repository
passwordsafe: update to 1.13.0, enable testing
https://github.com/void-linux/void-packages/pull/29066
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-musl)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [ ] armv6l-musl
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR REVIEW] passwordsafe: update to 1.13.0, enable testing
2021-02-25 23:54 [PR PATCH] passwordsafe: update to 1.13.0, enable testing yopito
2021-02-26 4:47 ` [PR REVIEW] " ericonr
2021-02-26 4:48 ` [PR PATCH] [Merged]: " ericonr
@ 2021-02-26 6:42 ` yopito
2 siblings, 0 replies; 4+ messages in thread
From: yopito @ 2021-02-26 6:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/29066#discussion_r583415987
Comment:
yep, I will request.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-26 6:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-25 23:54 [PR PATCH] passwordsafe: update to 1.13.0, enable testing yopito
2021-02-26 4:47 ` [PR REVIEW] " ericonr
2021-02-26 4:48 ` [PR PATCH] [Merged]: " ericonr
2021-02-26 6:42 ` [PR REVIEW] " yopito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).