[SCM] kross packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g1da5858
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 13:01:03 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kross.git;a=commitdiff;h=7aec6e9
The following commit has been merged in the kubuntu_wily_archive branch:
commit 7aec6e960a80c192705b166eca37c9d034942bd6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Feb 4 18:32:10 2015 +0100
Test mitya57 proposal
---
debian/patches/metafunction_header_char_to_qbytearraydata | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/patches/metafunction_header_char_to_qbytearraydata b/debian/patches/metafunction_header_char_to_qbytearraydata
index 5238dba..aee9d02 100644
--- a/debian/patches/metafunction_header_char_to_qbytearraydata
+++ b/debian/patches/metafunction_header_char_to_qbytearraydata
@@ -1,13 +1,13 @@
Index: kross/src/core/metafunction.h
===================================================================
---- kross.orig/src/core/metafunction.h 2015-02-04 09:51:51.549553468 +0100
-+++ kross/src/core/metafunction.h 2015-02-04 11:02:40.369862859 +0100
+--- kross.orig/src/core/metafunction.h 2015-02-04 18:30:57.339367387 +0100
++++ kross/src/core/metafunction.h 2015-02-04 18:31:30.130029517 +0100
@@ -86,7 +86,7 @@
// static metaobject
staticMetaObject.d.superdata = &QObject::staticMetaObject;
- staticMetaObject.d.stringdata = m_stringData.data();
-+ staticMetaObject.d.stringdata = reinterpret_cast<const QByteArrayData *>(m_stringData.data());
++ staticMetaObject.d.stringdata = m_stringData.data_ptr();
staticMetaObject.d.data = m_data;
staticMetaObject.d.extradata = 0;
}
--
kross packaging
More information about the pkg-kde-commits
mailing list