From e03fdc61ad743395d87135ac4bdfaa9eb1f4071e Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 22:11:14 +0100 Subject: [PATCH] macros.kde5: set QV4_FORCE_INTERPRETER=1 to fix qmlplugindump crashes on build servers [release 5.55.0-3mamba;Sun Feb 17 2019] --- ...5.in => extra-cmake-modules-rpm-macros-kde5.in | 4 +++- extra-cmake-modules.spec | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) rename rpm-macros.kde5.in => extra-cmake-modules-rpm-macros-kde5.in (95%) diff --git a/rpm-macros.kde5.in b/extra-cmake-modules-rpm-macros-kde5.in similarity index 95% rename from rpm-macros.kde5.in rename to extra-cmake-modules-rpm-macros-kde5.in index ab41b66..4d26097 100644 --- a/rpm-macros.kde5.in +++ b/extra-cmake-modules-rpm-macros-kde5.in @@ -40,6 +40,7 @@ %_kde5_debug RelWithDebInfo %cmake_kde5(d:) \ + QV4_FORCE_INTERPRETER=1; export QV4_FORCE_INTERPRETER ; \ QTDIR="%{_qt5_prefix}" ; export QTDIR ; \ PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ @@ -57,7 +58,8 @@ -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\ -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kde5_mkspecsdir} \\\ -DKF5_LIBEXEC_INSTALL_DIR=%{_kde5_libexecdir} \\\ - -DQML_INSTALL_DIR:PATH=%{_kde5_qmldir} + -DQML_INSTALL_DIR:PATH=%{_kde5_qmldir} \\\ + -DQMLPLUGINDUMP_PROGRAM=%{_qt5_bindir}/qmlplugindump # -DDBUS_INTERFACES_INSTALL_DIR:PATH=%{_kde5_dbusinterfacesdir} \\\ # -DDBUS_SERVICES_INSTALL_DIR:PATH=%{_kde5_dbusservicesdir} \\\ diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index cb7be63..475c842 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -1,8 +1,8 @@ %define _kf5_majver %(v=%version; echo ${v%.*}) Name: extra-cmake-modules -Version: 5.54.0 -Release: 1mamba +Version: 5.55.0 +Release: 3mamba Summary: Extra cmake modules used by kde framework Group: Development/Tools Vendor: openmamba @@ -10,7 +10,7 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://www.kde.org Source0: http://download.kde.org/stable/frameworks/%{_kf5_majver}/extra-cmake-modules-%{version}.tar.xz -Source1: rpm-macros.kde5.in +Source1: extra-cmake-modules-rpm-macros-kde5.in License: BSD ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -59,6 +59,15 @@ cat %{S:1} | sed "s,@KF5_VERSION@,%{version}," \ %attr(644,root,root) %{_sysconfdir}/rpm/macros.kde5 %changelog +* Sun Feb 17 2019 Silvan Calarco 5.55.0-3mamba +- macros.kde5: set QV4_FORCE_INTERPRETER=1 to fix qmlplugindump crashes on build servers + +* Sat Feb 16 2019 Silvan Calarco 5.55.0-2mamba +- macros.kde5: define QMLPLUGINDUMP_PROGRAM to match qt5 binary + +* Mon Feb 11 2019 Automatic Build System 5.55.0-1mamba +- automatic version update by autodist + * Sun Jan 13 2019 Automatic Build System 5.54.0-1mamba - automatic version update by autodist