summaryrefslogtreecommitdiffstats
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:03:56 +0000
commit2775d1b625352e3ae6d12980b95e0ab4a1ca5c5f (patch)
tree3d23d2c1cd735ecdab0c0b6fcdfa2511b9740744 /meta/recipes-gnome/gtk+
parenta8de48c0c97e87baeeefe19a760743449b3fb391 (diff)
downloadpoky-2775d1b625352e3ae6d12980b95e0ab4a1ca5c5f.tar.gz
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. (From OE-Core rev: 5d44eeca7706f6b3d178744f330710105e079618) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@
1From 34f4d3928e8206a89b0a601bdf79d6194b3cc77e Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 9 Jun 2016 11:21:36 +0300
4Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path
5
6The wayland-protocols directory is used during build: Fix the path
7to point to sysroot specified in recipe.
8
9Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that
10breaks multilib gtk+ as it would point to multilib sysroot when the
11(allarch) wayland-protocols is actually in the machine sysroot.
12
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14Upstream-Status: Inappropriate [embedded specific]
15
16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
17---
18 configure.ac | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/configure.ac b/configure.ac
22index 00bf544..5515915 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -465,7 +465,7 @@ fi
26 if test "$enable_wayland_backend" = "yes"; then
27 # For the cairo image backend
28 cairo_backends="$cairo_backends cairo"
29- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
30+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
31 GDK_BACKENDS="$GDK_BACKENDS wayland"
32 GDK_WINDOWING="$GDK_WINDOWING
33 #define GDK_WINDOWING_WAYLAND"
34--
352.12.0
36
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
6 file://0001-Hardcoded-libtool.patch \ 6 file://0001-Hardcoded-libtool.patch \
7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ 7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
8 file://0003-Add-disable-opengl-configure-option.patch \ 8 file://0003-Add-disable-opengl-configure-option.patch \
9 file://0004-configure.ac-Fix-wayland-protocols-path.patch \
10 " 9 "
11SRC_URI[md5sum] = "b782a15b7b5b2005a1ce4647fb002a49" 10SRC_URI[md5sum] = "b782a15b7b5b2005a1ce4647fb002a49"
12SRC_URI[sha256sum] = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b" 11SRC_URI[sha256sum] = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b"