From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] passwordsafe: update to 1.08.1BETA
Date: Sat, 06 Jul 2019 00:42:35 +0200 [thread overview]
Message-ID: <20190705224235.58PeiIOhOgpUD9A2kbb4jg40-LS-FFdmzL40EvPEHRM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11854@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages passwordsafe.1.08.1
https://github.com/void-linux/void-packages/pull/11854
[WIP] passwordsafe: update to 1.08.1BETA
A patch file from https://github.com/void-linux/void-packages/pull/11854.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-passwordsafe.1.08.1-11854.patch --]
[-- Type: application/text/x-diff, Size: 3653 bytes --]
From 4ab3cbeef1b1e86a87347b0c2816ab8fb24a0a36 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Fri, 5 Jul 2019 23:54:20 +0200
Subject: [PATCH] passwordsafe: update to 1.08.1BETA
---
srcpkgs/passwordsafe/patches/__time64_t.patch | 22 ++++++++++
srcpkgs/passwordsafe/template | 43 +++++--------------
2 files changed, 33 insertions(+), 32 deletions(-)
create mode 100644 srcpkgs/passwordsafe/patches/__time64_t.patch
diff --git a/srcpkgs/passwordsafe/patches/__time64_t.patch b/srcpkgs/passwordsafe/patches/__time64_t.patch
new file mode 100644
index 00000000000..45b00da201e
--- /dev/null
+++ b/srcpkgs/passwordsafe/patches/__time64_t.patch
@@ -0,0 +1,22 @@
+related issue: https://github.com/pwsafe/pwsafe/issues/563
+
+commit 497246d4beffcd9347b443b1622e4ea64a7b389c
+Author: ronys <ronys@pwsafe.org>
+Date: Fri Jul 5 22:23:28 2019 +0300
+
+ Fix GH563: broken build on 32 bit gcc 9.1
+
+diff --git src/os/unix/pws_time.h src/os/unix/pws_time.h
+index 4be9ffb90..683cb48b9 100644
+--- src/os/unix/pws_time.h
++++ src/os/unix/pws_time.h
+@@ -14,8 +14,7 @@
+ #include <time.h>
+ #endif
+
+-typedef time_t __time32_t;
+-#ifndef __time64_t
++#if !defined(__time64_t) && !defined(__TIME64_T_TYPE)
+ typedef uint64_t __time64_t;
+ #endif
+
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 060338551e1..986de16cfe7 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,6 +1,6 @@
# Template file for 'passwordsafe'
pkgname=passwordsafe
-version=1.07BETA
+version=1.08.1BETA
revision=1
wrksrc="pwsafe-${version}"
build_style=cmake
@@ -14,44 +14,23 @@ 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=242c06a9b2685e09fcefa4c8fca09a3f7ab3c38f338e2ca067992e072bdbe2d4
+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
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
- # workaround for cmake to find wx-config-gtk3
- # can be removed once there is only one 'wx-config'
- if [ "$CROSS_BUILD" ]; then
- # cannot override wxWidgets_CONFIG_EXECUTABLE set in
- # the cross toolchain file otherwise
- ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
- else
- sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
- fi
+ # icons in right place
+ sed -i -e "s|share/pixmaps|share/icons/hicolor/48x48/apps|" CMakeLists.txt
}
-do_install() {
- # use 'passwordsafe' in filenames as much as possible.
- vbin build/pwsafe passwordsafe
- vinstall install/desktop/pwsafe.desktop 644 usr/share/applications passwordsafe.desktop
- vinstall install/graphics/pwsafe.png 644 usr/share/icons/hicolor/48x48/apps passwordsafe.png
- sed -i -e 's,^\(Exec\|Icon\)=.*,\1=passwordsafe,' ${DESTDIR}/usr/share/applications/passwordsafe.desktop
-
- # Help files
- for f in build/help/help*.zip; do
- vinstall $f 644 usr/share/${pkgname}/help
- done
-
- # XML files (format converters)
- vcopy xml usr/share/${pkgname}
-
+post_install() {
vlicense LICENSE
vdoc docs/config.txt
- vman docs/pwsafe.1 passwordsafe.1
-
- # locales
- # NB: correspoding locales have to be enabled in /etc/default/libc-locales
- vmkdir usr/share/locale
- vcopy build/src/ui/wxWidgets/I18N/mos/* usr/share/locale
}
next prev parent reply other threads:[~2019-07-05 22:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11854@inbox.vuxu.org>
2019-07-05 5:21 ` voidlinux-github
2019-07-05 5:21 ` voidlinux-github
2019-07-05 5:45 ` voidlinux-github
2019-07-05 6:47 ` voidlinux-github
2019-07-05 7:57 ` voidlinux-github
2019-07-05 7:59 ` voidlinux-github
2019-07-05 22:42 ` [PR PATCH] [Updated] " voidlinux-github
2019-07-05 22:42 ` voidlinux-github [this message]
2019-07-06 10:51 ` voidlinux-github
2019-07-13 3:14 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190705224235.58PeiIOhOgpUD9A2kbb4jg40-LS-FFdmzL40EvPEHRM@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).