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

QMimeType: remove unwanted *.bin as preferredSuffix for octet-stream (fdo#101667,kde#382437)

Browse Source
This commit is contained in:
Rex Dieter 2018-01-28 07:22:26 -06:00
parent 507fe0eddd
commit 5cbfe51f81
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt5-qtbase.spec
View File

@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.10.0 Version: 5.10.0
Release: 2%{?dist} Release: 3%{?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
@ -93,6 +93,13 @@ Patch51: qtbase-hidpi_scale_at_192.patch
# 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff # 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch Patch52: qtbase-opensource-src-5.7.1-moc_macros.patch
# QMimeType: remove unwanted *.bin as preferredSuffix for octet-stream
# This leads to an automatically appended .bin when saving a file.
# https://bugs.freedesktop.org/show_bug.cgi?id=101667
# https://bugs.kde.org/382437
# Fixed upstream in shared-mime-info 1.10
Patch53: qtbase-fdo101667.patch
# drop -O3 and make -O2 by default # drop -O3 and make -O2 by default
Patch61: qt5-qtbase-cxxflag.patch Patch61: qt5-qtbase-cxxflag.patch
@ -345,6 +352,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
%patch50 -p1 -b .QT_VERSION_CHECK %patch50 -p1 -b .QT_VERSION_CHECK
%patch51 -p1 -b .hidpi_scale_at_192 %patch51 -p1 -b .hidpi_scale_at_192
%patch52 -p1 -b .moc_macros %patch52 -p1 -b .moc_macros
%patch53 -p1 -b .fdo101667
%patch61 -p1 -b .qt5-qtbase-cxxflag %patch61 -p1 -b .qt5-qtbase-cxxflag
%patch64 -p1 -b .firebird %patch64 -p1 -b .firebird
%if 0%{?fedora} > 27 %if 0%{?fedora} > 27
@ -975,6 +983,9 @@ fi
%changelog %changelog
* Sun Jan 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-3
- QMimeType: remove unwanted *.bin as preferredSuffix for octet-stream (fdo#101667,kde#382437)
* Fri Jan 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-2 * Fri Jan 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-2
- re-enable gold linker (#1458003) - re-enable gold linker (#1458003)
- drop qt5_null_flag/qt5_deprecated_flag hacks (should be fixed upstream for awhile) - drop qt5_null_flag/qt5_deprecated_flag hacks (should be fixed upstream for awhile)

12
qtbase-fdo101667.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp.fdo101667 qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp
--- qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp.fdo101667 2018-01-16 00:53:43.000000000 -0600
+++ qtbase-opensource-src-5.9.4/src/corelib/mimetypes/qmimetype.cpp 2018-01-28 07:18:09.502534397 -0600
@@ -418,6 +418,8 @@ QStringList QMimeType::suffixes() const
*/
QString QMimeType::preferredSuffix() const
{
+ if (isDefault()) // workaround for unwanted *.bin suffix for octet-stream, https://bugs.freedesktop.org/show_bug.cgi?id=101667, fixed upstream in 1.10
+ return QString();
const QStringList suffixList = suffixes();
return suffixList.isEmpty() ? QString() : suffixList.at(0);
}