Merge lp:~khurshid-alam/unity-api/fix-build-cosmic into lp:unity-api
Status: | Merged |
---|---|
Merged at revision: | 285 |
Proposed branch: | lp:~khurshid-alam/unity-api/fix-build-cosmic |
Merge into: | lp:unity-api |
Diff against target: |
225 lines (+33/-19) 13 files modified
debian/control (+2/-2) include/unity/util/GlibMemory.h (+5/-0) src/unity/util/FileIO.cpp (+1/-0) src/unity/util/internal/DaemonImpl.cpp (+1/-0) test/gtest/unity/util/CMakeLists.txt (+3/-3) test/gtest/unity/util/ResourcePtr/ResourcePtr_test.cpp (+1/-0) test/headers/CMakeLists.txt (+7/-4) test/qmltest/mocks/plugins/Unity/Application/CMakeLists.txt (+2/-2) test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt (+3/-2) test/qmltest/mocks/plugins/Unity/Notifications/CMakeLists.txt (+2/-2) test/qmltest/mocks/plugins/Unity/Notifications/Mocks/CMakeLists.txt (+3/-1) test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt (+2/-2) test/qmltest/modules/TestUtil/CMakeLists.txt (+1/-1) |
To merge this branch: | bzr merge lp:~khurshid-alam/unity-api/fix-build-cosmic |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeremy Bícha | Needs Fixing | ||
Review via email: mp+356161@code.launchpad.net |
Commit message
* Satisfy build against >= gcc-7
* Only add internal header tests if exists.
Only add a test for standalone compilation of internal include
directories if the directory exists on disk.
https:/
* Fix autoclean conflict with new glib.
The new glib 2.57.2 version introduces reference counted strings, which
causes a redefinition scenario with the autocleanup of gchar here. So,
only include this definition when building against older glib versions.
https:/
* Raplace transitional dummy packages qtquick2 and qttest
* Disable memory tests for now to satisfy build against glib >= 2.58.
Description of the change
I disabled the memory tests as I was getting sigtrap against GLib >= 2.58. It compiles fine in bionic. This is not so serious as none of the unity7 components depend on unity-api.
If you are ok with this please review and merge.
Please clean up your commits and force push. (In particular, the commit history doesn't need the popularity contest addition and removal.)