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

Proposed by Lars Karlitski on 2015-04-15
Status: Merged
Merge reported by: Iain Lane
Merged at revision: not available
Proposed branch: lp:~larsu/gtk/lp1444174
Merge into: lp:~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 52 lines (+32/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch (+24/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~larsu/gtk/lp1444174
Reviewer Review Type Date Requested Status
Iain Lane 2015-04-15 Needs Information on 2015-05-07
Review via email: mp+256311@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Iain Lane (laney) wrote :

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

review: Needs Information
Lars Karlitski (larsu) wrote :

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

Yep. Pushed to 3-16 upstream.

Iain Lane (laney) wrote :

Cool! Closing this MP then. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-04-13 08:02:46 +0000
3+++ debian/changelog 2015-04-15 13:04:07 +0000
4@@ -1,3 +1,10 @@
5+gtk+3.0 (3.14.12-0ubuntu3) UNRELEASED; urgency=medium
6+
7+ * debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch:
8+ backport; required to build mir backend without x11 backend (LP: #1444174)
9+
10+ -- Lars Uebernickel <lars.uebernickel@ubuntu.com> Wed, 15 Apr 2015 15:00:00 +0200
11+
12 gtk+3.0 (3.14.12-0ubuntu2) vivid; urgency=medium
13
14 * debian/patches/allow-overriding-WM_CLASS-from-the-command-line.patch:
15
16=== added file 'debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch'
17--- debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/git_configure-specify-that-mir-backend-needs-gio-unix.patch 2015-04-15 13:04:07 +0000
19@@ -0,0 +1,24 @@
20+From 7c79c01a51fc6019180646143c69c38c8458742f Mon Sep 17 00:00:00 2001
21+From: Daniel van Vugt <daniel.van.vugt@canonical.com>
22+Date: Wed, 15 Apr 2015 13:19:14 +0200
23+Subject: [PATCH] configure: specify that mir backend needs gio-unix
24+
25+---
26+ configure.ac | 1 +
27+ 1 file changed, 1 insertion(+)
28+
29+diff --git a/configure.ac b/configure.ac
30+index c76b8a6..7dc9c26 100644
31+--- a/configure.ac
32++++ b/configure.ac
33+@@ -474,6 +474,7 @@ if test "$enable_mir_backend" = "yes"; then
34+ GDK_WINDOWING="$GDK_WINDOWING
35+ #define GDK_WINDOWING_MIR"
36+ MIR_PACKAGES="$MIR_DEPENDENCIES"
37++ have_gio_unix=yes
38+
39+ AM_CONDITIONAL(USE_MIR, true)
40+ else
41+--
42+2.1.4
43+
44
45=== modified file 'debian/patches/series'
46--- debian/patches/series 2015-04-13 06:40:18 +0000
47+++ debian/patches/series 2015-04-15 13:04:07 +0000
48@@ -24,3 +24,4 @@
49 0001-gtk-reftest-Force-icon-theme-to-Adwaita.patch
50 0001-GtkApplication-Prevent-more-crashes-around-shutdown.patch
51 allow-overriding-WM_CLASS-from-the-command-line.patch
52+git_configure-specify-that-mir-backend-needs-gio-unix.patch

Subscribers

People subscribed via source and target branches

to all changes: