From patchwork Tue Dec 5 14:18:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 120651 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5804794qgn; Tue, 5 Dec 2017 06:19:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMb8FEEzIyAJrpqnRDHn00+aiskLJJLt4r/4YaD531mGRnF5FcPPTY6piMxeDXFiJC7G9WXL X-Received: by 10.99.168.67 with SMTP id i3mr17624517pgp.330.1512483563790; Tue, 05 Dec 2017 06:19:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512483563; cv=none; d=google.com; s=arc-20160816; b=TDrkGuCk8o8XAKj0wAtH5eLbqvkwSS2KghoG13ViEVdaFeIsr5Xm1s/9d1Fm802quw /JKlVfY8QzVbhuKOPF0xJIbdAH5y4tAnb4vYElVqccZMvrisoOSJhkJyEnuCXLDH2bFv 4j3RzfWuHuVFh7k8GRLID72HwL9/bPLMexmfHJhL3R8SUyL6ElbT+frTqzZNoCCrE/b3 6vX7cCM0UtSWq2w0NPow5ULSOxunockqmE/pr+SxO98UWdHqZF1R1DemwE4abJazv87y mkmGXc6V3luYfKiLjqrI9tjk0T/jL/g9kqfbPjnN65MLBTj0YPj5KRtI79y7FPCGWzTW 387w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=qh2lErdFYEh9Vhdl1UlbKegr8GgqSkfv3ZtYNb9T7xQ=; b=j9S/eJVF3MEIPpbSeMxueJH+OtlbZ16N7Mjd6fkDiitnOI25cpz88DRzbj32ECW/VU xLfVj6BiPLMjg0Gcy9SyER9hIuDbxbs+/C3KlkN94cO/V0I7M6OnOMuwmS0Zw6M7WY2g gsySSctjQlVNRaw+/yeTynczkkBvyPKmrP4IzKgEUUfFdFfPUi5yiIUDV/CPhUskQH8i pInJJ1phOMdMLCxG7CWe5+AENiejVWLfh9LIU3nM6mF4ilorOdpBml7jnXCVWYOftK1P 5CaYkBa9zt86BsfZX5yUaFaM8971O3XGD+no9tm1Vfd7vSE1ynlSRE6muvPDrynDt9UB cesA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=rCN2ksJ3; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b3si144496plx.365.2017.12.05.06.19.23; Tue, 05 Dec 2017 06:19:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=rCN2ksJ3; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1BE5178740; Tue, 5 Dec 2017 14:19:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by mail.openembedded.org (Postfix) with ESMTP id 435547870E for ; Tue, 5 Dec 2017 14:18:57 +0000 (UTC) Received: by mail-wr0-f170.google.com with SMTP id z34so444443wrz.10 for ; Tue, 05 Dec 2017 06:18:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=N9k3r0y3ki+pcUQQ4T6lajMQcKe1QUUjojsk/j4HVg4=; b=rCN2ksJ3vq14TxnMzRYfTYZcnVB32bVwiiMj8tVhVzVneZKSvkKlbOT3P/F2ByVxDl 38i1qhMlfxxrsMtWoiqj1dqjEwKLuDptpQfXU+RGW77aWdPKhP9QqKFakWn2iJPngrQu qMaM9Dp/KcJGkeHi/NMjGLTwrv27lqQzRT1efpVBKLRME/NUQ0UQAQEFO1sp3FWSb0At 7moapvo4eHCL8ZPQIG2lL0crzleJRnF8iBlsHogG8kwI5xXpE6AyRG8azm7uYjoPeY29 6Hl3E7C3sE/08yzROusz0O0b4fHaBFbaLS3unw/+GSZZIZ6ypPO7JscOjoYtyW08s5X0 Slgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=N9k3r0y3ki+pcUQQ4T6lajMQcKe1QUUjojsk/j4HVg4=; b=RUJyhfYMJI4AMc03lbCKvRRuv8CYxL+XdMFuy+cFoQO1r9wvGnT0fiXaZLJyO7YXNz uLeBTZvp4kmGl2R+ZX5YrWXuXji9EPHdNZU7MzqpwB+wJe9Fac3Eizi4sBytCb9IUGyU Ol+vXarnWJ5VSL2KmLYnPeZiVC0sF1O39py/w11SEruwIEFtItOPz2JlJFjOzCwT/U1d eFMk40Zk1uP8/m9ajKwkPpT80gyGlaNGzCfHs3OxVS9erl5nyYwyaojtawqvY/wZB+QZ zHnzpxCgtEFmOa8Afbojug2zpGFDHMLf+g6890A4STqqH5PtTeEDBbi3TwSyvvzza30m /OeQ== X-Gm-Message-State: AJaThX5SBufoPJPm1ubMnmzuymyhbg0K2fhw/ac3NYM9tdIijbUrU/a5 0loDoexabiTSV3HMpY9u/oZP5UX+ X-Received: by 10.223.129.247 with SMTP id 110mr15530866wra.208.1512483538470; Tue, 05 Dec 2017 06:18:58 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 34sm301178wra.39.2017.12.05.06.18.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 06:18:57 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 5 Dec 2017 14:18:46 +0000 Message-Id: <20171205141848.24825-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171205141848.24825-1-ross.burton@intel.com> References: <20171205141848.24825-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/4] gtk+3: remove redundant Wayland patch X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The installation path and wayland-scanner location problems in Wayland were resolved in "wayland: Fix installation patch issue" (oe-core 14c0d99) which made the WAYLAND_PROTOCOLS_SYSROOT_DIR workaround redundant. Signed-off-by: Ross Burton --- ...4-configure.ac-Fix-wayland-protocols-path.patch | 36 ---------------------- meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb | 1 - 2 files changed, 37 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch deleted file mode 100644 index aca55ceaf49..00000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 34f4d3928e8206a89b0a601bdf79d6194b3cc77e Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Thu, 9 Jun 2016 11:21:36 +0300 -Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path - -The wayland-protocols directory is used during build: Fix the path -to point to sysroot specified in recipe. - -Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that -breaks multilib gtk+ as it would point to multilib sysroot when the -(allarch) wayland-protocols is actually in the machine sysroot. - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 00bf544..5515915 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -465,7 +465,7 @@ fi - if test "$enable_wayland_backend" = "yes"; then - # For the cairo image backend - cairo_backends="$cairo_backends cairo" -- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) -+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - GDK_BACKENDS="$GDK_BACKENDS wayland" - GDK_WINDOWING="$GDK_WINDOWING - #define GDK_WINDOWING_WAYLAND" --- -2.12.0 - diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb b/meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb index 02eca3f5cbd..ac0a9b715f3 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb @@ -6,7 +6,6 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0001-Hardcoded-libtool.patch \ file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ - file://0004-configure.ac-Fix-wayland-protocols-path.patch \ " SRC_URI[md5sum] = "b782a15b7b5b2005a1ce4647fb002a49" SRC_URI[sha256sum] = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b"