From 90c4cae2e23090f7553cc1d58d5f4ac5f0239eed Mon Sep 17 00:00:00 2001 From: yopito Date: Sat, 11 Feb 2023 17:29:51 +0100 Subject: [PATCH] passwordsafe: update to 1.16.0 --- srcpkgs/passwordsafe/patches/time.h.patch | 43 ------------------- .../patches/use-gtest-from-package.patch | 37 ---------------- srcpkgs/passwordsafe/template | 12 +++--- 3 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 srcpkgs/passwordsafe/patches/time.h.patch delete mode 100644 srcpkgs/passwordsafe/patches/use-gtest-from-package.patch diff --git a/srcpkgs/passwordsafe/patches/time.h.patch b/srcpkgs/passwordsafe/patches/time.h.patch deleted file mode 100644 index 7baa5c800cd9..000000000000 --- a/srcpkgs/passwordsafe/patches/time.h.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d8e7ec230e5cd4fa67aff4d6227d73dd9ddb37dd Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 30 Jun 2022 21:34:29 +0000 -Subject: [PATCH] Fix build with GCC 12 (missing 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 --#ifdef __FreeBSD__ - #include --#endif - - #ifndef __TIME64_T_TYPE - #define __TIME64_T_TYPE uint64_t diff --git a/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch b/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch deleted file mode 100644 index a33c623d5424..000000000000 --- a/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch +++ /dev/null @@ -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) diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 3946dd3acb11..5f3383a86522 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,7 +1,7 @@ # Template file for 'passwordsafe' pkgname=passwordsafe -version=1.13.0 -revision=2 +version=1.16.0 +revision=1 build_style=cmake build_helper=cmake-wxWidgets-gtk3 # build process uses perl to generate core_st.cpp and zip to generate help files @@ -14,7 +14,7 @@ maintainer="Rui Abreu Ferreira " license="Artistic-2.0" homepage="https://pwsafe.org" distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz" -checksum=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe +checksum=6215f7b052480f03276b3ea590b9cdd23180db8d5d4a19185f3df7b6ddba11f8 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DNO_GTEST=OFF" @@ -23,8 +23,10 @@ else fi pre_configure() { - # ykpers-1 includes are hardcoded, add cross base - vsed -e "s|-I\(/usr/include/ykpers-1\)|-I${XBPS_CROSS_BASE}\1|" -i CMakeLists.txt + if [ ${CROSS_BUILD} ]; then + # 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() {