[arch-commits] Commit in qt5-script/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Wednesday, January 5, 2022 @ 22:01:09
  Author: arojas
Revision: 433469

archrelease: copy trunk to extra-x86_64

Added:
  qt5-script/repos/extra-x86_64/PKGBUILD
    (from rev 433468, qt5-script/trunk/PKGBUILD)
Deleted:
  qt5-script/repos/extra-x86_64/PKGBUILD
  qt5-script/repos/extra-x86_64/qt5-script-lto.patch

----------------------+
 PKGBUILD             |   91 ++++++++++++++++++++++++-------------------------
 qt5-script-lto.patch |   11 -----
 2 files changed, 45 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-05 22:00:58 UTC (rev 433468)
+++ PKGBUILD	2022-01-05 22:01:09 UTC (rev 433469)
@@ -1,46 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-script
-_qtver=5.15.8
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility'
-depends=('qt5-base')
-makedepends=('git')
-groups=('qt' 'qt5')
-_pkgfqn=${pkgname/5-/}
-source=(git+https://code.qt.io/qt/$_pkgfqn.git#tag=v${pkgver}-lts
-        qt5-script-lto.patch)
-sha256sums=('SKIP'
-            '48da16d6fff324db3aed7b0ad455894250ffbf29613cd60c8879027567d9abb5')
-
-prepare() {
-  mkdir -p build
-  patch -d $_pkgfqn -p1 < qt5-script-lto.patch # Fix build with LTO
-}
-
-build() {
-  cd build
-
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-  find "$pkgdir/usr/lib" -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-
-  # Fix cmake dependency versions
-  sed -e "s|$pkgver\ |5.15.2 |" -i "$pkgdir"/usr/lib/cmake/*/*Config.cmake
-}

Copied: qt5-script/repos/extra-x86_64/PKGBUILD (from rev 433468, qt5-script/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-05 22:01:09 UTC (rev 433469)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-script
+_qtver=5.15.8
+pkgver=${_qtver/-/}
+pkgrel=2
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility'
+depends=('qt5-base')
+makedepends=('git')
+groups=('qt' 'qt5')
+_pkgfqn=${pkgname/5-/}
+source=(git+https://code.qt.io/qt/$_pkgfqn.git#tag=v${pkgver}-lts)
+sha256sums=('SKIP')
+options=(!lto)
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+
+# Disable LTO, see FS#73264
+  qmake ../${_pkgfqn} CONFIG-=ltcg
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+
+  # Fix cmake dependency versions
+  sed -e "s|$pkgver\ |5.15.2 |" -i "$pkgdir"/usr/lib/cmake/*/*Config.cmake
+}

Deleted: qt5-script-lto.patch
===================================================================
--- qt5-script-lto.patch	2022-01-05 22:00:58 UTC (rev 433468)
+++ qt5-script-lto.patch	2022-01-05 22:01:09 UTC (rev 433469)
@@ -1,11 +0,0 @@
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h.orig    2016-02-03 13:46:12.000000000 +0100
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.h 2016-04-24 14:24:42.396004500 +0200
-@@ -316,7 +316,7 @@
-     EncodedJSValue JIT_STUB cti_op_to_primitive(STUB_ARGS_DECLARATION);
-     EncodedJSValue JIT_STUB cti_op_typeof(STUB_ARGS_DECLARATION);
-     EncodedJSValue JIT_STUB cti_op_urshift(STUB_ARGS_DECLARATION);
--    EncodedJSValue JIT_STUB cti_vm_throw(STUB_ARGS_DECLARATION);
-+    EncodedJSValue JIT_STUB cti_vm_throw(STUB_ARGS_DECLARATION) __attribute__((used));
-     EncodedJSValue JIT_STUB cti_to_object(STUB_ARGS_DECLARATION);
-     JSObject* JIT_STUB cti_op_construct_JSConstruct(STUB_ARGS_DECLARATION);
-     JSObject* JIT_STUB cti_op_new_array(STUB_ARGS_DECLARATION);