[packages/qt5-qtdeclarative] x32 patch outdated
glen
glen at pld-linux.org
Thu Jun 11 10:23:31 CEST 2015
commit 26409c214399d10583af986c9ec9281801c6cd16
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jun 11 00:17:30 2015 +0300
x32 patch outdated
qt5-qtdeclarative.spec | 4 ----
x32.patch | 14 --------------
2 files changed, 18 deletions(-)
---
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 2eca9bb..acbb2a2 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -27,7 +27,6 @@ Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/subm
# Source0-md5: 5b257cd097c315dab1b3c15e26211823
Source1: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
# Source1-md5: 35151a736e3b720de4f5128386f9c834
-Patch0: x32.patch
URL: http://qt-project.org/
BuildRequires: OpenGL-devel
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
@@ -243,9 +242,6 @@ Przykłady do bibliotek Qt5 Declarative.
%prep
%setup -q -n %{orgname}-opensource-src-%{version} %{?with_qm:-a1}
-%ifarch x32
-%patch0 -p1
-%endif
%build
qmake-qt5
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index cba9185..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- qtdeclarative-opensource-src-5.4.1/src/qml/jsruntime/qv4global_p.h~ 2015-02-17 05:57:27.000000000 +0100
-+++ qtdeclarative-opensource-src-5.4.1/src/qml/jsruntime/qv4global_p.h 2015-03-04 09:00:49.213556819 +0100
-@@ -69,9 +69,9 @@
- //
- // NOTE: This should match the logic in qv4targetplatform_p.h!
-
--#if defined(Q_PROCESSOR_X86) && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
-+#if defined(Q_PROCESSOR_X86) && !defined(__ILP32__) && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
- #define V4_ENABLE_JIT
--#elif defined(Q_PROCESSOR_X86_64) && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD))
-+#elif defined(Q_PROCESSOR_X86_64) && !defined(__ILP32__) && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD))
- #define V4_ENABLE_JIT
- #elif defined(Q_PROCESSOR_ARM_32)
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtdeclarative.git/commitdiff/26409c214399d10583af986c9ec9281801c6cd16
More information about the pld-cvs-commit
mailing list