[packages/kde4-kopete] - fix building with gcc 6 - rel 7

baggins baggins at pld-linux.org
Fri Mar 3 21:34:51 CET 2017


commit 0d3c19fca8a0820d02950e9336671fa8aca6c92b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 3 21:34:36 2017 +0100

    - fix building with gcc 6
    - rel 7

 gcc6.patch       | 11 +++++++++++
 kde4-kopete.spec |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kopete.spec b/kde4-kopete.spec
index 48f3675..c19dc8d 100644
--- a/kde4-kopete.spec
+++ b/kde4-kopete.spec
@@ -9,7 +9,7 @@ Summary:	Multi-protocol plugin-based instant messenger
 Summary(pl.UTF-8):	Komunikator obsługujący wiele protokołów
 Name:		kde4-kopete
 Version:	4.14.3
-Release:	6
+Release:	7
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -17,6 +17,7 @@ Source0:	http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.
 Patch0:		%{name}-FindLibgadu.patch
 Patch1:		linphone-fix.patch
 Patch2:		mediastreamer.patch
+Patch3:		gcc6.patch
 URL:		http://www.kde.org/
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	kde4-kdebase-devel >= %{version}
@@ -142,6 +143,7 @@ do kopete.
 %patch0 -p1
 #%patch1 -p2
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
diff --git a/gcc6.patch b/gcc6.patch
new file mode 100644
index 0000000..09a0cd5
--- /dev/null
+++ b/gcc6.patch
@@ -0,0 +1,11 @@
+--- kopete-4.14.3/plugins/history2/history2logger.h~	2014-11-02 12:16:53.000000000 +0100
++++ kopete-4.14.3/plugins/history2/history2logger.h	2017-03-03 21:31:28.093485234 +0100
+@@ -94,7 +94,7 @@
+ 	 * from Kopete::Contact @param c in the given @param sens
+ 	 */
+ 	QList<Kopete::Message> readMessages(int lines,
+-	                                    int offset=0, const Kopete::MetaContact *c=false, bool reverseOrder=true);
++	                                    int offset=0, const Kopete::MetaContact *c=0L, bool reverseOrder=true);
+ 
+ 	/**
+ 	 * Same as the following, but for one date. I did'nt reuse the above function
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kopete.git/commitdiff/0d3c19fca8a0820d02950e9336671fa8aca6c92b



More information about the pld-cvs-commit mailing list