From 0dc1f9427660fcf805a8b25af8e2bd9d59dd2cb2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 14 Sep 2016 08:27:08 -0500 Subject: [PATCH] 5.7.0-8 - introduce -srpm-macros (initially defines %qt5_qtwebengine_archs) - -devel: drop Requires: qt5-qtwebengine-devel (since not all archs are supported) --- macros.qt5 | 8 ++++---- macros.qt5-srpm | 9 +++++++++ qt5.spec | 42 +++++++++++++++++++++++++++++++++++------- 3 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 macros.qt5-srpm diff --git a/macros.qt5 b/macros.qt5 index 87bd939..b7a4305 100644 --- a/macros.qt5 +++ b/macros.qt5 @@ -16,10 +16,10 @@ %_qt5_sysconfdir %{_qt5_settingsdir} %_qt5_translationdir %{_datadir}/qt5/translations -%_qt5_cflags %{nil} -%_qt5_cxxflags %{nil} -%_qt5_ldflags %{nil}%{?__global_ldflags} -%_qt5_optflags %{optflags} -fno-delete-null-pointer-checks +%_qt5_cflags %{nil}@@QT5_CFLAGS@@ +%_qt5_cxxflags %{nil}@@QT5_CXXFLAGS@@ +%_qt5_ldflags %{nil}%{?__global_ldflags} @@QT5_RPM_LD_FLAGS@@ +%_qt5_optflags %{optflags} @@QT5_RPM_OPT_FLAGS@@ %_qt5_qmake_flags \\\ QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt5_optflags} %{?_qt5_cflags}}" \\\ diff --git a/macros.qt5-srpm b/macros.qt5-srpm new file mode 100644 index 0000000..632755c --- /dev/null +++ b/macros.qt5-srpm @@ -0,0 +1,9 @@ + +# # the architectures theoretically supported by the version of V8 used (#1298011) +# # You may need some minor patching to build on one of the secondary +# # architectures, e.g., to add to the Qt -> Chromium -> V8 arch translations. +# # If you cannot get this package to build on your secondary architecure, please: +# # * remove your architecture from this list AND +# # * put #1298011 onto your ExcludeArch tracker. +%qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el + diff --git a/qt5.spec b/qt5.spec index 1ee1c09..e0a38e9 100644 --- a/qt5.spec +++ b/qt5.spec @@ -1,10 +1,17 @@ + +%if 0%{?fedora} > 23 +# gcc6: Qt assumes this in places (*should* be fixed now, or at least in 5.8) -- rex +%global qt5_null_flag -fno-delete-null-pointer-checks +%endif + Name: qt5 Version: 5.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Qt5 meta package License: GPLv3 URL: https://getfedora.org/ Source0: macros.qt5 +Source1: macros.qt5-srpm BuildArch: noarch Requires: qt5-gstreamer Requires: qt5-qdbusviewer @@ -69,7 +76,7 @@ Requires: qt5-qtsvg-devel Requires: qt5-qttools-devel Requires: qt5-qtwayland-devel Requires: qt5-qtwebchannel-devel -Requires: qt5-qtwebengine-devel +#Requires: qt5-qtwebengine-devel Requires: qt5-qtwebkit-devel Requires: qt5-qtwebsockets-devel Requires: qt5-qtx11extras-devel @@ -79,7 +86,7 @@ Requires: qt5-qtxmlpatterns-devel %{summary}. %package rpm-macros -Summary: Qt5 RPM macros for KDE Frameworks 5 +Summary: RPM macros for building Qt5 and KDE Frameworks 5 packages Conflicts: qt5-qtbase-devel < 5.6.0-0.23 %if 0%{?fedora} Requires: cmake >= 3 @@ -87,13 +94,26 @@ Requires: cmake >= 3 %if 0%{?rhel} Requires: cmake3 %endif - - %description rpm-macros -RPM macros for building KDE Frameworks 5 packages. +%{summary}. + +%package srpm-macros +Summary: RPM macros for source Qt5 packages +%description srpm-macros +%{summary}. + %install -install -Dpm644 %{_sourcedir}/macros.qt5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 +install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 +install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5-srpm + +# substitute custom flags +sed -i \ + -e "s|@@QT5_CFLAGS@@|%{?qt5_cflags}|g" \ + -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \ + -e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \ + -e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags} %{?qt5_null_flag}|g" \ + %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 mkdir -p %{buildroot}%{_docdir}/qt5 mkdir -p %{buildroot}%{_docdir}/qt5-devel @@ -109,7 +129,15 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README %files rpm-macros %{_rpmconfigdir}/macros.d/macros.qt5 +%files srpm-macros +%{_rpmconfigdir}/macros.d/macros.qt5-srpm + + %changelog +* Wed Sep 14 2016 Rex Dieter - 5.7.0-8 +- introduce -srpm-macros (initially defines %%qt5_qtwebengine_archs) +- -devel: drop Requires: qt5-qtwebengine-devel (since not all archs are supported) + * Sat Jul 23 2016 Rex Dieter - 5.7.0-7 - drop Requires: qt5-qtwebengine (not available on all archs)