passwordsafe: update to 0.98.1BETA
This commit is contained in:
yopito
parent
ebe07634f4
commit
fb33412be5
|
|
@ -1,24 +0,0 @@
|
|||
make LDFLAGS=... discarded internal LDFLAGS see
|
||||
https://github.com/pwsafe/pwsafe/issues/42
|
||||
|
||||
diff -ru pwsafe-0.97BETA/src/ui/wxWidgets/Makefile pwsafe-n/src/ui/wxWidgets/Makefile
|
||||
--- src/ui/wxWidgets/Makefile 2015-10-09 09:35:00.000000000 +0100
|
||||
+++ src/ui/wxWidgets/Makefile 2015-11-23 11:10:08.509509481 +0000
|
||||
@@ -139,7 +139,7 @@
|
||||
XERCESCPPFLAGS=-DUSE_XML_LIBRARY=XERCES -DWCHAR_INCOMPATIBLE_XMLCH
|
||||
XERCESLIBFLAGS=-lxerces-c
|
||||
GCCFLAGS=-fPIC
|
||||
-LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(LDFLAGS)
|
||||
+override LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(LDFLAGS)
|
||||
RESPATH=--include-dir "$(WXWIN)/include" --include-dir "$(WXWIN)/contrib/include" --include-dir "$(WXWIN)/GCCBuildReleaseGTK2Unicode/lib/wx/include/gtk2-unicode-release-static-2.6"
|
||||
MACPACKAGEINFO=
|
||||
endif
|
||||
@@ -155,7 +155,7 @@
|
||||
YBPERS_LIBPATH_FLAGS=-L$(YBPERS_LIBPATH)
|
||||
endif
|
||||
|
||||
-LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(XERCESLIBFLAGS) $(YBPERS_LIBPATH_FLAGS) $(LDFLAGS)
|
||||
+override LDFLAGS:=$(LIBS) -L$(LIBPATH) $(LINKERFLAGS) $(XERCESLIBFLAGS) $(YBPERS_LIBPATH_FLAGS) $(LDFLAGS)
|
||||
CPPFLAGS:=$(CXXFLAGS) $(CPPINC) $(GCCFLAGS) $(DEBUGFLAGS) $(OPTFLAGS) $(WARNINGFLAGS) $(XERCESCPPFLAGS) $(YUBIFLAGS) $(CPPFLAGS)
|
||||
|
||||
SOURCES= passwordsafeframe.cpp \
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
--- 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})
|
||||
|
||||
|
|
@ -1,45 +1,46 @@
|
|||
# Template file for 'passwordwsafe'
|
||||
pkgname=passwordsafe
|
||||
version="0.97BETA"
|
||||
revision=2
|
||||
version="0.98.1BETA"
|
||||
revision=1
|
||||
wrksrc="pwsafe-${version}"
|
||||
build_style=gnu-makefile
|
||||
make_build_target="release help I18N"
|
||||
# Makefile uses perl to generate core_st.cpp, zip to generate help files
|
||||
build_style=cmake
|
||||
configure_args="-D wxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
|
||||
# build process uses perl to generate core_st.cpp and zip to generate help files
|
||||
hostmakedepends="perl wxWidgets-devel zip pkg-config gettext"
|
||||
makedepends="wxWidgets-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel libykpers-devel"
|
||||
makedepends="wxWidgets-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel libykpers-devel gtest-devel"
|
||||
short_desc="Simple & Secure Password Management"
|
||||
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
|
||||
license="Artistic-2.0"
|
||||
homepage="http://pwsafe.org"
|
||||
distfiles="https://github.com/pwsafe/pwsafe/releases/download/${version}/pwsafe-${version}-src.tgz"
|
||||
checksum=f1cdbdda7ef795d974772e40a0d040deb296c110ded1bd05a524a6baa152a9a8
|
||||
checksum=d44bd032ac92503b118e59c19d6d8cccae85e4abe3561f72a4ae58bffd33e2a5
|
||||
# wxWidgets is nocross
|
||||
nocross=yes
|
||||
|
||||
do_install() {
|
||||
# use 'passwordsafe' in filenames as much as possible.
|
||||
vbin src/ui/wxWidgets/GCCUnicodeRelease/pwsafe passwordsafe
|
||||
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
|
||||
# 0.97BETA: localized help files are useless
|
||||
# without locales (see below).
|
||||
# keep only english help file.
|
||||
#for f in help/help*.zip; do
|
||||
# XXX 0.98BETA: 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
|
||||
#done
|
||||
vinstall help/helpEN.zip 644 usr/share/passwordsafe/help
|
||||
# XML files
|
||||
vinstall build/help/helpEN.zip 644 usr/share/passwordsafe/help
|
||||
|
||||
# XML files (format converters)
|
||||
vcopy xml usr/share/${pkgname}
|
||||
|
||||
vlicense LICENSE
|
||||
vdoc docs/config.txt
|
||||
vman docs/pwsafe.1 passwordsafe.1
|
||||
# 0.97BETA: no locales.
|
||||
# runtime crash on language change in GUI,
|
||||
# and additional entries appears in data file.
|
||||
#vmkdir usr/share/locale
|
||||
#vcopy src/ui/wxWidgets/I18N/mos/* usr/share/locale
|
||||
}
|
||||
|
||||
# locales
|
||||
# XXX 0.98BETA: no locales: error messages on loading, can't revert easily.
|
||||
#vmkdir usr/share/locale
|
||||
#vcopy build/src/ui/wxWidgets/I18N/mos/* usr/share/locale
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue