[SCM] qtscript packaging branch, experimental, updated. debian/5.4.1+dfsg-2-3-gdb8ca8b
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sun Mar 1 16:42:26 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtscript.git;a=commitdiff;h=db8ca8b
The following commit has been merged in the experimental branch:
commit db8ca8b1f682d313bba395c2aa2ff13d1b83598b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sun Mar 1 19:42:22 2015 +0300
Update the patch to the version applied upstream.
---
debian/changelog | 2 +-
debian/patches/ppc64el_jscore.diff | 14 +++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ee91d79..92220b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
qtscript-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
- * Add a patch (from qtwebkit) to correctly detect ppc64el.
+ * Add upstream patch to correctly detect little-endian ppc/ppc64.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 01 Mar 2015 14:11:06 +0300
diff --git a/debian/patches/ppc64el_jscore.diff b/debian/patches/ppc64el_jscore.diff
index 2510dc7..9a42a2d 100644
--- a/debian/patches/ppc64el_jscore.diff
+++ b/debian/patches/ppc64el_jscore.diff
@@ -1,11 +1,19 @@
Description: detect ppc64el architecture correctly
-Origin: qtwebkit, http://code.qt.io/cgit/qt/qtwebkit.git/commit?id=405022cf7bba9bb7
-Forwarded: yes, https://codereview.qt-project.org/107469
+Origin: upstream, http://code.qt.io/cgit/qt/qtscript.git/commit?id=822df36f252c5a16
Last-Update: 2015-03-01
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -197,7 +197,9 @@
+@@ -190,14 +190,18 @@
+ || defined(_M_PPC) \
+ || defined(__PPC)
+ #define WTF_CPU_PPC 1
++#ifndef __LITTLE_ENDIAN__
+ #define WTF_CPU_BIG_ENDIAN 1
++#endif
+ #endif
+
+ /* CPU(PPC64) - PowerPC 64-bit */
#if defined(__ppc64__) \
|| defined(__PPC64__)
#define WTF_CPU_PPC64 1
--
qtscript packaging
More information about the pkg-kde-commits
mailing list