[qtsingleapplication] gcc-4.7 compilation fix
Orcan Ogetbil
oget at fedoraproject.org
Wed Jan 11 13:19:33 UTC 2012
commit e043be0d3acbc2300b01b0275637b1189568f312
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Wed Jan 11 08:19:31 2012 -0500
gcc-4.7 compilation fix
qtsingleapplication-gcc47.patch | 11 +++++++++++
qtsingleapplication.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/qtsingleapplication-gcc47.patch b/qtsingleapplication-gcc47.patch
new file mode 100644
index 0000000..a01143e
--- /dev/null
+++ b/qtsingleapplication-gcc47.patch
@@ -0,0 +1,11 @@
+diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
+--- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp 2012-01-11 08:15:08.000000000 -0500
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2012-01-11 08:17:36.874461946 -0500
+@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdT
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+
+ const char* QtLocalPeer::ack = "ack";
diff --git a/qtsingleapplication.spec b/qtsingleapplication.spec
index acb817c..b80c3db 100644
--- a/qtsingleapplication.spec
+++ b/qtsingleapplication.spec
@@ -4,7 +4,7 @@
Summary: Qt library to start applications only once per user
Name: qtsingleapplication
Version: 2.6.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Libraries
License: GPLv3 or LGPLv2 with exceptions
URL: http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsingleapplication
@@ -21,6 +21,8 @@ Patch1: qtsingleapplication-dont-bundle-external-libs.patch
# Additional API for building clementine
# http://bugreports.qt.nokia.com/browse/QTSOLBUG-133
Patch2: qtsingleapplication-add-api.patch
+# gcc-4.7 compilation fix
+Patch3: qtsingleapplication-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
BuildRequires: qtlockedfile-devel
@@ -76,6 +78,7 @@ that use QtSingleCoreApplication.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# We already disabled bundling this extrenal library.
# But just to make sure:
@@ -149,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
%{_qt4_datadir}/mkspecs/features/qtsinglecoreapplication.prf
%changelog
+* Wed Jan 11 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 2.6.1-6
+- gcc-4.7 compilation fix
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list