Merge lp:~larsu/gtk/lp1444174 into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Lars Karlitski]

debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch:
backport; required to build mir backend without x11 backend (LP: #1444174)

debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch:
backport; required to build mir backend without x11 backend (LP: #1444174)

[Iain Lane (laney)]

Thanks - could this go to gtk-3-16 upstream & then we could get it automatically?

review: Needs Information

[Lars Karlitski (larsu)]

> Thanks - could this go to gtk-3-16 upstream & then we could get it
> automatically?

Yep. Pushed to 3-16 upstream.

[Iain Lane (laney)]

Cool! Closing this MP then. :)

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-13 08:02:46 +0000
+++ debian/changelog	2015-04-15 13:04:07 +0000
@@ -1,3 +1,10 @@
+gtk+3.0 (3.14.12-0ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch:
+    backport; required to build mir backend without x11 backend (LP: #1444174)
+
+ -- Lars Uebernickel <[e-mail]>  Wed, 15 Apr 2015 15:00:00 +0200
+
 gtk+3.0 (3.14.12-0ubuntu2) vivid; urgency=medium
 
   * debian/patches/allow-overriding-WM_CLASS-from-the-command-line.patch:
 
=== added file 'debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch'
--- debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch	2015-04-15 13:04:07 +0000
@@ -0,0 +1,24 @@
+From 7c79c01a51fc6019180646143c69c38c8458742f Mon Sep 17 00:00:00 2001
+From: Daniel van Vugt <[e-mail]>
+Date: Wed, 15 Apr 2015 13:19:14 +0200
+Subject: [PATCH] configure: specify that mir backend needs gio-unix
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index c76b8a6..7dc9c26 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -474,6 +474,7 @@ if test "$enable_mir_backend" = "yes"; then
+   GDK_WINDOWING="$GDK_WINDOWING
+ #define GDK_WINDOWING_MIR"
+   MIR_PACKAGES="$MIR_DEPENDENCIES"
++  have_gio_unix=yes
+ 
+   AM_CONDITIONAL(USE_MIR, true)
+ else
+-- 
+2.1.4
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-13 06:40:18 +0000
+++ debian/patches/series	2015-04-15 13:04:07 +0000
@@ -24,3 +24,4 @@
 0001-gtk-reftest-Force-icon-theme-to-Adwaita.patch
 0001-GtkApplication-Prevent-more-crashes-around-shutdown.patch
 allow-overriding-WM_CLASS-from-the-command-line.patch
+git_configure-specify-that-mir-backend-needs-gio-unix.patch