* Re: [PR PATCH] [Updated] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
@ 2023-01-31 23:02 ` yopito
2023-02-01 21:08 ` yopito
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: yopito @ 2023-01-31 23:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages passwordsafe.1.16
https://github.com/void-linux/void-packages/pull/41986
passwordsafe: update to 1.16.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture : **x86_64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
- [x] aarch64 (glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-passwordsafe.1.16-41986.patch --]
[-- Type: text/x-diff, Size: 5881 bytes --]
From 9036944646dc65787ca1003c00de481b26f32fde Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Tue, 31 Jan 2023 06:41:16 +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 | 13 +++---
3 files changed, 8 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 <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
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..56af0d6db760 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,9 +1,10 @@
# 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
+configure_args="-DGTEST_BUILD=OFF"
# 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
@@ -14,7 +15,7 @@ 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=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe
+checksum=6215f7b052480f03276b3ea590b9cdd23180db8d5d4a19185f3df7b6ddba11f8
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DNO_GTEST=OFF"
@@ -23,8 +24,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() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
2023-01-31 23:02 ` [PR PATCH] [Updated] " yopito
@ 2023-02-01 21:08 ` yopito
2023-02-11 5:35 ` [PR REVIEW] " classabbyamp
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: yopito @ 2023-02-01 21:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages passwordsafe.1.16
https://github.com/void-linux/void-packages/pull/41986
passwordsafe: update to 1.16.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture : **x86_64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
- [x] aarch64 (glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-passwordsafe.1.16-41986.patch --]
[-- Type: text/x-diff, Size: 5880 bytes --]
From 59b2e7ac8c54f1fa1843de9b51551213c3e5fece Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 1 Feb 2023 22:08:05 +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 | 13 +++---
3 files changed, 8 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 <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
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..56af0d6db760 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,9 +1,10 @@
# 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
+configure_args="-DGTEST_BUILD=OFF"
# 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
@@ -14,7 +15,7 @@ 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=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe
+checksum=6215f7b052480f03276b3ea590b9cdd23180db8d5d4a19185f3df7b6ddba11f8
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DNO_GTEST=OFF"
@@ -23,8 +24,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() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR REVIEW] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
2023-01-31 23:02 ` [PR PATCH] [Updated] " yopito
2023-02-01 21:08 ` yopito
@ 2023-02-11 5:35 ` classabbyamp
2023-02-11 5:36 ` classabbyamp
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2023-02-11 5:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41986#discussion_r1103530878
Comment:
```suggestion
if [ -n "${CROSS_BUILD}" ]; then
```
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR REVIEW] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
` (2 preceding siblings ...)
2023-02-11 5:35 ` [PR REVIEW] " classabbyamp
@ 2023-02-11 5:36 ` classabbyamp
2023-02-11 16:27 ` yopito
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2023-02-11 5:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41986#discussion_r1103530878
Comment:
this conditional is not needed, XBPS_CROSS_BASE is an empty string on non-cross
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR REVIEW] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
` (3 preceding siblings ...)
2023-02-11 5:36 ` classabbyamp
@ 2023-02-11 16:27 ` yopito
2023-02-11 16:30 ` [PR PATCH] [Updated] " yopito
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: yopito @ 2023-02-11 16:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New review comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/41986#discussion_r1103655164
Comment:
yes but if XBPS_CROSS_BASE is empty, `vsed` errors because nothing changed
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
` (4 preceding siblings ...)
2023-02-11 16:27 ` yopito
@ 2023-02-11 16:30 ` yopito
2023-02-11 16:31 ` yopito
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: yopito @ 2023-02-11 16:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages passwordsafe.1.16
https://github.com/void-linux/void-packages/pull/41986
passwordsafe: update to 1.16.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture : **x86_64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
- [x] aarch64 (glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-passwordsafe.1.16-41986.patch --]
[-- Type: text/x-diff, Size: 5704 bytes --]
From 90c4cae2e23090f7553cc1d58d5f4ac5f0239eed Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
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 <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
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 <raf-ep@gmx.com>"
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() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
` (5 preceding siblings ...)
2023-02-11 16:30 ` [PR PATCH] [Updated] " yopito
@ 2023-02-11 16:31 ` yopito
2023-02-11 18:13 ` [PR REVIEW] " classabbyamp
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: yopito @ 2023-02-11 16:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/41986#issuecomment-1426815478
Comment:
forced push to remove redundant stuff on `configure_args`
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR REVIEW] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
` (6 preceding siblings ...)
2023-02-11 16:31 ` yopito
@ 2023-02-11 18:13 ` classabbyamp
2023-02-11 22:40 ` [PR PATCH] [Updated] " yopito
2023-02-11 23:08 ` [PR PATCH] [Merged]: " classabbyamp
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2023-02-11 18:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41986#discussion_r1103674185
Comment:
ok then i would suggest
```suggestion
if [ -n "${CROSS_BUILD}" ]; then
```
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
` (7 preceding siblings ...)
2023-02-11 18:13 ` [PR REVIEW] " classabbyamp
@ 2023-02-11 22:40 ` yopito
2023-02-11 23:08 ` [PR PATCH] [Merged]: " classabbyamp
9 siblings, 0 replies; 11+ messages in thread
From: yopito @ 2023-02-11 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages passwordsafe.1.16
https://github.com/void-linux/void-packages/pull/41986
passwordsafe: update to 1.16.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture : **x86_64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
- [x] aarch64 (glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-passwordsafe.1.16-41986.patch --]
[-- Type: text/x-diff, Size: 5709 bytes --]
From d04b0220e47ad4912b7adcf625c414c0cc0ffca9 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 11 Feb 2023 23:40:30 +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 <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
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..88ffa41f474b 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 <raf-ep@gmx.com>"
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 [ -n "${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() {
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Merged]: passwordsafe: update to 1.16.0
2023-01-31 7:41 [PR PATCH] passwordsafe: update to 1.16.0 yopito
` (8 preceding siblings ...)
2023-02-11 22:40 ` [PR PATCH] [Updated] " yopito
@ 2023-02-11 23:08 ` classabbyamp
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2023-02-11 23:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
There's a merged pull request on the void-packages repository
passwordsafe: update to 1.16.0
https://github.com/void-linux/void-packages/pull/41986
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture : **x86_64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
- [x] aarch64 (glibc)
^ permalink raw reply [flat|nested] 11+ messages in thread