aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-12-28 07:47:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-12-28 11:27:30 +0000
commit034510433a81e111f2f25dfe9cc5262518389a6c (patch)
treeb77937ac5be8c59a40bc1a6a062b36ddd55f46c1
parent4f44799d07dcf21437bfce724bd6a47c1d9fd24f (diff)
downloadaports-034510433a81e111f2f25dfe9cc5262518389a6c.tar.gz
aports-034510433a81e111f2f25dfe9cc5262518389a6c.tar.bz2
aports-034510433a81e111f2f25dfe9cc5262518389a6c.tar.xz
community/qt5-qtdeclarative: build fix. remove mips patch
no longer applies
-rw-r--r--community/qt5-qtdeclarative/APKBUILD4
-rw-r--r--community/qt5-qtdeclarative/disable-mips-jit.patch22
2 files changed, 1 insertions, 25 deletions
diff --git a/community/qt5-qtdeclarative/APKBUILD b/community/qt5-qtdeclarative/APKBUILD
index 7748a7312f..4f16f718f0 100644
--- a/community/qt5-qtdeclarative/APKBUILD
+++ b/community/qt5-qtdeclarative/APKBUILD
@@ -21,7 +21,6 @@ case $pkgver in
esac
source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz
qt-musl-stackbottom.patch
- disable-mips-jit.patch
"
_qt5_prefix=/usr/lib/qt5
@@ -48,5 +47,4 @@ package() {
}
sha512sums="858d33bfcd5b87904bb08e0fec04665d3f43ed84de4f4336f4ef4ad2f2bd6d4ea79c048c8f8f8adfd4c30d6a9e01cd46175dc0e5a1335a000c57c0d0058999bd qtdeclarative-everywhere-src-5.12.0.tar.xz
-235091cc1da51c31165a99932c95543d999c0f21b2c6b4318306b647662d420f88d7270ec21db7417fe9f8d87bfa3e5f01b6465c3542da024dd1623ef0a87681 qt-musl-stackbottom.patch
-03f945fd8f0a8affcaffb229b0b5f6bc1ebbc40b34bf83944779ad4fa85094e2f131dcd19b6c119b482441cd821054f3ad93f531919ad2211f3193ebe8cee156 disable-mips-jit.patch"
+235091cc1da51c31165a99932c95543d999c0f21b2c6b4318306b647662d420f88d7270ec21db7417fe9f8d87bfa3e5f01b6465c3542da024dd1623ef0a87681 qt-musl-stackbottom.patch"
diff --git a/community/qt5-qtdeclarative/disable-mips-jit.patch b/community/qt5-qtdeclarative/disable-mips-jit.patch
deleted file mode 100644
index 445d400a82..0000000000
--- a/community/qt5-qtdeclarative/disable-mips-jit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/qml/jit/qv4targetplatform_p.h
-+++ b/src/qml/jit/qv4targetplatform_p.h
-@@ -604,7 +604,7 @@
- };
- #endif // ARM64
-
--#if defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX)
-+#if defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX) && 0
- template <>
- class TargetPlatform<JSC::MacroAssemblerMIPS, NoOperatingSystemSpecialization>
- {
---- a/src/qml/jsruntime/qv4global_p.h
-+++ b/src/qml/jsruntime/qv4global_p.h
-@@ -107,7 +107,7 @@
- # if defined(Q_OS_LINUX) || defined(Q_OS_QNX)
- # define V4_ENABLE_JIT
- # endif
--#elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX)
-+#elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX) && 0
- # define V4_ENABLE_JIT
- #endif
-