Patch GCC6 compilation error from void function returning a value (#1308262)

This commit is contained in:
Greg Bailey 2016-04-14 09:13:20 -07:00
parent 53d8e10802
commit 5e36ff9d75
2 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff -uNr yapet-1.0.orig/yapet/cfg.h yapet-1.0/yapet/cfg.h
--- yapet-1.0.orig/yapet/cfg.h 2014-02-23 10:18:41.000000000 -0700
+++ yapet-1.0/yapet/cfg.h 2016-04-14 07:06:49.665672169 -0700
@@ -163,7 +163,7 @@
locked = false;
}
- void is_locked() const {
+ bool is_locked() const {
return locked;
}

View File

@ -2,7 +2,7 @@
Name: yapet
Version: 1.0
Release: 6%{?pre}%{?dist}
Release: 7%{?pre}%{?dist}
Summary: Yet Another Password Encryption Tool
License: GPLv3+ with exceptions
URL: http://www.guengel.ch/myapps/%{name}/
@ -11,6 +11,8 @@ BuildRequires: gettext
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
Patch0: bz1308262-gcc6-void-fn-returns-value.patch
%description
YAPET is a text based password manager using the Blowfish encryption algorithm.
Because of its small footprint and very few library dependencies, it is suited
@ -19,6 +21,9 @@ for installing on desktop and server systems alike.
%prep
%setup -qn %{name}-%{version}%{?pre}
# https://bugs.guengel.ch/show_bug.cgi?id=112
%patch0 -p1
for f in ./DESIGN ./README
do
iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
@ -30,7 +35,7 @@ done
%configure --disable-install-doc \
--disable-source-doc \
--disable-install-doci \
--disable-silent-rules
--disable-silent-rules
%make_build
@ -57,6 +62,9 @@ rm -frv %{buildroot}%{_docdir}
%{_mandir}/man*/*yapet*
%changelog
* Thu Apr 14 2016 Greg Bailey <gbailey@lxpro.com> - 1.0-7
- Patch GCC6 compilation error from void function returning a value (#1308262)
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild