Commit 9d0c0d8b authored by Allison Karlitskaya's avatar Allison Karlitskaya

core-deps-3.14: update mir version to 0.4.0

...and drop a couple of patches.
parent 4b148918
......@@ -266,12 +266,11 @@
<cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0">
<branch repo="mir"
module="utopic/${version}/+download/mir-${version}.tar.bz2"
version="0.1.9"
hash="sha256:8aaeb911d5a017cded788a22c7322c1fa1e098b8b410e3a17607e9c44a7d7e82">
module="0.4/${version}/+download/mir-${version}.tar.bz2"
version="0.4.0"
hash="sha256:5d859d353da88d81bf383e37d0744796d74d24a858fcc7d978a91575ebccd524"
size="949452">
<patch file="mir-gflags-noshutdown.patch" strip="1"/>
<patch file="mir-makeinstall-nodocs.patch" strip="1"/>
<patch file="mir-nolink-lttng.patch" strip="1"/>
</branch>
<dependencies>
<dep package="boost"/>
......
https://bugs.launchpad.net/mir/+bug/1304271
diff -r -u mir-0.1.9-orig/cmake/Doxygen.cmake mir-0.1.9/cmake/Doxygen.cmake
--- mir-0.1.9-orig/cmake/Doxygen.cmake 2014-05-26 14:26:59.742608852 +0200
+++ mir-0.1.9/cmake/Doxygen.cmake 2014-05-26 14:27:18.833849526 +0200
@@ -23,5 +23,7 @@
COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
SOURCES ${PROJECT_BINARY_DIR}/Doxyfile
DEPENDS guides)
- install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc/)
+ if (BUILD_DOXYGEN)
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc/)
+ endif()
endif()
https://bugs.launchpad.net/mir/+bug/1323317
diff -u -r mir-0.1.9-orig/src/server/report/CMakeLists.txt mir-0.1.9/src/server/report/CMakeLists.txt
--- mir-0.1.9-orig/src/server/report/CMakeLists.txt 2014-05-26 15:56:47.624556441 +0200
+++ mir-0.1.9/src/server/report/CMakeLists.txt 2014-05-26 15:56:57.128675452 +0200
@@ -7,4 +7,4 @@
default_server_configuration.cpp
)
-target_link_libraries(mirreport mirserverlttng mirlogging mirnullreport)
+target_link_libraries(mirreport mirlogging mirnullreport)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment