[gwenhywfar] Fix build with gcc4.7
Bill Nottingham
notting at fedoraproject.org
Thu Jan 19 15:07:01 UTC 2012
commit 569e8ea0f47b2b60b5f82704a32bf90f6096998a
Author: Bill Nottingham <notting at redhat.com>
Date: Thu Jan 19 10:06:31 2012 -0500
Fix build with gcc4.7
gwen-gcc47.patch | 12 ++++++++++++
gwen-open.patch | 30 ------------------------------
gwenhywfar.spec | 7 ++++---
3 files changed, 16 insertions(+), 33 deletions(-)
---
diff --git a/gwen-gcc47.patch b/gwen-gcc47.patch
new file mode 100644
index 0000000..44270ae
--- /dev/null
+++ b/gwen-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up gwenhywfar-4.3.1/gui/qt4/libtest.cpp.foo gwenhywfar-4.3.1/gui/qt4/libtest.cpp
+--- gwenhywfar-4.3.1/gui/qt4/libtest.cpp.foo 2012-01-19 09:59:00.445183383 -0500
++++ gwenhywfar-4.3.1/gui/qt4/libtest.cpp 2012-01-19 09:59:11.796183699 -0500
+@@ -4,6 +4,8 @@
+ #include "qt4_gui.hpp"
+ #include "../testdialogs/dlg_test.h"
+
++#include <unistd.h>
++
+ #include <gwenhywfar/gwenhywfar.h>
+ #include <gwenhywfar/gui.h>
+ #include <gwenhywfar/dialog.h>
diff --git a/gwenhywfar.spec b/gwenhywfar.spec
index a06b217..50e44a9 100644
--- a/gwenhywfar.spec
+++ b/gwenhywfar.spec
@@ -1,13 +1,13 @@
Summary: A multi-platform helper library for other libraries
Name: gwenhywfar
Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
# Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
Source: %{name}-%{version}.tar.gz
Group: System Environment/Libraries
License: LGPLv2+
Patch: gwenhywfar-3.4.1-pkgconfig.patch
-Patch2: gwen-open.patch
+Patch2: gwen-gcc47.patch
URL: http://www.aquamaniac.de/sites/download/packages.php?package=01&showall=1
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnutls-devel gettext libgcrypt-devel openssl-devel
@@ -48,6 +48,7 @@ This package contains the qt4 gwenhywfar GUI backend.
%setup -q
# Port gwenhywfar-config to pkgconfig
%patch -p1 -b .pkgconfig
+%patch2 -p1 -b .gcc47
%build
%configure --disable-static --with-openssl-libs=%{_libdir} \
@@ -108,7 +109,7 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
%{_libdir}/libgwengui-qt4.so.*
%changelog
-* Thu Jan 19 2012 Bill Nottingham <notting at redhat.com> - 4.3.1-1
+* Thu Jan 19 2012 Bill Nottingham <notting at redhat.com> - 4.3.1-2
- update to latest upstream
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.0-2
More information about the scm-commits
mailing list