diff -Nru kmediaplayer-5.28.0/autotests/playertest.cpp kmediaplayer-5.31.0/autotests/playertest.cpp --- kmediaplayer-5.28.0/autotests/playertest.cpp 2016-11-05 11:06:41.000000000 +0000 +++ kmediaplayer-5.31.0/autotests/playertest.cpp 2017-02-04 18:24:31.000000000 +0000 @@ -39,7 +39,7 @@ void cleanup() { delete player; - player = 0; + player = nullptr; } void testParent(); diff -Nru kmediaplayer-5.28.0/autotests/testplayer.h kmediaplayer-5.31.0/autotests/testplayer.h --- kmediaplayer-5.28.0/autotests/testplayer.h 2016-11-05 11:06:41.000000000 +0000 +++ kmediaplayer-5.31.0/autotests/testplayer.h 2017-02-04 18:24:31.000000000 +0000 @@ -37,7 +37,7 @@ KMediaPlayer::View *view() Q_DECL_OVERRIDE { - return 0; + return nullptr; } void pause() Q_DECL_OVERRIDE { diff -Nru kmediaplayer-5.28.0/autotests/viewtest.cpp kmediaplayer-5.31.0/autotests/viewtest.cpp --- kmediaplayer-5.28.0/autotests/viewtest.cpp 2016-11-05 11:06:41.000000000 +0000 +++ kmediaplayer-5.31.0/autotests/viewtest.cpp 2017-02-04 18:24:31.000000000 +0000 @@ -40,7 +40,7 @@ void cleanup() { delete view; - view = 0; + view = nullptr; } void testParent(); @@ -61,7 +61,7 @@ void ViewTest::testDefaultVideoWidget() { - QCOMPARE(view->videoWidget(), static_cast(0)); + QCOMPARE(view->videoWidget(), static_cast(nullptr)); } void ViewTest::testSetVideoWidget() @@ -71,8 +71,8 @@ view->setVideoWidgetWrapper(widget.data()); QCOMPARE(view->videoWidget(), widget.data()); - view->setVideoWidgetWrapper(0); - QCOMPARE(view->videoWidget(), static_cast(0)); + view->setVideoWidgetWrapper(nullptr); + QCOMPARE(view->videoWidget(), static_cast(nullptr)); } void ViewTest::testSetButtons() diff -Nru kmediaplayer-5.28.0/CMakeLists.txt kmediaplayer-5.31.0/CMakeLists.txt --- kmediaplayer-5.28.0/CMakeLists.txt 2016-11-05 11:06:41.000000000 +0000 +++ kmediaplayer-5.31.0/CMakeLists.txt 2017-02-04 18:24:31.000000000 +0000 @@ -1,13 +1,15 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) -project(KMediaPlayer) +set(KF5_VERSION "5.31.0") # handled by release scripts +set(KF5_DEP_VERSION "5.31.0") # handled by release scripts +project(KMediaPlayer VERSION ${KF5_VERSION}) # # CMake stuff from ECM # include(FeatureSummary) -find_package(ECM 5.28.0 NO_MODULE) +find_package(ECM 5.31.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -17,19 +19,16 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) - include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) -set(KF5_VERSION "5.28.0") # handled by release scripts -set(KF5_DEP_VERSION "5.28.0") # handled by release scripts # # Version info # -ecm_setup_version(${KF5_VERSION} +ecm_setup_version(PROJECT VARIABLE_PREFIX KMEDIAPLAYER VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmediaplayer_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MediaPlayerConfigVersion.cmake" @@ -43,7 +42,7 @@ # # Dependencies # -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) @@ -66,7 +65,7 @@ # Config.cmake stuff # set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MediaPlayer") -ecm_configure_package_config_file( +configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5MediaPlayerConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5MediaPlayerConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}) diff -Nru kmediaplayer-5.28.0/debian/changelog kmediaplayer-5.31.0/debian/changelog --- kmediaplayer-5.28.0/debian/changelog 2016-12-05 20:15:40.000000000 +0000 +++ kmediaplayer-5.31.0/debian/changelog 2017-02-14 22:50:08.000000000 +0000 @@ -1,3 +1,17 @@ +kmediaplayer (5.31.0-0ubuntu1) zesty; urgency=medium + + * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to + avoid possible spurious test failures. + * New upstream release (5.31.0) + + -- José Manuel Santamaría Lema Tue, 14 Feb 2017 22:50:08 +0000 + +kmediaplayer (5.30.0-0ubuntu1) zesty; urgency=low + + * New upstream release (5.30.0) + + -- Rik Mills Wed, 01 Feb 2017 18:33:45 +0000 + kmediaplayer (5.28.0-0ubuntu1) zesty; urgency=low [ Rik Mills ] diff -Nru kmediaplayer-5.28.0/debian/control kmediaplayer-5.31.0/debian/control --- kmediaplayer-5.28.0/debian/control 2016-12-05 20:15:40.000000000 +0000 +++ kmediaplayer-5.31.0/debian/control 2017-02-14 22:50:08.000000000 +0000 @@ -5,9 +5,9 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.28.0~), - libkf5parts-dev (>= 5.28.0~), - libkf5xmlgui-dev (>= 5.28.0~), + extra-cmake-modules (>= 5.31.0~), + libkf5parts-dev (>= 5.31.0~), + libkf5xmlgui-dev (>= 5.31.0~), pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.6.1~), xauth, @@ -21,7 +21,7 @@ Architecture: any Section: libdevel Depends: libkf5mediaplayer5 (= ${binary:Version}), - libkf5parts-dev (>= 5.28.0~), + libkf5parts-dev (>= 5.31.0~), ${misc:Depends} Description: Plugin interface for media player features. It provides all of the necessary media player operations, diff -Nru kmediaplayer-5.28.0/debian/libkf5mediaplayer-dev.acc.in kmediaplayer-5.31.0/debian/libkf5mediaplayer-dev.acc.in --- kmediaplayer-5.28.0/debian/libkf5mediaplayer-dev.acc.in 2016-12-05 20:15:40.000000000 +0000 +++ kmediaplayer-5.31.0/debian/libkf5mediaplayer-dev.acc.in 2017-02-14 22:50:08.000000000 +0000 @@ -1,4 +1,4 @@ - + @@ -15,6 +15,7 @@ -fPIC + -fno-keep-inline-functions - + \ No newline at end of file diff -Nru kmediaplayer-5.28.0/KF5MediaPlayerConfig.cmake.in kmediaplayer-5.31.0/KF5MediaPlayerConfig.cmake.in --- kmediaplayer-5.28.0/KF5MediaPlayerConfig.cmake.in 2016-11-05 11:06:41.000000000 +0000 +++ kmediaplayer-5.31.0/KF5MediaPlayerConfig.cmake.in 2017-02-04 18:24:31.000000000 +0000 @@ -2,6 +2,7 @@ # Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file. +include(CMakeFindDependencyMacro) find_dependency(KF5Parts "@KF5_DEP_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5MediaPlayerTargets.cmake") diff -Nru kmediaplayer-5.28.0/metainfo.yaml kmediaplayer-5.31.0/metainfo.yaml --- kmediaplayer-5.28.0/metainfo.yaml 2016-11-05 11:06:41.000000000 +0000 +++ kmediaplayer-5.31.0/metainfo.yaml 2017-02-04 18:24:31.000000000 +0000 @@ -4,6 +4,7 @@ type: integration platforms: - name: Linux + - name: FreeBSD - name: Windows - name: MacOSX portingAid: true diff -Nru kmediaplayer-5.28.0/src/view.cpp kmediaplayer-5.31.0/src/view.cpp --- kmediaplayer-5.28.0/src/view.cpp 2016-11-05 11:06:41.000000000 +0000 +++ kmediaplayer-5.31.0/src/view.cpp 2017-02-04 18:24:31.000000000 +0000 @@ -27,7 +27,7 @@ { public: Private() - : videoWidget(0L) + : videoWidget(nullptr) , currentButtons(All) { if (!buttonEnumRegistered) {