aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-12-05 13:17:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:00:21 +0000
commit5d44eeca7706f6b3d178744f330710105e079618 (patch)
treeaf2c1b1a45aa01ab2dc2ff45c95430eacbce8abf /meta/recipes-gnome/gtk+
parentf03e43153479bf9c58d7feec9a4c3fa1b7dca57d (diff)
downloadopenembedded-core-contrib-5d44eeca7706f6b3d178744f330710105e079618.tar.gz
openembedded-core-contrib-5d44eeca7706f6b3d178744f330710105e079618.tar.bz2
openembedded-core-contrib-5d44eeca7706f6b3d178744f330710105e079618.zip
gtk+3: remove redundant Wayland patch
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 <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch36
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb1
2 files changed, 0 insertions, 37 deletions
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 aca55ceaf4..0000000000
--- 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 <jussi.kukkonen@intel.com>
-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 <jussi.kukkonen@intel.com>
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- 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 02eca3f5cb..ac0a9b715f 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"