diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-10-11 20:51:21 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2013-10-11 20:51:21 -0300 |
| commit | c1f59fe7cc7d24bf33ccd355435368fc12f1b9cb (patch) | |
| tree | 9eb5c74d94d659a314fed01c15d5e3d6e442ba12 /debian | |
| parent | 3a14bc119bc2be6e3727d91508315b4829e31403 (diff) | |
| download | qt4-x11-c1f59fe7cc7d24bf33ccd355435368fc12f1b9cb.tar.gz | |
Remove broken patch.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/Fix_JavaScriptCore_ftbfs_on_mips64_el.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 4 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog index 62e9cb0..5c07b01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg1-2) UNRELEASED; urgency=low + [ Lisandro Damián Nicanor Pérez Meyer ] + * Remove Fix_JavaScriptCore_ftbfs_on_mips64_el.patch, it makes 32 bits + platforms FTBFS. + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 11 Oct 2013 20:44:03 -0300 qt4-x11 (4:4.8.5+git121-g2a9ea11+dfsg1-1) unstable; urgency=low diff --git a/debian/patches/Fix_JavaScriptCore_ftbfs_on_mips64_el.patch b/debian/patches/Fix_JavaScriptCore_ftbfs_on_mips64_el.patch deleted file mode 100644 index 8396ef9..0000000 --- a/debian/patches/Fix_JavaScriptCore_ftbfs_on_mips64_el.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b1f3d01f03bae04d7bc704556d7a00f124f24488 Mon Sep 17 00:00:00 2001 -From: YunQiang Su <wzssyqa@gmail.com> -Date: Thu, 29 Aug 2013 13:05:53 +0800 -Subject: [PATCH] Fix JavaScriptCore ftbfs on mips64(el) - -Task-number: QTBUG-33187 -(cherry picked from qtscript/fdb622dad4d85894c5979b90ef2918307a8c9a8e) -Change-Id: I2612d17ba159474595335adde8429a50e844dd4b ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 17c06bf..f98fb72 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -325,7 +325,15 @@ - - #endif /* ARM */ - -+/* CPU(MIPS64) - MIPS 64-bit both BIG and LITTLE endian */ -+#if (_MIPS_SIM == _ABI64) -+ #define WTF_CPU_MIPS64 1 -+#endif - -+/* CPU(MIPSN32) - MIPS N32 ABI both BIG and LITTLE endian */ -+#if (_MIPS_SIM == _ABIN32) -+#define WTF_CPU_MIPSN32 1 -+#endif - - /* ==== OS() - underlying operating system; only to be used for mandated low-level services like - virtual memory, not to choose a GUI toolkit ==== */ -@@ -873,7 +881,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) -+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 --- -1.8.4.rc3 - diff --git a/debian/patches/series b/debian/patches/series index fa691b6..979ab22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ # upstream patches Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch -Fix_JavaScriptCore_ftbfs_on_mips64_el.patch # qt-copy patches 0195-compositing-properties.diff |