Bug#625121: ktoon: Patch that fix the FTBFS in Ubuntu

[Fabrice Coutadeur]

Package: ktoon
Version: 0.8.1-4.2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch



*** /tmp/tmp1uXcP1
In Ubuntu, the attached patch was applied to achieve the following:
  * 99-fix-FTBFS-with-permissive.dpatch: fix FTBFS because of -fpermissive
    option (LP: #770737)

Thanks for considering the patch.

Fabrice

-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-10-generic (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF8, LC_CTYPE=es_ES.UTF8 (charmap=UTF-8) (ignored: LC_ALL 
set to es_ES.UTF8)
Shell: /bin/sh linked to /bin/dash

--- ktoon-0.8.1.orig/debian/patches/99-fix-FTBFS-with-permissive.dpatch
+++ ktoon-0.8.1/debian/patches/99-fix-FTBFS-with-permissive.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-fix-FTBFS-with-permissive.dpatch by Fabrice Coutadeur 
<fabric...@ubuntu.com>
+## Description: fix FTBFS when compiled with -fpermissive with "taking address
+## of temporary"
+## Author: Fabrice Coutadeur<fabric...@ubuntu.com>
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
ktoon-0.8.1~/src/components/colorpalette/ktdualcolorbutton.cpp 
ktoon-0.8.1/src/components/colorpalette/ktdualcolorbutton.cpp
+--- ktoon-0.8.1~/src/components/colorpalette/ktdualcolorbutton.cpp     
2007-06-15 04:33:06.000000000 +0200
++++ ktoon-0.8.1/src/components/colorpalette/ktdualcolorbutton.cpp      
2011-07-17 22:41:30.119484150 +0200
+@@ -155,12 +155,12 @@
+ 
+       metrics(fgRect, bgRect);
+       QBrush defBrush = palette().color(QPalette::Button);
+-
++      QBrush adjBrush = DBrushAdjuster::adjustBrush(bg, bgRect);
+       
+       qDrawShadeRect(&p, bgRect, palette(), curColor == Background, 2, 0,
+-                      isEnabled() ? &DBrushAdjuster::adjustBrush(bg, bgRect) 
: &defBrush);
++                      isEnabled() ? &adjBrush : &defBrush);
+       qDrawShadeRect(&p, fgRect,  palette(), curColor == Foreground, 2, 0,
+-                      isEnabled() ? &DBrushAdjuster::adjustBrush(fg, fgRect) 
: &defBrush);
++                      isEnabled() ? &adjBrush : &defBrush);
+       p.setPen(QPen(palette().shadow().color()));
+       
+       p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap);