[jhbuild] 3.16: upgrade mir version to 0.8.0



commit 7ebe70be5ee4d228170ee7e703e5ef314a95c746
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Oct 22 14:30:52 2014 -0400

    3.16: upgrade mir version to 0.8.0

 modulesets/gnome-suites-core-deps-3.16.modules |   11 ++++----
 patches/mir-progressbar-example.patch          |   30 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index eaddbd2..9bea823 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -264,13 +264,14 @@
     </dependencies>
   </autotools>
 
-  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0">
+  <cmake id="mir" cmakeargs="-DMIR_ENABLE_TESTS=0 -DMIR_PLATFORM=mesa">
     <branch repo="mir"
-            module="0.4/${version}/+download/mir-${version}.tar.bz2"
-            version="0.4.0"
-            hash="sha256:5d859d353da88d81bf383e37d0744796d74d24a858fcc7d978a91575ebccd524"
-            size="949452">
+            module="0.8/${version}/+download/mir-${version}.tar.bz2"
+            version="0.8.0"
+            hash="sha256:a907bb7e6cf4d5975bc02db8a7b0d6e2f668527e6d38ae402ec8b87a8ca0c5f1"
+            size="1047629">
       <patch file="mir-gflags-noshutdown.patch" strip="1"/>
+      <patch file="mir-progressbar-example.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="boost"/>
diff --git a/patches/mir-progressbar-example.patch b/patches/mir-progressbar-example.patch
new file mode 100644
index 0000000..9ee22e6
--- /dev/null
+++ b/patches/mir-progressbar-example.patch
@@ -0,0 +1,30 @@
+stop using internal glibc defines
+
+__USE_BSD is a private define of glibc and it no longer does the same
+thing with newer glibc releases.
+
+Switch to using the correct _BSD_SOURCE instead.
+
+_BSD_SOURCE is unfortunately disabled in newer releases of glibc, so we
+should also define _DEFAULT_SOURCE.
+
+https://bugs.launchpad.net/mir/+bug/1384390
+
+--- a/examples/progressbar.c   2014-09-11 05:51:44 +0000
++++ b/examples/progressbar.c   2014-10-22 18:50:33 +0000
+@@ -16,12 +16,14 @@
+  * Author: Daniel van Vugt <daniel van vugt canonical com>
+  */
+ 
++#define _DEFAULT_SOURCE
++#define _BSD_SOURCE /* for usleep() */
++
+ #include "mir_toolkit/mir_client_library.h"
+ #include <stdio.h>
+ #include <signal.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+-#define __USE_BSD 1  /* for usleep() */
+ #include <unistd.h>  /* sleep() */
+ #include <string.h>
+ 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]