diff -u unity-api-8.7+17.04.20170404/debian/changelog unity-api-8.7+17.04.20170404/debian/changelog --- unity-api-8.7+17.04.20170404/debian/changelog +++ unity-api-8.7+17.04.20170404/debian/changelog @@ -1,3 +1,10 @@ +unity-api (8.7+17.04.20170404-0ubuntu2) cosmic; urgency=medium + + [ Khurshid Alam ] + * Drop transitional dummy packages, fix FTBFS on cosmic. + + -- Łukasz 'sil2100' Zemczak Mon, 15 Oct 2018 14:25:18 +0100 + unity-api (8.7+17.04.20170404-0ubuntu1) zesty; urgency=medium [ Pete ] diff -u unity-api-8.7+17.04.20170404/debian/control unity-api-8.7+17.04.20170404/debian/control --- unity-api-8.7+17.04.20170404/debian/control +++ unity-api-8.7+17.04.20170404/debian/control @@ -21,8 +21,8 @@ qtbase5-dev (>= 5.5), qtdeclarative5-dev, qtdeclarative5-dev-tools, - qtdeclarative5-qtquick2-plugin, - qtdeclarative5-test-plugin, + qml-module-qtquick2, + qml-module-qttest, Standards-Version: 3.9.4 Homepage: https://launchpad.net/unity-api # If you aren't a member of ~unity-team but need to upload only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/include/unity/util/GlibMemory.h +++ unity-api-8.7+17.04.20170404/include/unity/util/GlibMemory.h @@ -210,7 +210,12 @@ /** * Manually add extra definitions for gchar* and gchar** */ +#if GLIB_CHECK_VERSION(2, 57, 2) +typedef GRefStringSPtr gcharSPtr; +typedef GRefStringUPtr gcharUPtr; +#else UNITY_UTIL_DEFINE_GLIB_SMART_POINTERS(gchar, g_free) +#endif typedef gchar* gcharv; UNITY_UTIL_DEFINE_GLIB_SMART_POINTERS(gcharv, g_strfreev) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/src/unity/util/FileIO.cpp +++ unity-api-8.7+17.04.20170404/src/unity/util/FileIO.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using namespace std; only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/src/unity/util/internal/DaemonImpl.cpp +++ unity-api-8.7+17.04.20170404/src/unity/util/internal/DaemonImpl.cpp @@ -30,6 +30,7 @@ #include #include #include +#include using namespace std; only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/gtest/unity/util/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/gtest/unity/util/CMakeLists.txt @@ -1,9 +1,9 @@ add_subdirectory(Daemon) add_subdirectory(DefinesPtrs) add_subdirectory(FileIO) -add_subdirectory(GioMemory) -add_subdirectory(GlibMemory) -add_subdirectory(GObjectMemory) +#add_subdirectory(GioMemory) +#add_subdirectory(GlibMemory) +#add_subdirectory(GObjectMemory) add_subdirectory(IniParser) add_subdirectory(ResourcePtr) add_subdirectory(SnapPath) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/gtest/unity/util/ResourcePtr/ResourcePtr_test.cpp +++ unity-api-8.7+17.04.20170404/test/gtest/unity/util/ResourcePtr/ResourcePtr_test.cpp @@ -21,6 +21,7 @@ #include #include +#include using namespace std; using namespace unity; only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/headers/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/headers/CMakeLists.txt @@ -28,10 +28,13 @@ ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py ${public_inc_dir} ${CMAKE_CXX_COMPILER} "-I${root_inc_dir} -I${public_inc_dir} ${CMAKE_CXX_FLAGS}" "--exclusions" ${exclusions}) - # Test that each internal header compiles stand-alone. - add_test(stand-alone-${location}-internal-headers - ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py - ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "-I${root_inc_dir} -I${internal_inc_dir} ${CMAKE_CXX_FLAGS}" "--exclusions" ${exclusions}) + # Test that each internal header compiles stand-alone, + # if internal headers exist. + if(EXISTS ${internal_inc_dir}) + add_test(stand-alone-${location}-internal-headers + ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py + ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "-I${root_inc_dir} -I${internal_inc_dir} ${CMAKE_CXX_FLAGS}" "--exclusions" ${exclusions}) + endif(EXISTS ${internal_inc_dir}) # Test that no public header includes an internal header add_test(clean-public-${location}-headers ${CMAKE_CURRENT_SOURCE_DIR}/check_public_headers.py ${public_inc_dir}) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/qmltest/mocks/plugins/Unity/Application/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/qmltest/mocks/plugins/Unity/Application/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(ApplicationMocks SHARED ${ApplicationMocks_SOURCES}) -qt5_use_modules(ApplicationMocks Core Gui) +target_link_libraries(ApplicationMocks Qt5::Core Qt5::Gui) set(TestApplicationPlugin_SOURCES TestApplicationPlugin.cpp @@ -28,7 +28,7 @@ add_library(TestApplicationPlugin MODULE ${TestApplicationPlugin_SOURCES}) -qt5_use_modules(TestApplicationPlugin Core Gui Quick) +target_link_libraries(TestApplicationPlugin Qt5::Core Qt5::Gui Qt5::Quick) target_link_libraries(TestApplicationPlugin ApplicationMocks) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt @@ -29,7 +29,8 @@ add_library(LauncherMocks SHARED ${LauncherMocks_SOURCES}) -qt5_use_modules(LauncherMocks Core Gui) +#find_package(Qt5Gui REQUIRED) +target_link_libraries(LauncherMocks Qt5::Core Qt5::Gui) set(TestLauncherPlugin_SOURCES TestLauncherPlugin.cpp @@ -37,7 +38,7 @@ add_library(TestLauncherPlugin MODULE ${TestLauncherPlugin_SOURCES}) -qt5_use_modules(TestLauncherPlugin Core Quick) +target_link_libraries(TestLauncherPlugin Qt5::Core Qt5::Quick) target_link_libraries(TestLauncherPlugin LauncherMocks) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/qmltest/mocks/plugins/Unity/Notifications/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/qmltest/mocks/plugins/Unity/Notifications/CMakeLists.txt @@ -21,7 +21,7 @@ add_library(NotificationsMocks SHARED ${NotificationsMocks_SOURCES}) -qt5_use_modules(NotificationsMocks Core) +target_link_libraries(NotificationsMocks Qt5::Core) set(TestNotificationsPlugin_SOURCES TestNotificationsPlugin.cpp @@ -29,7 +29,7 @@ add_library(TestNotificationsPlugin MODULE ${TestNotificationsPlugin_SOURCES}) -qt5_use_modules(TestNotificationsPlugin Core Quick) +target_link_libraries(TestNotificationsPlugin Qt5::Core Qt5::Quick) target_link_libraries(TestNotificationsPlugin NotificationsMocks) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/qmltest/mocks/plugins/Unity/Notifications/Mocks/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/qmltest/mocks/plugins/Unity/Notifications/Mocks/CMakeLists.txt @@ -4,7 +4,9 @@ add_library(MockNotificationsPlugin MODULE ${MockNotificationsPlugin_SOURCES}) -qt5_use_modules(MockNotificationsPlugin Core Quick) +#find_package(Qt5Core REQUIRED) +#find_package(Qt5Quick REQUIRED) +target_link_libraries(MockNotificationsPlugin Qt5::Core Qt5::Quick) target_link_libraries(MockNotificationsPlugin NotificationsMocks) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt @@ -39,7 +39,7 @@ add_library(ScopesMocks SHARED ${ScopesMocks_SOURCES}) -qt5_use_modules(ScopesMocks Core) +target_link_libraries(ScopesMocks Qt5::Core) set(TestScopesPlugin_SOURCES TestScopesPlugin.cpp @@ -47,7 +47,7 @@ add_library(TestScopesPlugin MODULE ${TestScopesPlugin_SOURCES}) -qt5_use_modules(TestScopesPlugin Core Quick) +target_link_libraries(TestScopesPlugin Qt5::Core Qt5::Quick) target_link_libraries(TestScopesPlugin ScopesMocks) only in patch2: unchanged: --- unity-api-8.7+17.04.20170404.orig/test/qmltest/modules/TestUtil/CMakeLists.txt +++ unity-api-8.7+17.04.20170404/test/qmltest/modules/TestUtil/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(TestUtilQml MODULE ${TestUtilQML_SOURCES}) -qt5_use_modules(TestUtilQml Core Quick) +target_link_libraries(TestUtilQml Qt5::Core Qt5::Quick) # copy qmldir file into build directory for shadow builds file(GLOB QML_JS_FILES qmldir *.js *.qml)