kmime:ver.bump

This commit is contained in:
sss
2017-12-16 14:12:30 +03:00
parent 84957c6955
commit ac486f71c5
2 changed files with 53 additions and 1 deletions
@@ -0,0 +1,49 @@
diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2017-12-08 04:01:51.000000000 +0300
+++ b/CMakeLists.txt 2017-12-16 13:52:00.845672814 +0300
@@ -22,7 +22,7 @@
set(KMIME_LIB_VERSION ${PIM_VERSION})
-set(QT_REQUIRED_VERSION "5.8.0")
+set(QT_REQUIRED_VERSION "5.7.1")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core)
ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME
diff -Nuar a/src/kmime_header_parsing.cpp b/src/kmime_header_parsing.cpp
--- a/src/kmime_header_parsing.cpp 2017-12-02 10:23:33.000000000 +0300
+++ b/src/kmime_header_parsing.cpp 2017-12-16 14:10:14.307593916 +0300
@@ -452,7 +452,9 @@
scursor = oldscursor;
}
// fall through
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
Q_FALLTHROUGH();
+#endif
}
default:
KMIME_WARN_IF_8BIT(ch);
@@ -636,7 +638,9 @@
// parse as atom:
scursor = oldscursor;
}
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
Q_FALLTHROUGH();
+#endif
// fall though...
default: //atom
diff -Nuar a/src/kmime_util.cpp b/src/kmime_util.cpp
--- a/src/kmime_util.cpp 2017-12-02 10:23:33.000000000 +0300
+++ b/src/kmime_util.cpp 2017-12-16 14:06:40.956609310 +0300
@@ -98,10 +98,8 @@
switch (cf.type()) {
case CharFreq::SevenBitText:
allowed << Headers::CE7Bit;
- Q_FALLTHROUGH();
case CharFreq::EightBitText:
allowed << Headers::CE8Bit;
- Q_FALLTHROUGH();
case CharFreq::SevenBitData:
if (cf.printableRatio() > 5.0 / 6.0) {
// let n the length of data and p the number of printable chars.
+4 -1
View File
@@ -23,6 +23,9 @@
<Dependency>kdoctools-devel</Dependency>
<Dependency>kdelibs4-support-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>qt5.patch</Patch>
</Patches>
</Source>
<Package>
@@ -58,7 +61,7 @@
<History>
<Update release="14">
<Date>2017-12-15</Date>
<Date>2017-12-16</Date>
<Version>17.12.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>