[SCM] plasma-workspace packaging branch, kubuntu_utopic_next, updated. c58ff6b92c2662af6f91fc80a949715cd01be258

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=c58ff6b

The following commit has been merged in the kubuntu_utopic_next branch:
commit c58ff6b92c2662af6f91fc80a949715cd01be258
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 10 12:09:30 2014 +0200

    Add upstream_gdb-7.8-fix.diff to fix gdb 7.8 in drkonqi
---
 debian/changelog                         |  1 +
 debian/patches/series                    |  1 +
 debian/patches/upstream_gdb-7.8-fix.diff | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad29a15..b277d71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plasma-workspace (4:5.1.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
   * New upstream beta release
+  * Add upstream_gdb-7.8-fix.diff to fix gdb 7.8 in drkonqi
 
   [ Harald Sitter ]
   * Add lintian overrides
diff --git a/debian/patches/series b/debian/patches/series
index cbe8e0e..1783faa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kubuntu_add-qml2-path.diff
 kubuntu_startkde-qtpath.diff
+upstream_gdb-7.8-fix.diff
diff --git a/debian/patches/upstream_gdb-7.8-fix.diff b/debian/patches/upstream_gdb-7.8-fix.diff
new file mode 100644
index 0000000..dd9c4f8
--- /dev/null
+++ b/debian/patches/upstream_gdb-7.8-fix.diff
@@ -0,0 +1,22 @@
+Description: Workaround for GDB 7.8
+ DrKonqi backtrace generation is broken with gdb 7.8 so it will be good
+ idea to patch Drkonqi with following patch if distribution is shipping
+ gdb 7.8 and once gdb 7.8.1 is out you can remove this patch because is
+ fixed in gdb 7.8.1
+Author: Bhushan Shah <bhush94 at gmail.com>
+Origin: upstream, http://mail.kde.org/pipermail/release-team/2014-October/008080.html
+Forwarded: no
+Last-Update: 2014-10-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: plasma-workspace-5.1.0/drkonqi/data/debuggers/internal/gdbrc
+===================================================================
+--- plasma-workspace-5.1.0.orig/drkonqi/data/debuggers/internal/gdbrc
++++ plasma-workspace-5.1.0/drkonqi/data/debuggers/internal/gdbrc
+@@ -73,5 +73,5 @@ TryExec=gdb
+ Backends=KCrash
+ 
+ [KCrash]
+-Exec=gdb -nw -n -batch -x %tempfile -p %pid %execpath
++Exec=gdb -nw -n -batch -ex "mt set target-async off" -ex "attach %pid" -x %tempfile %execpathgdb -nw -n -batch -x %tempfile -p %pid %execpath
+ BatchCommands=set width 200
thread
thread apply all bt

-- 
plasma-workspace packaging