[SCM] qtscript packaging branch, experimental, updated. debian/5.4.1+dfsg-3-7-gc206c60

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Tue Jun 2 19:29:24 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtscript.git;a=commitdiff;h=9632131

The following commit has been merged in the experimental branch:
commit 96321315309b723d68822374db35364fe3c52e81
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jun 2 16:27:03 2015 -0300

    Refresh s390x_jscore.diff.
---
 debian/changelog                 | 1 +
 debian/patches/s390x_jscore.diff | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16f9b9c..d9e6ef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtscript-opensource-src (5.4.2+dfsg-1) UNRELEASED; urgency=medium
     repo in more than a year. They can re add themselves whenever they want
     (and we really hope to see you back really soon!).
   * Update symbols files with buildds' logs.
+  * Refresh s390x_jscore.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 May 2015 20:52:28 -0300
 
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 7c20530..7e8196f 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -10,7 +10,7 @@ Last-Update: 2014-05-21
 
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -222,6 +222,18 @@
+@@ -226,6 +226,18 @@
  #define WTF_CPU_SPARC 1
  #endif
  
@@ -29,7 +29,7 @@ Last-Update: 2014-05-21
  /* CPU(X86) - i386 / x86 32-bit */
  #if   defined(__i386__) \
      || defined(i386)     \
-@@ -944,7 +956,7 @@
+@@ -948,7 +960,7 @@
  #endif
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)

-- 
qtscript packaging



More information about the pkg-kde-commits mailing list