[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.3.2-4-12-g536c71d

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 536c71db032aa4241a5d50b88404c42abfd2ed9c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 16 19:37:38 2014 +0300

    Drop freebsd_registers.diff, no longer needed.
---
 debian/changelog                      |  1 +
 debian/patches/freebsd_registers.diff | 35 -----------------------------------
 debian/patches/series                 |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe0597b..fa3379b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtdeclarative-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   * Bump ABI version to 5.4.0
 
   [ Dmitry Shachnev ]
+  * Drop freebsd_registers.diff, no longer needed.
   * Update debian/copyright.
   * Update Vcs-Browser field to point to cgit interface.
   * Bump Standards-Version to 3.9.6, no changes needed.
diff --git a/debian/patches/freebsd_registers.diff b/debian/patches/freebsd_registers.diff
deleted file mode 100644
index 8c71592..0000000
--- a/debian/patches/freebsd_registers.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: make qv4assembler.cpp work on all OSes
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Forwarded: no
-Last-Update: 2014-06-05
-
---- a/src/qml/jit/qv4assembler.cpp
-+++ b/src/qml/jit/qv4assembler.cpp
-@@ -96,25 +96,17 @@
- /* Platform/Calling convention/Architecture specific section */
- 
- #if CPU(X86_64)
--#  if OS(LINUX) || OS(MAC_OS_X)
--static const Assembler::RegisterID calleeSavedRegisters[] = {
--    JSC::X86Registers::ebx,
--    JSC::X86Registers::r12, // LocalsRegister
--    JSC::X86Registers::r13,
--    JSC::X86Registers::r14, // ContextRegister
--    JSC::X86Registers::r15
--};
--#  elif OS(WINDOWS)
- static const Assembler::RegisterID calleeSavedRegisters[] = {
-     JSC::X86Registers::ebx,
-+#  if OS(WINDOWS)
-     JSC::X86Registers::esi,
-     JSC::X86Registers::edi,
-+#  endif
-     JSC::X86Registers::r12, // LocalsRegister
-     JSC::X86Registers::r13,
-     JSC::X86Registers::r14, // ContextRegister
-     JSC::X86Registers::r15
- };
--#  endif
- #endif
- 
- #if CPU(X86)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ea9378a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-freebsd_registers.diff

-- 
qtdeclarative packaging