From 534e5c623f6624aa4797d46918ad9fe101f08cb1 Mon Sep 17 00:00:00 2001 From: yopito Date: Wed, 20 Jul 2016 20:53:35 +0200 Subject: [PATCH] passwordsafe: update to 0.99BETA --- .../passwordsafe-0.98.1-fix-cmake-wx-config.patch | 10 ---------- ...atch => passwordsafe-0.99-fix-resource-paths.patch} | 6 +++--- srcpkgs/passwordsafe/template | 10 +++++----- 3 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 srcpkgs/passwordsafe/patches/passwordsafe-0.98.1-fix-cmake-wx-config.patch rename srcpkgs/passwordsafe/patches/{passwordsafe-0.97-fix-resource-paths.patch => passwordsafe-0.99-fix-resource-paths.patch} (64%) diff --git a/srcpkgs/passwordsafe/patches/passwordsafe-0.98.1-fix-cmake-wx-config.patch b/srcpkgs/passwordsafe/patches/passwordsafe-0.98.1-fix-cmake-wx-config.patch deleted file mode 100644 index 6e7385c98a8..00000000000 --- a/srcpkgs/passwordsafe/patches/passwordsafe-0.98.1-fix-cmake-wx-config.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2016-03-05 21:54:02.000000000 +0100 -+++ CMakeLists.txt 2016-03-15 13:22:20.858445170 +0100 -@@ -25,7 +25,6 @@ - - if (NOT WIN32) - # TODO - add support for wx build under Windows -- set(wxWidgets_CONFIGURATION mswu) - find_package(wxWidgets COMPONENTS adv base core html net REQUIRED) - include(${wxWidgets_USE_FILE}) - diff --git a/srcpkgs/passwordsafe/patches/passwordsafe-0.97-fix-resource-paths.patch b/srcpkgs/passwordsafe/patches/passwordsafe-0.99-fix-resource-paths.patch similarity index 64% rename from srcpkgs/passwordsafe/patches/passwordsafe-0.97-fix-resource-paths.patch rename to srcpkgs/passwordsafe/patches/passwordsafe-0.99-fix-resource-paths.patch index 05adc3290d9..90a27c7d10c 100644 --- a/srcpkgs/passwordsafe/patches/passwordsafe-0.97-fix-resource-paths.patch +++ b/srcpkgs/passwordsafe/patches/passwordsafe-0.99-fix-resource-paths.patch @@ -1,6 +1,6 @@ ---- src/os/linux/dir.cpp.orig 2015-10-09 10:35:00.000000000 +0200 -+++ src/os/linux/dir.cpp 2015-11-18 12:40:54.216572503 +0100 -@@ -151,10 +151,10 @@ +--- src/os/unix/dir.cpp.orig 2016-07-03 20:48:33.000000000 +0200 ++++ src/os/unix/dir.cpp 2016-07-20 21:03:49.299919267 +0200 +@@ -174,10 +174,10 @@ stringT pws_os::getxmldir(void) { diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 2fb9c4f3bc9..50be5e52d2c 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -1,6 +1,6 @@ # Template file for 'passwordwsafe' pkgname=passwordsafe -version="0.98.1BETA" +version="0.99BETA" revision=1 wrksrc="pwsafe-${version}" build_style=cmake @@ -12,8 +12,8 @@ short_desc="Simple & Secure Password Management" maintainer="Rui Abreu Ferreira " license="Artistic-2.0" homepage="http://pwsafe.org" -distfiles="https://github.com/pwsafe/pwsafe/releases/download/${version}/pwsafe-${version}-src.tgz" -checksum=d44bd032ac92503b118e59c19d6d8cccae85e4abe3561f72a4ae58bffd33e2a5 +distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz>pwsafe-${version}.tar.gz" +checksum=d5369fe83e44dc5a3feb850b8bfb91d42a9ca11256470a561dd91c37c952571f # wxWidgets is nocross nocross=yes @@ -25,7 +25,7 @@ do_install() { sed -i -e 's,^\(Exec\|Icon\)=.*,\1=passwordsafe,' ${DESTDIR}/usr/share/applications/passwordsafe.desktop # Help files - # XXX 0.98BETA: localized help files are useless without locales (see below). + # XXX 0.99BETA: localized help files are useless without locales (see below). # keep only english help file. #for f in build/help/help*.zip; do # vinstall $f 644 usr/share/${pkgname}/help @@ -40,7 +40,7 @@ do_install() { vman docs/pwsafe.1 passwordsafe.1 # locales - # XXX 0.98BETA: no locales: error messages on loading, can't revert easily. + # XXX 0.99BETA: no locales: error messages on loading, can't revert easily. #vmkdir usr/share/locale #vcopy build/src/ui/wxWidgets/I18N/mos/* usr/share/locale }