[PR PATCH] passwordsafe: update to 1.12

[yopito <yopito@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

There is a new pull request by yopito against master on the void-packages repository

https://github.com/yopito/void-packages pwsafe.1.12
https://github.com/void-linux/void-packages/pull/27562

passwordsafe: update to 1.12


A patch file from https://github.com/void-linux/void-packages/pull/27562.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pwsafe.1.12-27562.patch --]
[-- Type: text/x-diff, Size: 3439 bytes --]

From e0a4b08d05f726116fa750a3118ecdf0d0677080 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 30 Dec 2020 23:57:18 +0100
Subject: [PATCH] passwordsafe: update to 1.12

---
 srcpkgs/passwordsafe/patches/__time64_t.patch | 24 -------------------
 srcpkgs/passwordsafe/template                 | 19 +++++----------
 srcpkgs/passwordsafe/update                   |  4 ++--
 3 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/passwordsafe/patches/__time64_t.patch

diff --git a/srcpkgs/passwordsafe/patches/__time64_t.patch b/srcpkgs/passwordsafe/patches/__time64_t.patch
deleted file mode 100644
index 00ebf3444c7..00000000000
--- a/srcpkgs/passwordsafe/patches/__time64_t.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-related issue: https://github.com/pwsafe/pwsafe/issues/563
-
-Also:
-
-https://github.com/pwsafe/pwsafe/commit/412458d281f98ea7649d2957f88ebad701b6cd18
-
---- src/os/unix/pws_time.h
-+++ src/os/unix/pws_time.h
-@@ -14,9 +14,11 @@
- #include <time.h>
- #endif
- 
--typedef time_t __time32_t;
--#ifndef __time64_t 
--typedef uint64_t __time64_t;
-+#ifndef __TIME64_T_TYPE
-+#define __TIME64_T_TYPE uint64_t
-+#endif
-+#ifndef time64_t
-+typedef __TIME64_T_TYPE __time64_t;
- #endif
- 
- extern int localtime64_r(const __time64_t *timep, struct tm *result);
-
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 986de16cfe7..b1bc520ed8f 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,33 +1,26 @@
 # Template file for 'passwordsafe'
 pkgname=passwordsafe
-version=1.08.1BETA
+version=1.12.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 gtest-devel qrencode-devel libressl-devel libcurl-devel"
+ libykpers-devel qrencode-devel libressl-devel libcurl-devel file-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>pwsafe-${version}.tar.gz"
-checksum=2c3648e8189a32c107c7d7bc0527c919db36b3940f19b0e58b37f0f992ea42a7
-
-# wx-config-gtk3 crossbuild handled via wrapper
-if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3"
-
-fi
+distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz"
+checksum=8d331019170f2920a28ccda08ae420c78e016f41d3ccedb7b4dba1f5f7f25bcb
 
 pre_configure() {
 	# ykpers-1 includes are hardcoded, add cross base
 	sed -i -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" CMakeLists.txt
-
-	# icons in right place
-	sed -i -e "s|share/pixmaps|share/icons/hicolor/48x48/apps|" CMakeLists.txt
 }
 
 post_install() {
diff --git a/srcpkgs/passwordsafe/update b/srcpkgs/passwordsafe/update
index 6469882cd10..bd4bb512ea0 100644
--- a/srcpkgs/passwordsafe/update
+++ b/srcpkgs/passwordsafe/update
@@ -1,2 +1,2 @@
-# Passwordsafe linux port uses "BETA" in release name
-pattern="\K[\d.]+BETA(?=)"
+# 1.x for linux, 3.x for windows
+ignore="3.*"