diff options
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0004-configure.ac-Fix-wayland-protocols-path.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3_3.22.24.bb | 1 |
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 @@ | |||
| 1 | From 34f4d3928e8206a89b0a601bdf79d6194b3cc77e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 3 | Date: Thu, 9 Jun 2016 11:21:36 +0300 | ||
| 4 | Subject: [PATCH 4/4] configure.ac: Fix wayland-protocols path | ||
| 5 | |||
| 6 | The wayland-protocols directory is used during build: Fix the path | ||
| 7 | to point to sysroot specified in recipe. | ||
| 8 | |||
| 9 | Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that | ||
| 10 | breaks multilib gtk+ as it would point to multilib sysroot when the | ||
| 11 | (allarch) wayland-protocols is actually in the machine sysroot. | ||
| 12 | |||
| 13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 14 | Upstream-Status: Inappropriate [embedded specific] | ||
| 15 | |||
| 16 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 17 | --- | ||
| 18 | configure.ac | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/configure.ac b/configure.ac | ||
| 22 | index 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 | -- | ||
| 35 | 2.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 | " |
| 11 | SRC_URI[md5sum] = "b782a15b7b5b2005a1ce4647fb002a49" | 10 | SRC_URI[md5sum] = "b782a15b7b5b2005a1ce4647fb002a49" |
| 12 | SRC_URI[sha256sum] = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b" | 11 | SRC_URI[sha256sum] = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b" |
