[SCM] konsole packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-50-g75780bd

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=75780bd

The following commit has been merged in the kubuntu_wily_archive branch:
commit 75780bd0c0f949aea1003700dfcf3d3d0220a789
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Aug 11 22:49:52 2015 +0200

    New upstream release
---
 debian/changelog                   |  8 ++++++--
 debian/patches/series              |  2 +-
 debian/patches/upstream_gcc52.diff | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 782b787..de4e7f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-konsole (4:15.04.2-0ubuntu2) UNRELEASED; urgency=medium
+konsole (4:15.07.90-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ José Manuel Santamaría Lema ]
   * Non-maintainer upload.
   * Add rb123881_export_history_scroll.patch, fixes an FTBFS against
     latest GCC 5.
 
- -- José Manuel Santamaría Lema <panfaust at gmail.com>  Fri, 24 Jul 2015 17:23:46 +0200
+  [ Jonathan Riddell ]
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 11 Aug 2015 22:23:53 +0200
 
 konsole (4:15.04.2-0ubuntu1) wily; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 9bacd1e..68e3727 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-rb123881_export_history_scroll.patch
 debian-T-addition.diff
+upstream_gcc52.diff
diff --git a/debian/patches/upstream_gcc52.diff b/debian/patches/upstream_gcc52.diff
new file mode 100644
index 0000000..acea320
--- /dev/null
+++ b/debian/patches/upstream_gcc52.diff
@@ -0,0 +1,22 @@
+commit 457d86d79a1496014b45a5bc6b14c23c4bdf4fa9
+Author: Kurt Hindenburg <kurt.hindenburg at gmail.com>
+Date:   Sat Aug 8 09:49:10 2015 -0400
+
+    Export HistoryScroll to fix compiling issue with gcc 5.2
+    
+    REVIEW: 123881
+    (cherry picked from commit 5f58169ba6fb18887b0e98aa390496df6fe8f242)
+
+diff --git a/src/History.h b/src/History.h
+index 6314ef9..dcd3819 100644
+--- a/src/History.h
++++ b/src/History.h
+@@ -83,7 +83,7 @@ private:
+ //////////////////////////////////////////////////////////////////////
+ class HistoryType;
+ 
+-class HistoryScroll
++class KONSOLEPRIVATE_EXPORT HistoryScroll
+ {
+ public:
+     explicit HistoryScroll(HistoryType*);

-- 
konsole packaging