[jhbuild/wip/mir] 3.14: add mir as an optional depend of gtk+
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild/wip/mir] 3.14: add mir as an optional depend of gtk+
- Date: Mon, 26 May 2014 12:38:10 +0000 (UTC)
commit 55287155505cfa468b9bb29dc0d9eedcd9bd9a68
Author: Ryan Lortie <desrt desrt ca>
Date: Mon May 26 08:48:56 2014 +0200
3.14: add mir as an optional depend of gtk+
modulesets/gnome-suites-core-deps-3.14.modules | 25 +++++++++++++++++++
modulesets/gnome-sysdeps-3.14.modules | 31 ++++++++++++++++++++++++
patches/mir-gflags-noshutdown.patch | 15 +++++++++++
patches/mir-makeinstall-nodocs.patch | 14 ++++++++++
4 files changed, 85 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index 119a6f0..4898e98 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -74,6 +74,8 @@
href="http://ftp.gnu.org/gnu/"/>
<repository type="tarball" name="libndp"
href="http://libndp.org/files/"/>
+<repository type="tarball" name="mir"
+ href="https://launchpad.net/mir/"/>
<include href="gnome-sysdeps-3.14.modules"/>
@@ -383,6 +385,9 @@
<if condition-set="wayland">
<autogenargs value="--enable-wayland-backend"/>
</if>
+ <if condition-set="mir">
+ <autogenargs value="--enable-mir-backend"/>
+ </if>
<branch/>
<dependencies>
<dep package="atk"/>
@@ -397,6 +402,9 @@
<dep package="libxkbcommon"/>
<dep package="wayland"/>
</if>
+ <if condition-set="mir">
+ <dep package="mir"/>
+ </if>
</dependencies>
<suggests>
<dep package="shared-mime-info"/>
@@ -1526,4 +1534,21 @@
</suggests>
</autotools>
+ <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0">
+ <branch repo="mir"
+ module="utopic/0.1.9/+download/mir-0.1.9.tar.bz2"
+ version="0.1.9"
+ size="873605"
+ hash="sha256:8aaeb911d5a017cded788a22c7322c1fa1e098b8b410e3a17607e9c44a7d7e82">
+ <patch file="mir-gflags-noshutdown.patch" strip="1"/>
+ <patch file="mir-makeinstall-nodocs.patch" strip="1"/>
+ </branch>
+ <dependencies>
+ <dep package="boost"/>
+ <dep package="protobuf"/>
+ <dep package="mesa-libGLES"/>
+ <dep package="google-glog"/>
+ <dep package="google-gflags"/>
+ </dependencies>
+ </cmake>
</moduleset>
diff --git a/modulesets/gnome-sysdeps-3.14.modules b/modulesets/gnome-sysdeps-3.14.modules
index d8235ab..e928123 100644
--- a/modulesets/gnome-sysdeps-3.14.modules
+++ b/modulesets/gnome-sysdeps-3.14.modules
@@ -857,4 +857,35 @@
<pkg-config>opus.pc</pkg-config>
<branch repo="system" version="1.0"/>
</systemmodule>
+
+ <systemmodule id="google-glog">
+ <branch repo="system" version="0.3.3"/>
+ <systemdependencies>
+ <dep type="c_include" name="glog/logging.h"/>
+ </systemdependencies>
+ </systemmodule>
+
+ <systemmodule id="google-gflags">
+ <branch repo="system" version="1.3.8"/>
+ <systemdependencies>
+ <dep type="c_include" name="gflags/gflags.h"/>
+ </systemdependencies>
+ </systemmodule>
+
+ <systemmodule id="google-gmock">
+ <branch repo="system" version="1.6.0"/>
+ <pkg-config>gmock.pc</pkg-config>
+ </systemmodule>
+
+ <systemmodule id="google-gtest">
+ <branch repo="system" version="1.6.0"/>
+ <systemdependencies>
+ <dep type="c_include" name="gtest/gtest.h"/>
+ </systemdependencies>
+ </systemmodule>
+
+ <systemmodule id="protobuf">
+ <branch repo="system" version="2.5.0"/>
+ <pkg-config>protobuf.pc</pkg-config>
+ </systemmodule>
</moduleset>
diff --git a/patches/mir-gflags-noshutdown.patch b/patches/mir-gflags-noshutdown.patch
new file mode 100644
index 0000000..56bc97e
--- /dev/null
+++ b/patches/mir-gflags-noshutdown.patch
@@ -0,0 +1,15 @@
+google::ShutDownCommandLineFlags is not available in Fedora
+
+https://bugs.launchpad.net/mir/+bug/1323031
+
+diff -r -u mir-0.1.9-orig/src/server/logging/glog_logger.cpp mir-0.1.9/src/server/logging/glog_logger.cpp
+--- mir-0.1.9-orig/src/server/logging/glog_logger.cpp 2014-05-26 14:07:14.478387071 +0200
++++ mir-0.1.9/src/server/logging/glog_logger.cpp 2014-05-26 14:07:33.076630015 +0200
+@@ -47,7 +47,6 @@
+ {
+ ~google_gflag_guard_t()
+ {
+- std::call_once(shutdown_flag_gflags, google::ShutDownCommandLineFlags);
+ }
+ } google_gflag_guard;
+ }
diff --git a/patches/mir-makeinstall-nodocs.patch b/patches/mir-makeinstall-nodocs.patch
new file mode 100644
index 0000000..6643e10
--- /dev/null
+++ b/patches/mir-makeinstall-nodocs.patch
@@ -0,0 +1,14 @@
+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()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]