[fbdesk] Fix FTBFS with gcc-4.8 (#992241, #1106250)
Andreas Bierfert
awjb at fedoraproject.org
Fri Jun 20 15:24:19 UTC 2014
commit 933335ab18320346b2e606927e7a925e46eb8380
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Fri Jun 20 17:24:14 2014 +0200
Fix FTBFS with gcc-4.8 (#992241, #1106250)
fbdesk-gcc48.patch | 10 ++++++++++
fbdesk.spec | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/fbdesk-gcc48.patch b/fbdesk-gcc48.patch
new file mode 100644
index 0000000..fb7fee5
--- /dev/null
+++ b/fbdesk-gcc48.patch
@@ -0,0 +1,10 @@
+--- a/src/FbTk/ImagePNG.cc
++++ b/src/FbTk/ImagePNG.cc
+@@ -29,6 +29,7 @@
+
+ #include <png.h>
+ #include <cstdio>
++#include <cstring>
+ #include <iostream>
+ using namespace std;
+
diff --git a/fbdesk.spec b/fbdesk.spec
index d7f3fe3..95c2671 100644
--- a/fbdesk.spec
+++ b/fbdesk.spec
@@ -1,6 +1,6 @@
Name: fbdesk
Version: 1.4.1
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Icon Manager for Fluxbox
@@ -17,6 +17,8 @@ Patch12: 40-option-v.patch
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng15.patch?revision=1.1
Patch20: fbdesk-libpng15.patch
+Patch30: fbdesk-gcc48.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: freetype-devel
BuildRequires: libpng-devel
@@ -39,6 +41,7 @@ Fluxbox desktop.
%patch11 -p1 -b .cassert
%patch12 -p1
%patch20 -b libpng15
+%patch30 -p1 -b .gcc48
%build
%configure --x-includes=%{_includedir} --x-libraries=%{_libdir}
@@ -63,6 +66,9 @@ Fluxbox desktop.
%changelog
+* Wed Jun 11 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 1.4.1-16
+- Fix FTBFS with gcc-4.8 (#992241, #1106250)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list