rev 20513 - in kde-extras/libalkimia/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-06-20 20:42:47 +0000 (Mon, 20 Jun 2016)
New Revision: 20513

Added:
   kde-extras/libalkimia/trunk/debian/patches/
   kde-extras/libalkimia/trunk/debian/patches/series
   kde-extras/libalkimia/trunk/debian/patches/upstream_Fix-AlkValue-operator-QString-w-valueRef.patch
Modified:
   kde-extras/libalkimia/trunk/debian/changelog
Log:
fix AlkValue::operator=(QString)

backport upstream commit 2e6172a7d723d53ff62fc3eaf2ea7208db0fd0a7


Modified: kde-extras/libalkimia/trunk/debian/changelog
===================================================================
--- kde-extras/libalkimia/trunk/debian/changelog	2016-06-20 20:32:03 UTC (rev 20512)
+++ kde-extras/libalkimia/trunk/debian/changelog	2016-06-20 20:42:47 UTC (rev 20513)
@@ -1,5 +1,9 @@
 libalkimia (5.0.0-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 2e6172a7d723d53ff62fc3eaf2ea7208db0fd0a7 to fix
+    AlkValue::operator=(QString); patch
+    upstream_Fix-AlkValue-operator-QString-w-valueRef.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 20 Jun 2016 22:30:51 +0200
 

Added: kde-extras/libalkimia/trunk/debian/patches/series
===================================================================
--- kde-extras/libalkimia/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/libalkimia/trunk/debian/patches/series	2016-06-20 20:42:47 UTC (rev 20513)
@@ -0,0 +1 @@
+upstream_Fix-AlkValue-operator-QString-w-valueRef.patch

Added: kde-extras/libalkimia/trunk/debian/patches/upstream_Fix-AlkValue-operator-QString-w-valueRef.patch
===================================================================
--- kde-extras/libalkimia/trunk/debian/patches/upstream_Fix-AlkValue-operator-QString-w-valueRef.patch	                        (rev 0)
+++ kde-extras/libalkimia/trunk/debian/patches/upstream_Fix-AlkValue-operator-QString-w-valueRef.patch	2016-06-20 20:42:47 UTC (rev 20513)
@@ -0,0 +1,32 @@
+From 2e6172a7d723d53ff62fc3eaf2ea7208db0fd0a7 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Mon, 20 Jun 2016 22:01:04 +0200
+Subject: [PATCH] Fix AlkValue::operator=(QString) w/ valueRef()
+
+Do not set a new Private directly, since it will destroy the old one
+and invalidate the references to the internal m_val -- indeed, valgrind
+complains about that, and AlkValueTest::valueRef() fails on any
+architecture different than x86/x86_64.
+
+Instead, copy m_val from a new temporary AlkValue.
+---
+ libalkimia/alkvalue.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libalkimia/alkvalue.cpp b/libalkimia/alkvalue.cpp
+index 295ac06..9a52c1a 100644
+--- a/libalkimia/alkvalue.cpp
++++ b/libalkimia/alkvalue.cpp
+@@ -462,7 +462,8 @@ const AlkValue & AlkValue::operator=(double right)
+ 
+ const AlkValue & AlkValue::operator=(const QString & right)
+ {
+-  d = AlkValue(right, QLatin1Char('.')).d;
++  AlkValue other(right, QLatin1Char('.'));
++  d->m_val = other.d->m_val;
+   return *this;
+ }
+ 
+-- 
+2.8.1
+