diff options
| author | André Klitzing <aklitzing@gmail.com> | 2018-12-13 19:58:21 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-12-28 11:27:30 +0000 |
| commit | 5522688210d81bfd39a3839c5e66774104cb06a0 (patch) | |
| tree | 147c9358ccd91cc1f7de2956e45fcfa17a5a541a /community | |
| parent | 06664b87021c00dc28a179e6d48127b2ad602f24 (diff) | |
| download | aports-5522688210d81bfd39a3839c5e66774104cb06a0.tar.bz2 aports-5522688210d81bfd39a3839c5e66774104cb06a0.tar.xz | |
community/qt5-qtscript: upgrade to 5.12.0
Diffstat (limited to 'community')
| -rw-r--r-- | community/qt5-qtscript/APKBUILD | 6 | ||||
| -rw-r--r-- | community/qt5-qtscript/qtscript-everywhere-src-5.5.0-s390.patch | 31 |
2 files changed, 2 insertions, 35 deletions
diff --git a/community/qt5-qtscript/APKBUILD b/community/qt5-qtscript/APKBUILD index 3fd6cfc2fc..c90e1996f6 100644 --- a/community/qt5-qtscript/APKBUILD +++ b/community/qt5-qtscript/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt5-qtscript _pkgname=${pkgname/qt5-//}-everywhere-src -pkgver=5.10.1 +pkgver=5.12.0 _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} @@ -19,7 +19,6 @@ case $pkgver in *) _rel=official_releases;; esac source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/$_pkgname-$_V.tar.xz - qtscript-everywhere-src-5.5.0-s390.patch qtscript-everywhere-src-5.10.1-sgidefs.patch " @@ -40,6 +39,5 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="9ebcd57c2095e4e31f9ce38c17cc17f483fabcf4ef0247b87189fdc3651d950d5ec63a013f5a0fab4fb5af44f1f5271231900c0c9a7760772d888fc36473b80c qtscript-everywhere-src-5.10.1.tar.xz -9253275dc268c4b8900dcefb66e6280076dc948bdf0765e0ba3e7c0ec690efaa3c61c5403560a8b4ee9167b43079fff9383e412f8fb912274f410d46fef8acdb qtscript-everywhere-src-5.5.0-s390.patch +sha512sums="f8870208fb0eb35551294739eabe9736a458e79fef1160b836031411b8055df7284339d301f2983c94b3bafeb15919fc575e12541c471655c0db9c0c5d85a087 qtscript-everywhere-src-5.12.0.tar.xz c89124fc940ceaa5cfc52c8f48b8eef17bba575a080fad3f27d61e3da98ab5cfd4bb6ffaae09ccae81f6f7644719fa28d38d4b7a7fe4cdb4268673c39627eb22 qtscript-everywhere-src-5.10.1-sgidefs.patch" diff --git a/community/qt5-qtscript/qtscript-everywhere-src-5.5.0-s390.patch b/community/qt5-qtscript/qtscript-everywhere-src-5.5.0-s390.patch deleted file mode 100644 index e7871f4bc4..0000000000 --- a/community/qt5-qtscript/qtscript-everywhere-src-5.5.0-s390.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2015-06-29 15:05:58.000000000 -0500 -+++ qtscript-opensource-src-5.5.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2015-07-16 09:57:18.963167137 -0500 -@@ -226,6 +226,18 @@ - #define WTF_CPU_SPARC 1 - #endif - -+/* CPU(S390X) - S390 64-bit */ -+#if defined(__s390x__) -+#define WTF_CPU_S390X 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ -+/* CPU(S390) - S390 32-bit */ -+#if defined(__s390__) && !defined(__s390x__) -+#define WTF_CPU_S390 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ - /* CPU(X86) - i386 / x86 32-bit */ - #if defined(__i386__) \ - || defined(i386) \ -@@ -950,7 +962,7 @@ - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) - #if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) - #define WTF_USE_JSVALUE64 1 --#elif CPU(ARM) || CPU(PPC64) -+#elif CPU(ARM) || CPU(PPC64) || CPU(S390X) - #define WTF_USE_JSVALUE32 1 - #elif OS(WINDOWS) && COMPILER(MINGW) - /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg |