[SCM] KTorrent Debian packaging. branch, experimental, updated. debian/4.3.1-5

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/ktorrent.git;a=commitdiff;h=bffdfb4

The following commit has been merged in the experimental branch:
commit bffdfb4690226d99c92a9109db4c04ef89790d8e
Author: Pino Toscano <pino at debian.org>
Date:   Sun Feb 14 16:46:02 2016 +0100

    fix build with GCC 6 (#811942)
    
    backport upstream commit e22c887b55ec5e83db959c3b98d448947c886cc0
---
 debian/changelog                                   |  4 ++
 debian/patches/series                              |  1 +
 ...e-rename-major-minor-to-major_version-min.patch | 69 ++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 44c9fc4..f7f251f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ ktorrent (4.3.1-4) UNRELEASED; urgency=medium
   * Remove the README.Debian file, since all the information it contains are
     long obsolete.
   * Restore the krosspython suggest in ktorrent, removed in 4.3.1-3.
+  * Backport upstream commit e22c887b55ec5e83db959c3b98d448947c886cc0 to fix
+    build with GCC 6; patch
+    upstream_webinterface-rename-major-minor-to-major_version-min.patch.
+    (Closes: #811942)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 14 Feb 2016 15:11:00 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index c26a73a..c7a56c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 dont_link_with_kutils.patch
 kubuntu_magnet-mimetype.diff
+upstream_webinterface-rename-major-minor-to-major_version-min.patch
diff --git a/debian/patches/upstream_webinterface-rename-major-minor-to-major_version-min.patch b/debian/patches/upstream_webinterface-rename-major-minor-to-major_version-min.patch
new file mode 100644
index 0000000..e0c0d64
--- /dev/null
+++ b/debian/patches/upstream_webinterface-rename-major-minor-to-major_version-min.patch
@@ -0,0 +1,69 @@
+From e22c887b55ec5e83db959c3b98d448947c886cc0 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 14 Feb 2016 16:19:23 +0100
+Subject: [PATCH] webinterface: rename major/minor to
+ major_version/minor_version
+
+Avoid conflicts with major/minor defines provided by GNU headers.
+---
+ plugins/webinterface/httpresponseheader.cpp | 10 +++++-----
+ plugins/webinterface/httpresponseheader.h   |  6 +++---
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/plugins/webinterface/httpresponseheader.cpp b/plugins/webinterface/httpresponseheader.cpp
+index 91d91fc..f7df1de 100644
+--- a/plugins/webinterface/httpresponseheader.cpp
++++ b/plugins/webinterface/httpresponseheader.cpp
+@@ -33,8 +33,8 @@ namespace kt
+ 		return QString::null;
+ 	}
+ 	
+-	HttpResponseHeader::HttpResponseHeader(int response_code,int major,int minor) 
+-		: response_code(response_code),major(major),minor(minor)
++	HttpResponseHeader::HttpResponseHeader(int response_code,int major_version,int minor_version) 
++		: response_code(response_code),major_version(major_version),minor_version(minor_version)
+ 	{
+ 	}
+ 	
+@@ -42,8 +42,8 @@ namespace kt
+ 	{
+ 		response_code = hdr.response_code;
+ 		fields = hdr.fields;
+-		major = hdr.major;
+-		minor = hdr.minor;
++		major_version = hdr.major_version;
++		minor_version = hdr.minor_version;
+ 	}
+ 	
+ 	HttpResponseHeader::~HttpResponseHeader()
+@@ -63,7 +63,7 @@ namespace kt
+ 	QString HttpResponseHeader::toString() const
+ 	{
+ 		QString str;
+-		str += QString("HTTP/%1.%2 %3 %4
").arg(major).arg(minor).arg(response_code).arg(ResponseCodeToString(response_code));
++		str += QString("HTTP/%1.%2 %3 %4
").arg(major_version).arg(minor_version).arg(response_code).arg(ResponseCodeToString(response_code));
+ 		
+ 		QMap<QString,QString>::const_iterator itr = fields.begin();
+ 		while (itr != fields.end())
+diff --git a/plugins/webinterface/httpresponseheader.h b/plugins/webinterface/httpresponseheader.h
+index 7e0e1d0..a428d31 100644
+--- a/plugins/webinterface/httpresponseheader.h
++++ b/plugins/webinterface/httpresponseheader.h
+@@ -34,11 +34,11 @@ namespace kt
+ 	{
+ 		int response_code;
+ 		QMap<QString,QString> fields;
+-		int major;
+-		int minor;
++		int major_version;
++		int minor_version;
+ 		
+ 	public:
+-		HttpResponseHeader(int response_code,int major = 1,int minor = 1);
++		HttpResponseHeader(int response_code,int major_version = 1,int minor_version = 1);
+ 		HttpResponseHeader(const HttpResponseHeader & hdr);
+ 		virtual ~HttpResponseHeader();
+ 		
+-- 
+2.7.0
+

-- 
KTorrent Debian packaging.