Skip to content

Commit

Permalink
passwordsafe: update to 1.08.1BETA
Browse files Browse the repository at this point in the history
  • Loading branch information
yopito committed Jul 5, 2019
1 parent 3529745 commit 669c29a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 13 deletions.
14 changes: 14 additions & 0 deletions srcpkgs/passwordsafe/patches/32bit-and-time64_t.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
32bit platforms (i686, armv7l) also have a struct __time64_t
__TIME64_T_TYPE is a glibc-ism ?

--- src/os/unix/pws_time.h.ORIG 2019-05-05 21:43:08.000000000 +0200
+++ src/os/unix/pws_time.h 2019-07-04 19:29:27.434139040 +0200
@@ -15,7 +15,7 @@
#endif

typedef time_t __time32_t;
-#ifndef __time64_t
+#if !defined(__time64_t) && !defined(__TIME64_T_TYPE)
typedef uint64_t __time64_t;
#endif

22 changes: 9 additions & 13 deletions srcpkgs/passwordsafe/template
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,21 +14,17 @@ 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

# crossbuild already 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
}

do_install() {
Expand All @@ -51,7 +47,7 @@ do_install() {
vman docs/pwsafe.1 passwordsafe.1

# locales
# NB: correspoding locales have to be enabled in /etc/default/libc-locales
# NB: corresponding locales have to be enabled in /etc/default/libc-locales
vmkdir usr/share/locale
vcopy build/src/ui/wxWidgets/I18N/mos/* usr/share/locale
}

0 comments on commit 669c29a

Please sign in to comment.