applications-17.12.0:ver.bump

This commit is contained in:
sss
2017-12-16 22:42:54 +03:00
parent 73f840488f
commit 559f905ee2
2 changed files with 42 additions and 1 deletions
@@ -0,0 +1,38 @@
diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2017-12-08 04:04:08.000000000 +0300
+++ b/CMakeLists.txt 2017-12-16 22:30:39.116533942 +0300
@@ -24,7 +24,7 @@
set(LIBKLEO_LIB_VERSION ${PIM_VERSION})
-set(QT_REQUIRED_VERSION "5.8.0")
+set(QT_REQUIRED_VERSION "5.7.1")
set(KDEPIMTEXTEDIT_VERSION "5.7.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
diff -Nuar a/src/kleo/dn.cpp b/src/kleo/dn.cpp
--- a/src/kleo/dn.cpp 2017-12-04 13:20:17.000000000 +0300
+++ b/src/kleo/dn.cpp 2017-12-16 22:35:27.941513102 +0300
@@ -298,7 +298,9 @@
case ';':
result += QLatin1Char('\\');
// fall through
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
Q_FALLTHROUGH();
+#endif
default:
result += ch;
}
diff -Nuar a/src/utils/formatting.cpp b/src/utils/formatting.cpp
--- a/src/utils/formatting.cpp 2017-12-04 13:20:17.000000000 +0300
+++ b/src/utils/formatting.cpp 2017-12-16 22:40:08.089492888 +0300
@@ -593,7 +593,9 @@
return i18nc("good/valid signature", "good");
}
}
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
Q_FALLTHROUGH();
+#endif
// fall through:
case UserID::Signature::GeneralError:
return i18n("invalid");
+4 -1
View File
@@ -47,6 +47,9 @@
<Dependency>extra-cmake-modules</Dependency>
<Dependency>kpimtextedit-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>qt5.patch</Patch>
</Patches>
</Source>
<Package>
@@ -124,7 +127,7 @@
<History>
<Update release="12">
<Date>2017-12-15</Date>
<Date>2017-12-16</Date>
<Version>17.12.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>