Compare commits

...

55 Commits
f23 ... master

Author SHA1 Message Date
Fedora Release Engineering c8adf64475 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 17:51:56 +00:00
Jan Grulich 7dd68ee90a 5.12.4 2019-06-14 08:58:11 +02:00
Jan Grulich edf3c2ca53 5.12.3 2019-06-04 15:11:56 +02:00
Rex Dieter 3cb7a7ee18 fix bootstrap logic, bootstrap => no_examples 2019-02-15 10:35:03 -06:00
Rex Dieter 9390e3f9d6 5.12.1
better bootstrap support (examples)
2019-02-15 10:20:59 -06:00
Fedora Release Engineering fcfc7780bf - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 10:45:49 +00:00
Rex Dieter 15f3cc33c7 5.11.3 2018-12-07 13:15:20 -06:00
Jan Grulich ff1b298c9f 5.11.2 2018-09-21 12:44:02 +02:00
Fedora Release Engineering c515289c1c - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 03:10:36 +00:00
Rex Dieter 77f3c2504a 5.11.1 2018-06-20 12:52:51 -05:00
Rex Dieter faefd43c5c BR: llvm-devel too 2018-05-27 13:15:15 -05:00
Rex Dieter 5438479c6d BR: clang-devel, drop (very) old Obsoletes 2018-05-27 12:57:02 -05:00
Rex Dieter 5f37aa0fa5 5.11.0
use %make_build
2018-05-27 12:07:14 -05:00
Rex Dieter c394dfe1ba BR: qt5-rpm-macros 2018-03-08 11:38:52 -06:00
Jan Grulich 0f7adec152 5.10.1 2018-02-13 15:33:30 +01:00
Fedora Release Engineering 1314463312 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 12:26:44 +00:00
Igor Gnatenko 468c8f0860
fix typo
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-31 11:37:48 +01:00
Igor Gnatenko 87de1092f0
Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-31 11:36:57 +01:00
Jan Grulich 9d86974a58 5.10.0 2017-12-20 09:24:11 +01:00
Jan Grulich 688c30ff23 5.9.3 2017-11-23 12:33:47 +01:00
Miro Hrončok 3aa79cfd7f Qt 5 Designer has 128x128 icon in 32x32 folder (#1400972) 2017-10-27 11:58:13 +02:00
Rex Dieter f1d34451e0 BR: qt5-qtbase-private-devel 2017-10-17 07:19:44 -05:00
Jan Grulich 78cbb87337 5.9.2 2017-10-09 15:17:58 +02:00
Rex Dieter d3078e2d32 Obsoletes: qt5-designer-plugin-webkit (upgrade path when webkit support is not enabled)
resurrect bootstrap macro (commented)
2017-09-29 08:47:28 -05:00
Fedora Release Engineering a20c957fc9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 07:21:43 +00:00
Fedora Release Engineering 877d2a81b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 12:45:43 +00:00
Rex Dieter 0a03a2352b 5.9.1 2017-07-19 13:14:20 -05:00
Rex Dieter 6a545d7b0b drop shadow/out-of-tree builds (#1456211,QTBUG-37417) 2017-06-16 07:14:46 -05:00
Rex Dieter bb1ae10764 rebuild 2017-06-02 10:04:05 -05:00
Helio Chissini de Castro 8e4df8f02e - 5.9.0 Final 2017-05-31 14:13:31 +02:00
Helio Chissini de Castro 938ee26881 - Release candidate 2017-05-28 00:28:15 +02:00
Rex Dieter 9fa58e7594 fix Release, Obsoletes: qt5-qttools-libs-clucene (#1454531) 2017-05-23 08:06:27 -05:00
Helio Chissini de Castro 2c399697f0 - noclucene 2017-05-09 21:50:24 +02:00
Helio Chissini de Castro 00da4a58c6 Beta 3 2017-05-09 21:16:39 +02:00
Rex Dieter bb9fcbe048 -devel: restore Requires: qt5-designer qt5-linguist 2017-03-31 13:07:56 -05:00
Rex Dieter d322291e71 de-bootstrap 2017-03-30 13:12:30 -05:00
Rex Dieter 30096a5382 bootstrap 5.8.0 (rawhide)
Created a meta package called qt5-doctools to avoid the mess of multiple tools

and remove changelog entries that were not in chronological order
2017-03-27 11:01:37 -05:00
Rex Dieter ee3b15e1e3 -assistant: Provides: bundled(clucene09) (f26+) 2017-03-26 20:13:50 +02:00
Rex Dieter e9dae1e9c8 disable system_lucene on f26+ (#1424227, #1424046) 2017-03-26 20:13:11 +02:00
Kevin Kofler b4cf117960 Update to 5.8.0
- Debootstrap
2017-03-26 19:20:14 +02:00
Rex Dieter fce87bd00a -assistant: Provides: bundled(clucene09) (f26+) 2017-03-21 08:19:02 -05:00
Rex Dieter 72c0cdd9fe disable system_lucene on f26+ (#1424227, #1424046) 2017-02-17 10:43:18 -06:00
Fedora Release Engineering f1810cd82e - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 11:22:17 +00:00
Rex Dieter 6913e4a4bb 5.7.1 dec5 snapshot 2016-12-10 06:21:31 -06:00
Rex Dieter c4091bf95f Qt 5 Designer has 128x128 icon in 32x32 folder (#1400972) 2016-12-02 07:34:18 -06:00
Helio Chissini de Castro 37b79ba7ec Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/qt5-qttools 2016-12-02 12:42:08 +01:00
Helio Chissini de Castro 7d8bc3db47 - Up the release 2016-12-02 12:41:45 +01:00
Rex Dieter f3c360a9ac Release++ 2016-12-02 05:38:14 -06:00
Rex Dieter 3020a17e96 de-bootstrap, enable -doc/-webkit 2016-12-01 13:07:13 -06:00
Rex Dieter c59be062ee restore features
boostrapping (enable for now, missing qtwebview)
static: move qt_lib_uitools*.pri here
2016-12-01 12:30:38 -06:00
Helio Chissini de Castro 9750dd06aa - Update for 5.7.1 tentative final packages 2016-12-01 16:49:27 +01:00
Rex Dieter 7905f3a4b5 static: move qt_lib_uitools*.pri here (#1396836) 2016-11-21 06:52:23 -06:00
Rex Dieter a269532a0b changelog typo 2016-08-13 06:57:43 -05:00
Michal Toman a93489cf2f Add explicit -latomic on 32-bit MIPS 2016-08-13 06:56:58 -05:00
Helio Chissini de Castro 7b02d43784 - Update Qt 5.7.0 2016-07-15 23:34:44 +02:00
5 changed files with 274 additions and 177 deletions

21
.gitignore vendored
View File

@ -1,13 +1,8 @@
/qttools-opensource-src-5.4.0.tar.xz
/qttools-opensource-src-5.4.1.tar.xz
/qttools-opensource-src-5.4.2.tar.xz
/qttools-opensource-src-5.5.0-rc.tar.xz
/qttools-opensource-src-5.5.0.tar.xz
/qttools-opensource-src-5.5.1-rc1.tar.xz
/qttools-opensource-src-5.5.1.tar.xz
/qttools-opensource-src-5.6.0-beta.tar.gz
/qttools-opensource-src-5.6.0-beta1.tar.xz
/qttools-opensource-src-5.6.0-beta2.tar.xz
/qttools-opensource-src-5.6.0-rc.tar.xz
/qttools-opensource-src-5.6.0.tar.xz
/qttools-opensource-src-5.6.1.tar.xz
/qttools-everywhere-src-5.10.1.tar.xz
/qttools-everywhere-src-5.11.0.tar.xz
/qttools-everywhere-src-5.11.1.tar.xz
/qttools-everywhere-src-5.11.2.tar.xz
/qttools-everywhere-src-5.11.3.tar.xz
/qttools-everywhere-src-5.12.1.tar.xz
/qttools-everywhere-src-5.12.3.tar.xz
/qttools-everywhere-src-5.12.4.tar.xz

View File

@ -1,37 +1,28 @@
%global qt_module qttools
%if 0%{?fedora} > 19 || 0%{?rhel} > 6
%global system_clucene 1
%endif
# 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
#global bootstrap 1
%if ! 0%{?bootstrap}
%ifarch %{arm} %{ix86} x86_64
%define docs 1
## don't enable until crasher fixed: https://bugzilla.redhat.com/show_bug.cgi?id=1470778
#global webkit 1
%endif
%endif
#define prerelease
Summary: Qt5 - QtTool components
Name: qt5-qttools
Version: 5.6.1
Release: 2%{?prerelease:.%{prerelease}}%{?dist}
Version: 5.12.4
Release: 2%{?dist}
License: LGPLv3 or LGPLv2
Url: http://www.qt.io
Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
Patch1: qttools-opensource-src-5.3.2-system-clucene.patch
%global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
# help lrelease/lupdate use/prefer qmake-qt5
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893
Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch
# workaround https://bugreports.qt-project.org/browse/QTBUG-43057
# 'make docs' crash on el6, use qSort instead of std::sort
Patch3: qttools-opensource-src-5.6-QTBUG-43057.patch
# 32-bit MIPS needs explicit -latomic
Patch4: qttools-opensource-src-5.7-add-libatomic.patch
## upstream patches
@ -45,46 +36,49 @@ Source23: qdbusviewer.desktop
BuildRequires: cmake
%endif
BuildRequires: desktop-file-utils
## optional (and deprecated), include in bootstrapping only for now
%if ! 0%{?bootstrap}
BuildRequires: pkgconfig(Qt5WebKit)
%global webkit 1
%endif
BuildRequires: /usr/bin/file
BuildRequires: qt5-rpm-macros >= %{version}
BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qtbase-static >= %{version}
BuildRequires: qt5-qtdeclarative-static >= %{version}
BuildRequires: pkgconfig(Qt5Qml)
# libQt5DBus.so.5(Qt_5_PRIVATE_API)
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
%if 0%{?system_clucene}
BuildRequires: clucene09-core-devel >= 0.9.21b-12
%if 0%{?bootstrap}
%global no_examples CONFIG-=compile_examples
Obsoletes: %{name}-examples < %{version}-%{release}
%else
# for qdoc
BuildRequires: clang-devel llvm-devel
%endif
Requires: %{name}-common = %{version}-%{release}
%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
# when -libs were split out, for multilib upgrade path
Obsoletes: qt5-tools < 5.4.0-0.2
%description
%{summary}.
%package common
Summary: Common files for %{name}
BuildArch: noarch
Obsoletes: qt5-qttools-libs-clucene < 5.9.0
%if ! 0%{?webkit}
Obsoletes: qt5-designer-plugin-webkit < 5.9.0
%endif
%description common
%{summary}.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs-clucene%{?_isa} = %{version}-%{release}
Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
Requires: qt5-qdoc = %{version}-%{release}
Requires: qt5-qhelpgenerator = %{version}-%{release}
Requires: qt5-doctools = %{version}-%{release}
Requires: qt5-designer = %{version}-%{release}
Requires: qt5-linguist = %{version}-%{release}
Requires: qt5-qtbase-devel%{?_isa}
%description devel
%{summary}.
@ -94,27 +88,15 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description static
%{summary}.
%package libs-clucene
Summary: Qt5 CLucene runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
%description libs-clucene
%{summary}.
%package libs-designer
Summary: Qt5 Designer runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
%description libs-designer
%{summary}.
%package libs-designercomponents
Summary: Qt5 Designer Components runtime library
Requires: %{name}-common = %{version}-%{release}
# when split happened
Conflicts: qt5-tools < 5.4.0-0.2
%description libs-designercomponents
%{summary}.
@ -139,11 +121,14 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
%description -n qt5-designer
%{summary}.
%if 0%{?webkit}
%package -n qt5-designer-plugin-webkit
Summary: Qt5 designer plugin for WebKit
BuildRequires: pkgconfig(Qt5WebKitWidgets)
Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release}
%description -n qt5-designer-plugin-webkit
%{summary}.
%endif
%package -n qt5-linguist
Summary: Qt5 Linguist Tools
@ -159,30 +144,19 @@ Requires: %{name}-common = %{version}-%{release}
QDbusviewer can be used to inspect D-Bus objects of running programs
and invoke methods on those objects.
%package -n qt5-qhelpgenerator
Summary: Qt5 Help generator tool
Requires: %{name}-libs-help%{?_isa} = %{version}-%{release}
%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
%description -n qt5-qhelpgenerator
%package -n qt5-doctools
Summary: Qt5 doc tools package
Provides: qt5-qdoc = %{version}
Obsoletes: qt5-qdoc < 5.8.0
Provides: qt5-qhelpgenerator = %{version}
Obsoletes: qt5-qhelpgenerator < 5.8.0
Provides: qt5-qtattributionsscanner = %{version}
Obsoletes: qt5-qtattributionsscanner < 5.8.0
Requires: qt5-qtattributionsscanner = %{version}
%package -n qt5-qdoc
Summary: Qt5 documentation generator
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n qt5-qdoc
%description -n qt5-doctools
%{summary}.
%if 0%{?docs}
%package doc
Summary: API documentation for %{name}
BuildRequires: qt5-qdoc
BuildRequires: qt5-qhelpgenerator
BuildArch: noarch
Conflicts: qt5-qtbase-doc < 5.6.0
%description doc
%{summary}.
%endif
%package examples
Summary: Programming examples for %{name}
Requires: %{name}-common = %{version}-%{release}
@ -191,38 +165,24 @@ Requires: %{name}-common = %{version}-%{release}
%prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
%if 0%{?system_clucene}
%patch1 -p1 -b .system_clucene
# bundled libs
rm -rf src/assistant/3rdparty/clucene
%endif
%setup -q -n %{qt_module}-everywhere-src-%{version}
%patch2 -p1 -b .qmake-qt5
%patch3 -p1 -b .QTBUG-43057
%ifarch %{mips32}
%patch4 -p1 -b .libatomic
%endif
%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{qmake_qt5} ..
%{qmake_qt5} \
%{?no_examples}
make %{?_smp_mflags}
%if 0%{?docs}
make %{?_smp_mflags} docs
%endif
popd
%make_build
%install
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
make install INSTALL_ROOT=%{buildroot}
%if 0%{?docs}
make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%endif
# Add desktop files, --vendor=qt4 helps avoid possible conflicts with qt3/qt4
# Add desktop files, --vendor=... helps avoid possible conflicts with qt3/qt4
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
--vendor="qt5" \
@ -231,7 +191,7 @@ desktop-file-install \
# icons
install -m644 -p -D src/assistant/assistant/images/assistant.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/assistant-qt5.png
install -m644 -p -D src/assistant/assistant/images/assistant-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/assistant-qt5.png
install -m644 -p -D src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/designer-qt5.png
install -m644 -p -D src/designer/src/designer/images/designer.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/designer-qt5.png
install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer-qt5.png
install -m644 -p -D src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer-qt5.png
# linguist icons
@ -240,12 +200,12 @@ for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
install -p -m644 -D ${icon} %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist-qt5.png
done
# hardlink files to %{_bindir}, add -qt5 postfix to not conflict
# hardlink files to {_bindir}, add -qt5 postfix to not conflict
mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt5_bindir}
for i in * ; do
case "${i}" in
assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo)
assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner)
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5
ln -sv ${i} ${i}-qt5
;;
@ -286,6 +246,19 @@ pushd tests/auto/cmake/%{_target_platform}
cmake ..
ctest --output-on-failure ||:
popd
# check icon resolutions
pushd %{buildroot}%{_datadir}/icons
for RES in $(ls hicolor); do
for APP in designer assistant linguist qdbusviewer; do
if [ -e hicolor/$RES/apps/${APP}*.* ]; then
file hicolor/$RES/apps/${APP}*.* | grep "$(echo $RES | sed 's/x/ x /')"
fi
done
done
popd
%endif
@ -299,27 +272,23 @@ popd
%files common
%license LICENSE.LGPL*
%post libs-clucene -p /sbin/ldconfig
%postun libs-clucene -p /sbin/ldconfig
%files libs-clucene
%{_qt5_libdir}/libQt5CLucene.so.5*
%ldconfig_scriptlets libs-designer
%post libs-designer -p /sbin/ldconfig
%postun libs-designer -p /sbin/ldconfig
%files libs-designer
%{_qt5_libdir}/libQt5Designer.so.5*
%dir %{_qt5_libdir}/cmake/Qt5Designer/
%post libs-designercomponents -p /sbin/ldconfig
%postun libs-designercomponents -p /sbin/ldconfig
%ldconfig_scriptlets libs-designercomponents
%files libs-designercomponents
%{_qt5_libdir}/libQt5DesignerComponents.so.5*
%post libs-help -p /sbin/ldconfig
%postun libs-help -p /sbin/ldconfig
%ldconfig_scriptlets libs-help
%files libs-help
%{_qt5_libdir}/libQt5Help.so.5*
%if 0%{?rhel} && 0%{?rhel} <= 7
%post -n qt5-assistant
touch --no-create %{_datadir}/icons/hicolor ||:
@ -331,6 +300,7 @@ if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi
%endif
%files -n qt5-assistant
%{_bindir}/assistant-qt5
@ -338,6 +308,31 @@ fi
%{_datadir}/applications/*assistant.desktop
%{_datadir}/icons/hicolor/*/apps/assistant*.*
%if 0%{?rhel} && 0%{?rhel} <= 7
%post -n qt5-doctools
touch --no-create %{_datadir}/icons/hicolor ||:
%posttrans -n qt5-doctools
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%postun -n qt5-doctools
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi
%endif
%files -n qt5-doctools
%{_bindir}/qdoc*
%{_qt5_bindir}/qdoc*
%{_bindir}/qdistancefieldgenerator*
%{_bindir}/qhelpgenerator*
%{_qt5_bindir}/qdistancefieldgenerator*
%{_qt5_bindir}/qhelpgenerator*
%{_bindir}/qtattributionsscanner-qt5
%{_qt5_bindir}/qtattributionsscanner*
%if 0%{?rhel} && 0%{?rhel} <= 7
%post -n qt5-designer
touch --no-create %{_datadir}/icons/hicolor ||:
@ -350,23 +345,13 @@ if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi
%endif
%files -n qt5-designer
%{_bindir}/designer*
%{_qt5_bindir}/designer*
%{_datadir}/applications/*designer.desktop
%{_datadir}/icons/hicolor/*/apps/designer*.*
%dir %{_qt5_libdir}/cmake/Qt5Designer/
%{_qt5_plugindir}/designer/libqquickwidget.so
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
%{_qt5_plugindir}/designer/libcontainerextension.so
%{_qt5_plugindir}/designer/libcustomwidgetplugin.so
%{_qt5_plugindir}/designer/libtaskmenuextension.so
%{_qt5_plugindir}/designer/libworldtimeclockplugin.so
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
%if 0%{?webkit}
%files -n qt5-designer-plugin-webkit
@ -374,6 +359,7 @@ fi
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
%endif
%if 0%{?rhel} && 0%{?rhel} <= 7
%post -n qt5-linguist
touch --no-create %{_datadir}/icons/hicolor ||:
@ -386,6 +372,7 @@ if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi
%endif
%files -n qt5-linguist
%{_bindir}/linguist*
@ -406,6 +393,7 @@ fi
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake
%{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
%if 0%{?rhel} && 0%{?rhel} <= 7
%post -n qt5-qdbusviewer
touch --no-create %{_datadir}/icons/hicolor ||:
@ -417,6 +405,7 @@ if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
fi
%endif
%files -n qt5-qdbusviewer
%{_bindir}/qdbusviewer*
@ -424,32 +413,21 @@ fi
%{_datadir}/applications/*qdbusviewer.desktop
%{_datadir}/icons/hicolor/*/apps/qdbusviewer*.*
%files -n qt5-qdoc
%{_bindir}/qdoc*
%{_qt5_bindir}/qdoc*
%files -n qt5-qhelpgenerator
%{_bindir}/qhelpgenerator*
%{_qt5_bindir}/qhelpgenerator*
%files devel
%{_bindir}/pixeltool*
%{_bindir}/qcollectiongenerator*
%{_bindir}/qhelpconverter*
#{_bindir}/qhelpconverter*
%{_bindir}/qtdiag*
%{_bindir}/qtplugininfo*
%{_qt5_bindir}/pixeltool*
%{_qt5_bindir}/qtdiag*
%{_qt5_bindir}/qcollectiongenerator*
%{_qt5_bindir}/qhelpconverter*
#{_qt5_bindir}/qhelpconverter*
%{_qt5_bindir}/qtplugininfo*
%{_qt5_headerdir}/QtCLucene/
%{_qt5_headerdir}/QtDesigner/
%{_qt5_headerdir}/QtDesignerComponents/
%{_qt5_headerdir}/QtHelp/
%{_qt5_headerdir}/QtUiPlugin
%{_qt5_libdir}/libQt5CLucene.prl
%{_qt5_libdir}/libQt5CLucene.so
%{_qt5_libdir}/libQt5Designer*.prl
%{_qt5_libdir}/libQt5Designer*.so
%{_qt5_libdir}/libQt5Help.prl
@ -460,7 +438,12 @@ fi
%{_qt5_libdir}/cmake/Qt5UiPlugin/
%{_qt5_libdir}/pkgconfig/Qt5Designer.pc
%{_qt5_libdir}/pkgconfig/Qt5Help.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
%files static
%{_qt5_headerdir}/QtUiTools/
@ -468,34 +451,154 @@ fi
%{_qt5_libdir}/libQt5UiTools.prl
%{_qt5_libdir}/cmake/Qt5UiTools/
%{_qt5_libdir}/pkgconfig/Qt5UiTools.pc
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools.pri
%{_qt5_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri
%if 0%{?docs}
%files doc
%license LICENSE.FDL
%{_qt5_docdir}/qtassistant.qch
%{_qt5_docdir}/qtassistant/
%{_qt5_docdir}/qtdesigner.qch
%{_qt5_docdir}/qtdesigner/
%{_qt5_docdir}/qdoc.qch
%{_qt5_docdir}/qdoc/
%{_qt5_docdir}/qthelp.qch
%{_qt5_docdir}/qthelp/
%{_qt5_docdir}/qtlinguist.qch
%{_qt5_docdir}/qtlinguist/
%{_qt5_docdir}/qtuitools.qch
%{_qt5_docdir}/qtuitools/
%endif
%if ! 0%{?no_examples:1}
%files examples
%{_qt5_examplesdir}/
%{_qt5_plugindir}/designer/*
%dir %{_qt5_libdir}/cmake/Qt5Designer
%{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_*
%endif
%changelog
* Fri Jun 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2
- drop BR: double-conversion (fix qtdeclarative instead)
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
- Update to 5.6.1
* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
- 5.12.4
* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
- 5.12.3
* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
- 5.12.1
- better bootstrap support (examples)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
- 5.11.3
* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
- 5.11.2
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
- 5.11.1
* Sat May 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
- 5.11.0
- use %%make_build
* Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2
- BR: qt5-rpm-macros
* Tue Feb 13 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1
- 5.10.1
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jan 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.10.0-2
- Remove obsolete scriptlets
* Tue Dec 19 2017 Jan Grulich <jgrulich@redhat.com> - 5.10.0-1
- 5.10.0
* Thu Nov 23 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.3-1
- 5.9.3
* Fri Oct 27 2017 Miro Hrončok <mhroncok@redhat.com> - 5.9.2-3
- Qt 5 Designer has 128x128 icon in 32x32 folder (#1400972)
* Tue Oct 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
- BR: qt5-qtbase-private-devel
* Mon Oct 09 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.2-1
- 5.9.2
* Fri Sep 29 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-4
- Obsoletes: qt5-designer-plugin-webkit (upgrade path when webkit support is not enabled)
- resurrect bootstrap macro (commented)
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Jul 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-1
- 5.9.1
* Fri Jun 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-3
- drop shadow/out-of-tree builds (#1456211,QTBUG-37417)
* Fri Jun 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-2
- rebuild
* Wed May 31 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-1
- Upstream official release
* Fri May 26 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.1.rc
- Upstream Release Candidate retagged
* Tue May 23 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-0.4.beta3
- fix Release, Obsoletes: qt5-qttools-libs-clucene (#1454531)
* Tue May 09 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.beta.3
- Upstream beta 3
* Fri Mar 31 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-6
- -devel: restore Requires: qt5-designer qt5-linguist
* Thu Mar 30 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-5
- de-bootstrap
* Mon Mar 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-4
- bootstrap 5.8.0 (rawhide)
- Created a meta package called qt5-doctools to avoid the mess of multiple tools
* Tue Mar 21 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-6
- -assistant: Provides: bundled(clucene09) (f26+)
* Fri Feb 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-5
- disable system_lucene on f26+ (#1424227, #1424046)
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sat Dec 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-4
- 5.7.1 dec5 snapshot
* Fri Dec 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-3
- Qt 5 Designer has 128x128 icon in 32x32 folder (#1400972)
* Thu Dec 01 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
- de-bootstrap, enable -doc/-webkit
* Wed Nov 23 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.1-1
- New upstream version
* Mon Nov 21 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-4
- -static: move qt_lib_uitools*.pri here (#1396836)
* Fri Aug 12 2016 Michal Toman <mtoman@fedoraproject.org> - 5.7.0-3
- Add explicit -latomic on 32-bit MIPS
* Mon Jul 04 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
- Compiled with gcc
* Tue Jun 14 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-1
- Qt 5.7.0 release
* Mon Jun 13 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-0.1
- Prepare 5.7.0
* Sun Mar 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-3
- rebuild
@ -693,7 +796,7 @@ fi
- %%check: first try
* Tue Sep 10 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-2
- ExclusiveArch: %{ix86} x86_64 %{arm}
- ExclusiveArch: {ix86} x86_64 {arm}
- epel-6 love
* Wed Aug 28 2013 Rex Dieter <rdieter@fedoraproject.org> 5.1.1-1

View File

@ -1,12 +0,0 @@
diff -up qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp
--- qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp.orig 2015-12-14 10:58:18.000000000 -0600
+++ qttools-opensource-src-5.6.0-beta/src/qdoc/qdocindexfiles.cpp 2016-01-17 20:42:45.946004310 -0600
@@ -1531,7 +1531,7 @@ void QDocIndexFiles::generateIndexSectio
const Aggregate* inner = static_cast<const Aggregate*>(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);

View File

@ -0,0 +1,11 @@
diff -urp qttools-opensource-src-5.6.0-beta1/src/qtdiag/qtdiag.pro q/src/qtdiag/qtdiag.pro
--- qttools-opensource-src-5.6.0-beta1/src/qtdiag/qtdiag.pro 2015-10-30 11:48:01.000000000 +0100
+++ q/src/qtdiag/qtdiag.pro 2016-04-30 08:45:22.099054040 +0200
@@ -2,6 +2,7 @@ load(qt_app)
CONFIG += console
QT += core-private gui-private
+LIBS += -latomic
qtHaveModule(network) {
QT += network

View File

@ -1 +1 @@
bf2cea01e94140524a3fc58c2f2ddebc qttools-opensource-src-5.6.1.tar.xz
SHA512 (qttools-everywhere-src-5.12.4.tar.xz) = 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466