[pidgin-sipe] add upstream patch to fix GCC 5.0 compilation errors
stefanb
stefanb at fedoraproject.org
Sun Feb 8 11:00:44 UTC 2015
commit e83f6b2a00075dbf42040014b5136cec9529ff7f
Author: Stefan Becker <chemobejk at gmail.com>
Date: Sun Feb 8 13:00:27 2015 +0200
add upstream patch to fix GCC 5.0 compilation errors
pidgin-sipe-1.19.0-gcc-5.patch | 65 ++++++++++++++++++++++++++++++++++++++++
pidgin-sipe.spec | 7 ++++-
2 files changed, 71 insertions(+), 1 deletions(-)
---
diff --git a/pidgin-sipe-1.19.0-gcc-5.patch b/pidgin-sipe-1.19.0-gcc-5.patch
new file mode 100644
index 0000000..c47a831
--- /dev/null
+++ b/pidgin-sipe-1.19.0-gcc-5.patch
@@ -0,0 +1,65 @@
+From 6970ccf3b6797c67fe8b234edacbac21b6d16f94 Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk at gmail.com>
+Date: Sun, 8 Feb 2015 12:07:24 +0200
+Subject: [PATCH] purple: update conditionals for GCC 5.0
+
+---
+ src/purple/purple-media.c | 6 ++++--
+ src/purple/purple-plugin.c | 6 +++---
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/purple/purple-media.c b/src/purple/purple-media.c
+index a4eae88..e85a3d4 100644
+--- a/src/purple/purple-media.c
++++ b/src/purple/purple-media.c
+@@ -3,7 +3,7 @@
+ *
+ * pidgin-sipe
+ *
+- * Copyright (C) 2010-12 SIPE Project <http://sipe.sourceforge.net/>
++ * Copyright (C) 2010-15 SIPE Project <http://sipe.sourceforge.net/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -52,11 +52,13 @@
+ *
+ * Diagnostic #pragma was added in GCC 4.2.0
+ */
+-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 2)
++#if defined(__GNUC__)
++#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || (__GNUC__ >= 5)
+ #if defined(__ARMEL__) || defined(__ARMEB__) || defined(__mips__) || defined(__sparc__) || (defined(__powerpc__) && defined(__NO_FPRS__))
+ #pragma GCC diagnostic ignored "-Wcast-align"
+ #endif
+ #endif
++#endif
+
+ #include "media-gst.h"
+
+diff --git a/src/purple/purple-plugin.c b/src/purple/purple-plugin.c
+index f1172f0..f246522 100644
+--- a/src/purple/purple-plugin.c
++++ b/src/purple/purple-plugin.c
+@@ -625,8 +625,8 @@ static PurpleMediaCaps sipe_purple_get_media_caps(SIPE_UNUSED_PARAMETER PurpleAc
+ * Diagnostic push/pop was added in GCC 4.6.0
+ */
+ #ifdef __GNUC__
+-#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 2)
+-#if __GNUC_MINOR__ >= 6
++#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || (__GNUC__ >= 5)
++#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ >= 5)
+ #pragma GCC diagnostic push
+ #endif
+ #pragma GCC diagnostic warning "-Wmissing-field-initializers"
+@@ -739,7 +739,7 @@ static PurplePluginProtocolInfo sipe_prpl_info =
+ #endif
+ };
+ #ifdef __GNUC__
+-#if (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6)
++#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ >= 5)
+ #pragma GCC diagnostic pop
+ #endif
+ #endif
+--
+2.1.0
+
diff --git a/pidgin-sipe.spec b/pidgin-sipe.spec
index cc46b9b..708fdfa 100644
--- a/pidgin-sipe.spec
+++ b/pidgin-sipe.spec
@@ -1,12 +1,13 @@
Name: pidgin-sipe
Version: 1.19.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Pidgin protocol plugin to connect to MS Office Communicator
Group: Applications/Internet
License: GPLv2+
URL: http://sipe.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-%{version}/pidgin-sipe-%{version}.tar.bz2
+Patch0: pidgin-sipe-1.19.0-gcc-5.patch
BuildRequires: pkgconfig(glib-2.0) >= 2.12.0
BuildRequires: pkgconfig(gmodule-2.0) >= 2.12.0
@@ -63,6 +64,7 @@ This package provides the protocol plugin for libpurple clients.
%prep
%setup -q
+%patch0 -p1 -b .gcc-5
%build
@@ -101,6 +103,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Feb 08 2015 Stefan Becker <chemobejk at gmail.com> - 1.19.0-2
+- add upstream patch to fix GCC 5.0 compilation errors on F22+
+
* Sat Feb 07 2015 Stefan Becker <chemobejk at gmail.com> - 1.19.0-1
- update to 1.19.0:
- added support for automatic authentication scheme selection
More information about the scm-commits
mailing list