[SCM] Qt 4 packaging branch, master, updated. debian/4.8.2-1-8-g64e26ab
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Sat Jul 21 17:43:51 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=82b717d
The following commit has been merged in the master branch:
commit 82b717db226b7e639d1b98f1d2d7485cedc0028e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Jul 20 20:52:16 2012 -0300
Fix patch.
It is not a pointer.
---
.../patches/fix_use_after_free_qlocale_unix.patch | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/patches/fix_use_after_free_qlocale_unix.patch b/debian/patches/fix_use_after_free_qlocale_unix.patch
index f2db126..73559e3 100644
--- a/debian/patches/fix_use_after_free_qlocale_unix.patch
+++ b/debian/patches/fix_use_after_free_qlocale_unix.patch
@@ -8,14 +8,14 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2012-07-20
---- qt4-x11-4.8.2.orig/src/corelib/tools/qlocale_unix.cpp
-+++ qt4-x11-4.8.2/src/corelib/tools/qlocale_unix.cpp
+--- a/src/corelib/tools/qlocale_unix.cpp
++++ b/src/corelib/tools/qlocale_unix.cpp
@@ -52,7 +52,7 @@
QT_BEGIN_NAMESPACE
-static const char *getSystemLocale()
-+static QByteArray *getSystemLocale()
++static QByteArray getSystemLocale()
{
#if defined(Q_OS_QNX)
static char buff[257];
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list