From 771afd358379e3c8fb936ca33f277d1a42623121 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 17 Oct 2014 13:32:35 -0500 Subject: [PATCH 1/7] bootstrap el6 --- qt5-qtbase.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 294b99a..107eae2 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -19,7 +19,7 @@ # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap %ifarch %{arm} %{ix86} x86_64 -%define docs 1 +#define docs 1 %endif #define pre rc1 @@ -29,7 +29,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.3.2 -Release: 1%{?dist} +Release: 1%{?dist}.1 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -747,6 +747,9 @@ fi %changelog +* Fri Oct 17 2014 Rex Dieter 5.3.2-1.1 +- bootstrap el6 + * Tue Sep 16 2014 Rex Dieter 5.3.2-1 - 5.3.2 From b6b2e800017cf6be8f55b69a598de09427697962 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 17 Oct 2014 14:40:22 -0500 Subject: [PATCH 2/7] Revert "bootstrap el6" This reverts commit 771afd358379e3c8fb936ca33f277d1a42623121. --- qt5-qtbase.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 107eae2..294b99a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -19,7 +19,7 @@ # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap %ifarch %{arm} %{ix86} x86_64 -#define docs 1 +%define docs 1 %endif #define pre rc1 @@ -29,7 +29,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.3.2 -Release: 1%{?dist}.1 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -747,9 +747,6 @@ fi %changelog -* Fri Oct 17 2014 Rex Dieter 5.3.2-1.1 -- bootstrap el6 - * Tue Sep 16 2014 Rex Dieter 5.3.2-1 - 5.3.2 From 237461a32c2134e62bd71df1a333f656fe460623 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Dec 2014 09:00:35 -0600 Subject: [PATCH 3/7] don't omit examples for bootstrap (needs work) --- qt5-qtbase.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index cc542bc..b8ef995 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -23,9 +23,10 @@ %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif -%define examples 1 %endif +%define examples 1 + #define pre rc #define snap 2014-10-07_40 #define snap_tag 20141007_40 @@ -33,7 +34,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.4.0 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -805,6 +806,9 @@ fi %changelog +* Thu Dec 11 2014 Rex Dieter 5.4.0-3 +- don't omit examples for bootstrap (needs work) + * Wed Dec 10 2014 Rex Dieter 5.4.0-2 - fix bootstrapping logic From dbe60f28b026ca856bae031c2305dc0609640a22 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 17 Dec 2014 17:39:06 -0600 Subject: [PATCH 4/7] workaround 'make docs' crasher on el6 (QTBUG-43057) --- qt5-qtbase.spec | 15 ++++++++++++--- qtbase-opensource-src-5.4.0-QTBUG-43057.patch | 12 ++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 qtbase-opensource-src-5.4.0-QTBUG-43057.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index b8ef995..99e7426 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -18,8 +18,7 @@ # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap -# skip docs on el6, qdoc crashes: https://bugreports.qt-project.org/browse/QTBUG-43057 -%if ! 0%{?bootstrap} && 0%{?rhel} != 6 +%if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif @@ -34,7 +33,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.4.0 -Release: 3%{?dist} +Release: 4%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -80,6 +79,9 @@ Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch Patch50: qt5-poll.patch ## upstream patches +# workaround https://bugreports.qt-project.org/browse/QTBUG-43057 +# 'make docs' crash on el6, use qSort instead of std::sort +Patch100: qtbase-opensource-src-5.4.0-QTBUG-43057.patch # Bad font rendering, http://bugzilla.redhat.com/1052389 # tweak font gamma correction, from: @@ -318,6 +320,10 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags #patch50 -p1 -b .poll +%if 0%{?rhel} == 6 +%patch100 -p1 -b .QTBUG-43057 +%endif + %patch109 -p1 -b .0009 %patch273 -p1 -b .0173 @@ -806,6 +812,9 @@ fi %changelog +* Wed Dec 17 2014 Rex Dieter 5.4.0-4 +- workaround 'make docs' crasher on el6 (QTBUG-43057) + * Thu Dec 11 2014 Rex Dieter 5.4.0-3 - don't omit examples for bootstrap (needs work) diff --git a/qtbase-opensource-src-5.4.0-QTBUG-43057.patch b/qtbase-opensource-src-5.4.0-QTBUG-43057.patch new file mode 100644 index 0000000..3281018 --- /dev/null +++ b/qtbase-opensource-src-5.4.0-QTBUG-43057.patch @@ -0,0 +1,12 @@ +diff -up qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp.QTBUG-43057 qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp +--- qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp.QTBUG-43057 2014-12-05 10:24:31.000000000 -0600 ++++ qtbase-opensource-src-5.4.0/src/tools/qdoc/qdocindexfiles.cpp 2014-12-17 14:47:19.393037164 -0600 +@@ -1327,7 +1327,7 @@ void QDocIndexFiles::generateIndexSectio + const InnerNode* inner = static_cast(node); + + NodeList cnodes = inner->childNodes(); +- std::sort(cnodes.begin(), cnodes.end(), compareNodes); ++ qSort(cnodes.begin(), cnodes.end(), compareNodes); + + foreach (Node* child, cnodes) { + generateIndexSections(writer, child, generateInternalNodes); From eb7261f47063d2ceb3e603ee2acfefe3ae8f0f14 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 17 Jan 2015 19:02:10 -0600 Subject: [PATCH 5/7] ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf) --- qt5-qtbase.spec | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 99e7426..b530fb5 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -33,7 +33,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.4.0 -Release: 4%{?dist} +Release: 5%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -484,10 +484,10 @@ popd %if 0%{?qtchooser} mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser pushd %{buildroot}%{_sysconfdir}/xdg/qtchooser - echo "%{_qt5_bindir}" > qt5-%{__isa_bits}.conf - echo "%{_qt5_prefix}" >> qt5-%{__isa_bits}.conf + echo "%{_qt5_bindir}" > 5-%{__isa_bits}.conf + echo "%{_qt5_prefix}" >> 5-%{__isa_bits}.conf # alternatives targets - touch default.conf qt5.conf + touch default.conf 5.conf popd %endif @@ -519,19 +519,31 @@ ctest --output-on-failure ||: popd +%if 0%{?qtchooser} +%pre +# remove short-lived qt5.conf alternatives +%{_sbindir}/update-alternatives \ + --remove qtchooser-qt5 \ + %{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf + +%{_sbindir}/update-alternatives \ + --remove qtchooser-default \ + %{_sysconfdir}/xdg/qtchooser/qt5.conf +%endif + %post /sbin/ldconfig %if 0%{?qtchooser} %{_sbindir}/update-alternatives \ - --install %{_sysconfdir}/xdg/qtchooser/qt5.conf \ - qtchooser-qt5 \ - %{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf \ + --install %{_sysconfdir}/xdg/qtchooser/5.conf \ + qtchooser-5 \ + %{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf \ %{priority} %{_sbindir}/update-alternatives \ --install %{_sysconfdir}/xdg/qtchooser/default.conf \ qtchooser-default \ - %{_sysconfdir}/xdg/qtchooser/qt5.conf \ + %{_sysconfdir}/xdg/qtchooser/5.conf \ %{priority} %endif @@ -540,12 +552,12 @@ popd %if 0%{?qtchooser} if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives \ - --remove qtchooser-qt5 \ - %{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf + --remove qtchooser-5 \ + %{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf %{_sbindir}/update-alternatives \ --remove qtchooser-default \ - %{_sysconfdir}/xdg/qtchooser/qt5.conf + %{_sysconfdir}/xdg/qtchooser/5.conf fi %endif @@ -812,6 +824,9 @@ fi %changelog +* Sat Jan 17 2015 Rex Dieter 5.4.0-5 +- ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf) + * Wed Dec 17 2014 Rex Dieter 5.4.0-4 - workaround 'make docs' crasher on el6 (QTBUG-43057) From 0f0a212bed890dfb552b0c7e4e2853b305f60dc3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 17 Jan 2015 22:21:07 -0600 Subject: [PATCH 6/7] update %files --- qt5-qtbase.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index b530fb5..1354fbe 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -568,8 +568,8 @@ fi %dir %{_sysconfdir}/xdg/qtchooser # not editable config files, so not using %%config here %ghost %{_sysconfdir}/xdg/qtchooser/default.conf -%ghost %{_sysconfdir}/xdg/qtchooser/qt5.conf -%{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf +%ghost %{_sysconfdir}/xdg/qtchooser/5.conf +%{_sysconfdir}/xdg/qtchooser/5-%{__isa_bits}.conf %endif %{_qt5_libdir}/libQt5Concurrent.so.5* %{_qt5_libdir}/libQt5Core.so.5* From 7c71c29833ff640b02fc15ee623af661be6277e9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 18 Jan 2015 07:08:06 -0600 Subject: [PATCH 7/7] fix %pre scriptlet --- qt5-qtbase.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 1354fbe..06b5f91 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -33,7 +33,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.4.0 -Release: 5%{?dist} +Release: 6%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -521,15 +521,17 @@ popd %if 0%{?qtchooser} %pre +if [ $1 -gt 1 ] ; then # remove short-lived qt5.conf alternatives %{_sbindir}/update-alternatives \ --remove qtchooser-qt5 \ - %{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf + %{_sysconfdir}/xdg/qtchooser/qt5-%{__isa_bits}.conf >& /dev/null ||: %{_sbindir}/update-alternatives \ --remove qtchooser-default \ - %{_sysconfdir}/xdg/qtchooser/qt5.conf + %{_sysconfdir}/xdg/qtchooser/qt5.conf >& /dev/null ||: %endif +fi %post /sbin/ldconfig @@ -824,6 +826,9 @@ fi %changelog +* Sun Jan 18 2015 Rex Dieter 5.4.0-6 +- fix %%pre scriptlet + * Sat Jan 17 2015 Rex Dieter 5.4.0-5 - ship /etc/xdg/qtchooser/5.conf alternative instead (of qt5.conf)