Hello community, here is the log from the commit of package kdenlive for openSUSE:Factory checked in at 2018-01-07 17:23:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenlive (Old) and /work/SRC/openSUSE:Factory/.kdenlive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdenlive" Sun Jan 7 17:23:28 2018 rev:45 rq:562198 version:17.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdenlive/kdenlive.changes 2017-12-19 10:53:25.324022105 +0100 +++ /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive.changes 2018-01-07 17:23:35.431039554 +0100 @@ -1,0 +2,6 @@ +Wed Jan 3 10:59:30 UTC 2018 - wba...@tmo.at + +- Add fix-build-with-Qt5.6.patch to make it compile on standard + Leap 42.3 + +------------------------------------------------------------------- New: ---- fix-build-with-Qt5.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenlive.spec ++++++ --- /var/tmp/diff_new_pack.w4EvO5/_old 2018-01-07 17:23:36.410993621 +0100 +++ /var/tmp/diff_new_pack.w4EvO5/_new 2018-01-07 17:23:36.414993434 +0100 @@ -32,6 +32,8 @@ Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://www.kdenlive.org/ Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: fix-build-with-Qt5.6.patch BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -110,6 +112,7 @@ %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build ++++++ fix-build-with-Qt5.6.patch ++++++ >From 7e68d2c3485d78c30b440824f3851b433dd779e3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <wba...@tmo.at> Date: Wed, 3 Jan 2018 11:57:04 +0100 Subject: [PATCH] Fix build with Qt 5.6 Q(Gui)Application::setDesktopFileName() was introduced in Qt 5.7, but kdenlive specifies 5.6.0 as minimum version in CMakeLists.txt. Differential Revision: https://phabricator.kde.org/D9634 --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index dd630d1b7..8e3ca6e47 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -67,7 +67,9 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); app.setApplicationName(QStringLiteral("kdenlive")); app.setOrganizationDomain(QStringLiteral("kde.org")); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) app.setDesktopFileName(QStringLiteral("org.kde.kdenlive")); +#endif app.setWindowIcon(QIcon(QStringLiteral(":/pics/kdenlive.png"))); KLocalizedString::setApplicationDomain("kdenlive"); KSharedConfigPtr config = KSharedConfig::openConfig(); -- 2.13.6
