qt5.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
  2. --- a/CMakeLists.txt 2017-12-08 04:04:08.000000000 +0300
  3. +++ b/CMakeLists.txt 2017-12-16 22:30:39.116533942 +0300
  4. @@ -24,7 +24,7 @@
  5. set(libkleo-kf6_LIB_VERSION ${PIM_VERSION})
  6. -set(QT_REQUIRED_VERSION "6.6.3")
  7. +set(QT_REQUIRED_VERSION "6.6.3")
  8. set(KDEPIMTEXTEDIT_VERSION "5.7.0")
  9. find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
  10. diff -Nuar a/src/kleo/dn.cpp b/src/kleo/dn.cpp
  11. --- a/src/kleo/dn.cpp 2017-12-04 13:20:17.000000000 +0300
  12. +++ b/src/kleo/dn.cpp 2017-12-16 22:35:27.941513102 +0300
  13. @@ -298,7 +298,9 @@
  14. case ';':
  15. result += QLatin1Char('\\');
  16. // fall through
  17. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  18. Q_FALLTHROUGH();
  19. +#endif
  20. default:
  21. result += ch;
  22. }
  23. diff -Nuar a/src/utils/formatting.cpp b/src/utils/formatting.cpp
  24. --- a/src/utils/formatting.cpp 2017-12-04 13:20:17.000000000 +0300
  25. +++ b/src/utils/formatting.cpp 2017-12-16 22:40:08.089492888 +0300
  26. @@ -593,7 +593,9 @@
  27. return i18nc("good/valid signature", "good");
  28. }
  29. }
  30. +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
  31. Q_FALLTHROUGH();
  32. +#endif
  33. // fall through:
  34. case UserID::Signature::GeneralError:
  35. return i18n("invalid");