From patchwork Mon Nov 10 16:41:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 409005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 8872D14017B for ; Tue, 11 Nov 2014 03:41:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D4DCC33D5C; Mon, 10 Nov 2014 16:41:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FyDH1dPAsU5c; Mon, 10 Nov 2014 16:41:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3E25333CBF; Mon, 10 Nov 2014 16:41:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 19A171C2648 for ; Mon, 10 Nov 2014 16:41:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 110DF91C3F for ; Mon, 10 Nov 2014 16:41:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9wK7ootKExzG for ; Mon, 10 Nov 2014 16:41:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by whitealder.osuosl.org (Postfix) with ESMTP id 74A3391C8A for ; Mon, 10 Nov 2014 16:41:16 +0000 (UTC) Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 68B7965FD9E89 for ; Mon, 10 Nov 2014 16:41:12 +0000 (GMT) Received: from KLMAIL02.kl.imgtec.org (10.40.60.222) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 10 Nov 2014 16:41:15 +0000 Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by klmail02.kl.imgtec.org (10.40.60.222) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 10 Nov 2014 16:41:14 +0000 Received: from localhost.localdomain (192.168.154.104) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Mon, 10 Nov 2014 16:41:14 +0000 From: Vicente Olivert Riera To: Date: Mon, 10 Nov 2014 16:41:07 +0000 Message-ID: <1415637667-57658-3-git-send-email-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1415637667-57658-1-git-send-email-Vincent.Riera@imgtec.com> References: <1415637667-57658-1-git-send-email-Vincent.Riera@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.154.104] Subject: [Buildroot] [PATCH 3/3] libgtk3: apply an upstream patch to fix a regression X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Apply an upstream patch to fix a build regression in 3.14.5. This patch will be included in the next 3.14.6 release, so we can remove it in the next version bump. Error message: ./.libs/libgtk-3.so: undefined reference to `GTK_IS_PLUG' Bug report: https://bugzilla.gnome.org/show_bug.cgi?id=739885 Upstream commit: https://git.gnome.org/browse/gtk+/commit/?id=36fedb0c4b373272afc2d76a7c790d696ed48034 Signed-off-by: Vicente Olivert Riera --- ...lug-is-conditionally-supported-on-X11-onl.patch | 57 ++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch diff --git a/package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch b/package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch new file mode 100644 index 0000000..081cd1e --- /dev/null +++ b/package/libgtk3/0006-window-GtkPlug-is-conditionally-supported-on-X11-onl.patch @@ -0,0 +1,57 @@ +window: GtkPlug is conditionally supported on X11 only + +Apply an upstream patch to fix a build regression in 3.14.5. This patch +will be included in the next 3.14.6 release, so we can remove it in the +next version bump. + +Error message: + +./.libs/libgtk-3.so: undefined reference to `GTK_IS_PLUG' + +Bug report: + https://bugzilla.gnome.org/show_bug.cgi?id=739885 + +Upstream commit: + https://git.gnome.org/browse/gtk+/commit/?id=36fedb0c4b373272afc2d76a7c790d696ed48034 + +Signed-off-by: Vicente Olivert Riera + +From 36fedb0c4b373272afc2d76a7c790d696ed48034 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Mon, 10 Nov 2014 14:08:20 +0000 +Subject: [PATCH] window: GtkPlug is conditionally supported on X11 only + +We cannot do a type check on it if we don't have the X11 backend +compiled in. + +https://bugzilla.gnome.org/show_bug.cgi?id=739885 +--- + gtk/gtkwindow.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index 0d0fb88..6cb355b 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -1610,10 +1610,17 @@ gtk_window_constructed (GObject *object) + { + GtkWindow *window = GTK_WINDOW (object); + GtkWindowPrivate *priv = window->priv; ++ gboolean is_plug; + + G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object); + +- if (priv->type == GTK_WINDOW_TOPLEVEL && !GTK_IS_PLUG (window)) ++#ifdef GDK_WINDOWING_X11 ++ is_plug = GTK_IS_PLUG (window); ++#else ++ is_plug = FALSE; ++#endif ++ ++ if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug) + { + priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object)); + gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0); +-- +1.7.1 +