[soprano] backport upstream gcc47 fix

Rex Dieter rdieter at fedoraproject.org
Sun Jan 15 00:06:36 UTC 2012


commit 299b5a1042f44e5277617e5df4f3269893bed2f7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jan 14 18:06:32 2012 -0600

    backport upstream gcc47 fix

 soprano-4.7.4-gcc47.patch |   11 +++++++++++
 soprano.spec              |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/soprano-4.7.4-gcc47.patch b/soprano-4.7.4-gcc47.patch
new file mode 100644
index 0000000..5192535
--- /dev/null
+++ b/soprano-4.7.4-gcc47.patch
@@ -0,0 +1,11 @@
+diff -up soprano-2.7.4/backends/virtuoso/virtuosocontroller.cpp.gcc47 soprano-2.7.4/backends/virtuoso/virtuosocontroller.cpp
+--- soprano-2.7.4/backends/virtuoso/virtuosocontroller.cpp.gcc47	2011-12-02 09:27:49.000000000 -0600
++++ soprano-2.7.4/backends/virtuoso/virtuosocontroller.cpp	2012-01-14 18:02:02.835113403 -0600
+@@ -39,6 +39,7 @@
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <sys/wait.h>
++#include <unistd.h>
+ #endif
+ 
+ Q_DECLARE_METATYPE( QProcess::ExitStatus )
diff --git a/soprano.spec b/soprano.spec
index 5f06f74..2109e72 100644
--- a/soprano.spec
+++ b/soprano.spec
@@ -8,7 +8,7 @@
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
 Version: 2.7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -26,6 +26,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # nuke rpaths
 Patch50: soprano-2.5.63-rpath.patch
 
+## upstream patches
+Patch100: soprano-2.7.4-gcc47.patch
+
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
 BuildRequires: kde-filesystem
@@ -111,6 +114,7 @@ format for easy browsing.
 %setup -q -n soprano-%{version}
 
 %patch50 -p1 -b .rpath
+%patch100 -p1 -b .gcc47
 
 
 %build
@@ -222,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 14 2012 Rex Dieter <rdieter at fedoraproject.org> 2.7.4-3
+- backport upstream gcc47 fix
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list