rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swap the QTBUG-34614 and QTBUG-37380 patches

This commit is contained in:
Kevin Kofler 2014-06-07 03:42:45 +02:00
parent 83f139ea97
commit 44863ece3d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt.spec
View File

@ -142,8 +142,8 @@ Patch84: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
Patch86: qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch
# fixes for LibreOffice from the upstream Qt bug tracker (#1105422):
Patch87: qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
Patch88: qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch
Patch87: qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch
Patch88: qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
Patch89: qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch
# upstream patches
@ -524,8 +524,8 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch81 -p1 -b .assistant-crash
%patch82 -p1 -b .QTBUG-4862
%patch83 -p1 -b .poll
%patch87 -p0 -b .QTBUG-34614
%patch88 -p1 -b .QTBUG-37380
%patch87 -p1 -b .QTBUG-37380
%patch88 -p0 -b .QTBUG-34614
%patch89 -p0 -b .QTBUG-38585
# upstream patches
@ -1237,7 +1237,7 @@ fi
%changelog
* Fri Jun 06 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.6-9
* Sat Jun 07 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.8.6-9
- apply proposed fixes for QTBUG-34614,37380,38585 for LibreOffice (#1105422)
* Tue Jun 03 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.6-8