passwordsafe: update to 1.16.0
This commit is contained in:
yopito
classabbyamp
parent
ca9471ade3
commit
01a152ec3f
@ -1,43 +0,0 @@
|
|||||||
From d8e7ec230e5cd4fa67aff4d6227d73dd9ddb37dd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sam James <sam@gentoo.org>
|
|
||||||
Date: Thu, 30 Jun 2022 21:34:29 +0000
|
|
||||||
Subject: [PATCH] Fix build with GCC 12 (missing <time.h> include)
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Fixes build failure with GCC 12:
|
|
||||||
```
|
|
||||||
/var/tmp/portage/app-admin/passwordsafe-1.15.0/work/pwsafe-1.15.0/src/os/unix/pws_time.cpp: In function ‘int localtime64_r(const __time64_t*, tm*)’:
|
|
||||||
/var/tmp/portage/app-admin/passwordsafe-1.15.0/work/pwsafe-1.15.0/src/os/unix/pws_time.cpp:30:10: error: ‘localtime_r’ was not declared in this scope; did you mean ‘localtime64_r’?
|
|
||||||
30 | return localtime_r(tp, result) != nullptr;
|
|
||||||
| ^~~~~~~~~~~
|
|
||||||
| localtime64_r
|
|
||||||
/var/tmp/portage/app-admin/passwordsafe-1.15.0/work/pwsafe-1.15.0/src/os/unix/pws_time.cpp: In function ‘int pws_os::asctime(TCHAR*, size_t, const tm*)’:
|
|
||||||
/var/tmp/portage/app-admin/passwordsafe-1.15.0/work/pwsafe-1.15.0/src/os/unix/pws_time.cpp:36:3: error: ‘asctime_r’ was not declared in this scope
|
|
||||||
36 | asctime_r(t, cbuf);
|
|
||||||
| ^~~~~~~~~
|
|
||||||
```
|
|
||||||
|
|
||||||
We had it conditional for FreeBSD but it shouldn't be conditional at all;
|
|
||||||
it only worked by chance before by way of transitive includes.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/854144
|
|
||||||
---
|
|
||||||
src/os/unix/pws_time.h | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/os/unix/pws_time.h b/src/os/unix/pws_time.h
|
|
||||||
index b11f26a3a..3abb1bc8e 100644
|
|
||||||
--- a/src/os/unix/pws_time.h
|
|
||||||
+++ b/src/os/unix/pws_time.h
|
|
||||||
@@ -10,9 +10,7 @@
|
|
||||||
|
|
||||||
#include "../typedefs.h"
|
|
||||||
#include <stdint.h>
|
|
||||||
-#ifdef __FreeBSD__
|
|
||||||
#include <time.h>
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
#ifndef __TIME64_T_TYPE
|
|
||||||
#define __TIME64_T_TYPE uint64_t
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
--- a/CMakeLists.txt 2021-02-25 23:45:37.917034534 +0100
|
|
||||||
+++ b/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)
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
# Template file for 'passwordsafe'
|
# Template file for 'passwordsafe'
|
||||||
pkgname=passwordsafe
|
pkgname=passwordsafe
|
||||||
version=1.13.0
|
version=1.16.0
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
build_helper=cmake-wxWidgets-gtk3
|
build_helper=cmake-wxWidgets-gtk3
|
||||||
# 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
|
||||||
@ -14,7 +14,7 @@ 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=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe
|
checksum=6215f7b052480f03276b3ea590b9cdd23180db8d5d4a19185f3df7b6ddba11f8
|
||||||
|
|
||||||
if [ "$XBPS_CHECK_PKGS" ]; then
|
if [ "$XBPS_CHECK_PKGS" ]; then
|
||||||
configure_args+=" -DNO_GTEST=OFF"
|
configure_args+=" -DNO_GTEST=OFF"
|
||||||
@ -23,8 +23,10 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
# ykpers-1 includes are hardcoded, add cross base
|
if [ -n "${CROSS_BUILD}" ]; then
|
||||||
vsed -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" -i CMakeLists.txt
|
# ykpers-1 includes are hardcoded, add cross base
|
||||||
|
vsed -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" -i CMakeLists.txt
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user