rpms/qt5-qtbase
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use upstream commit/fix for QTBUG-46310

Browse Source
This commit is contained in:
Rex Dieter 2015-08-06 08:23:57 -05:00
parent 7fc829f49e
commit c5b8b67cf6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qt5-qtbase.spec
View File

@ -39,7 +39,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.5.0 Version: 5.5.0
Release: 12%{?dist} Release: 13%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -96,15 +96,15 @@ Patch52: qtbase-opensource-src-5.4.1-QTBUG-33093.patch
# adapted to apply on top of patch51 # adapted to apply on top of patch51
Patch53: qtbase-opensource-src-5.4.1-QTBUG-45484.patch Patch53: qtbase-opensource-src-5.4.1-QTBUG-45484.patch
# https://bugreports.qt.io/browse/QTBUG-46310
#SM_CLIENT_ID property is not set
Patch54: qtbase-opensource-src-5.4.1-QTBUG-46310.patch
## upstream patches ## upstream patches
# workaround https://bugreports.qt-project.org/browse/QTBUG-43057 # workaround https://bugreports.qt-project.org/browse/QTBUG-43057
# 'make docs' crash on el6, use qSort instead of std::sort # 'make docs' crash on el6, use qSort instead of std::sort
Patch100: qtbase-opensource-src-5.4.0-QTBUG-43057.patch Patch100: qtbase-opensource-src-5.4.0-QTBUG-43057.patch
# https://bugreports.qt.io/browse/QTBUG-46310
#SM_CLIENT_ID property is not set
Patch123: 0123-xcb-set-SM_CLIENT_ID-property.patch
# macros, be mindful to keep sync'd with macros.qt5 # macros, be mindful to keep sync'd with macros.qt5
Source1: macros.qt5 Source1: macros.qt5
%define _qt5 %{name} %define _qt5 %{name}
@ -365,11 +365,11 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch51 -p1 -b .disconnect_displays %patch51 -p1 -b .disconnect_displays
%patch52 -p1 -b .QTBUG-33093 %patch52 -p1 -b .QTBUG-33093
%patch53 -p1 -b .QTBUG-45484 %patch53 -p1 -b .QTBUG-45484
%patch54 -p1 -b .QTBUG-46310
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
%patch100 -p1 -b .QTBUG-43057 %patch100 -p1 -b .QTBUG-43057
%endif %endif
%patch123 -p1 -b .QTBUG-46310
# drop -fexceptions from $RPM_OPT_FLAGS # drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@ -919,6 +919,9 @@ fi
%changelog %changelog
* Thu Aug 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-13
- use upstream commit/fix for QTBUG-46310
* Wed Aug 05 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.5.0-12 * Wed Aug 05 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.5.0-12
- remove GDB hackery, it is not producing useful backtraces for the ARM crash - remove GDB hackery, it is not producing useful backtraces for the ARM crash