[jhbuild] 3.14: add mir as an optional depend of gtk+

[Javier Jardón <jjardon src gnome org>]

commit 658bb4fb89ead10b08eb2240e91cf1996c99dbfc
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+
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730768

 modulesets/gnome-suites-core-deps-3.14.modules |   34 ++++++++++++++++++++++-
 modulesets/gnome-sysdeps-3.14.modules          |   36 ++++++++++++++++++++++++
 patches/mir-gflags-noshutdown.patch            |   15 ++++++++++
 patches/mir-makeinstall-nodocs.patch           |   14 +++++++++
 patches/mir-nolink-lttng.patch                 |   11 +++++++
 5 files changed, 109 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index 2c9671b..57f19c5 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"/>
 
@@ -261,6 +263,31 @@
     </dependencies>
   </autotools>
 
+  <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">
+      <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"/>
+      <dep package="protobuf"/>
+      <dep package="mesa-libGLES"/>
+      <dep package="google-glog"/>
+      <dep package="google-gflags"/>
+      <dep package="gbm"/>
+      <dep package="egl"/>
+      <dep package="glm"/>
+      <dep package="lttng-ust"/>
+      <dep package="lcov"/>
+      <dep package="libudev"/>
+      <dep package="libxkbcommon"/>
+    </dependencies>
+  </cmake>
+
   <autotools id="ModemManager"
              autogenargs="--with-udev-base-dir=${libdir}/udev --with-systemdsystemunitdir=no 
--disable-more-warnings">
     <branch repo="git.freedesktop.org"
@@ -383,6 +410,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 +427,9 @@
         <dep package="libxkbcommon"/>
         <dep package="wayland"/>
       </if>
+      <if condition-set="mir">
+        <dep package="mir"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="shared-mime-info"/>
@@ -1525,5 +1558,4 @@
       <dep package="telepathy-glib"/>
     </suggests>
   </autotools>
-
 </moduleset>
diff --git a/modulesets/gnome-sysdeps-3.14.modules b/modulesets/gnome-sysdeps-3.14.modules
index d8235ab..cc56138 100644
--- a/modulesets/gnome-sysdeps-3.14.modules
+++ b/modulesets/gnome-sysdeps-3.14.modules
@@ -857,4 +857,40 @@
     <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="protobuf">
+    <branch repo="system" version="2.5.0"/>
+    <pkg-config>protobuf.pc</pkg-config>
+  </systemmodule>
+
+  <systemmodule id="egl">
+    <branch repo="system" version="10.1.3"/>
+    <pkg-config>egl.pc</pkg-config>
+  </systemmodule>
+
+  <systemmodule id="glm">
+    <branch repo="system" version="0.9.4.6"/>
+    <systemdependencies>
+      <dep type="c_include" name="glm/glm.hpp"/>
+    </systemdependencies>
+  </systemmodule>
+
+  <systemmodule id="lttng-ust">
+    <branch repo="system" version="2.3.0"/>
+    <pkg-config>lttng-ust.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()
diff --git a/patches/mir-nolink-lttng.patch b/patches/mir-nolink-lttng.patch
new file mode 100644
index 0000000..aabefb3
--- /dev/null
+++ b/patches/mir-nolink-lttng.patch
@@ -0,0 +1,11 @@
+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)