[kid3] Fix build with g++ 4.7.0.

Ville Skyttä scop at fedoraproject.org
Wed Jan 4 20:42:57 UTC 2012


commit 66c39b6a6973dd7c70b882ca0ba3c4ca70df5729
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Jan 4 22:42:47 2012 +0200

    Fix build with g++ 4.7.0.

 ...-with-g-4.7.0-include-unistd.h-for-getpid.patch |   26 ++++++++++++++++++++
 kid3.spec                                          |    8 +++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-build-with-g-4.7.0-include-unistd.h-for-getpid.patch b/0001-Fix-build-with-g-4.7.0-include-unistd.h-for-getpid.patch
new file mode 100644
index 0000000..16d9468
--- /dev/null
+++ b/0001-Fix-build-with-g-4.7.0-include-unistd.h-for-getpid.patch
@@ -0,0 +1,26 @@
+From 25e0c792aa3f42435a547319ab2835f97bf2f8af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Wed, 4 Jan 2012 22:33:50 +0200
+Subject: [PATCH] Fix build with g++ 4.7.0 (include unistd.h for ::getpid).
+
+This is the PR49745 case mentioned in
+http://article.gmane.org/gmane.linux.redhat.fedora.devel/157671
+---
+ src/core/model/kid3application.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/core/model/kid3application.cpp b/src/core/model/kid3application.cpp
+index 9205306..624a912 100644
+--- a/src/core/model/kid3application.cpp
++++ b/src/core/model/kid3application.cpp
+@@ -37,6 +37,7 @@
+ #endif
+ #ifdef HAVE_QTDBUS
+ #include <QDBusConnection>
++#include <unistd.h>
+ #include "scriptinterface.h"
+ #endif
+ #include "fileproxymodel.h"
+-- 
+1.7.7.5
+
diff --git a/kid3.spec b/kid3.spec
index 3b21922..ead71c8 100644
--- a/kid3.spec
+++ b/kid3.spec
@@ -1,11 +1,13 @@
 Name:           kid3
 Version:        2.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient KDE ID3 tag editor
 
 License:        GPLv2+
 URL:            http://kid3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
+# Sent upstream 2012-01-04
+Patch0:         0001-Fix-build-with-g-4.7.0-include-unistd.h-for-getpid.patch
 
 BuildRequires:  kdelibs4-devel
 BuildRequires:  cmake
@@ -40,6 +42,7 @@ dependencies.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -134,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Jan  4 2012 Ville Skyttä <ville.skytta at iki.fi> - 2.0.1-2
+- Fix build with g++ 4.7.0.
+
 * Fri Nov  4 2011 Ville Skyttä <ville.skytta at iki.fi> - 2.0.1-1
 - Update to 2.0.1.
 


More information about the scm-commits mailing list