diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-06-22 14:52:20 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-01 16:22:41 +0100 |
commit | 33226ae5b32067e483817b22d1f5563e5017d709 (patch) | |
tree | 420c8c4e0dc56885b18847c0bfa59fd8f98adb1e /meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch | |
parent | ef8bbc7869337b2ad4d833f1d3f2857589d15190 (diff) | |
download | poky-33226ae5b32067e483817b22d1f5563e5017d709.tar.gz |
gtk+3: Upgrade 3.18.8 -> 3.20.6
* Remove a patch that's no longer needed (as we don't
have a problem with client side decorations anymore)
* Wayland build now depends on wayland-protocols:
Use same WAYLAND_PROTOCOLS_SYSROOT_DIR trick as weston so
protocols are found and multilib build does not break
* Add new binary gtk-query-settings to -dev package
* Rebase patches
* Modify 0003-Add-disable-opengl-configure-option.patch so
that gdkx.h really is generated whenever it changes
* Depend on wayland-protocols in gtk+3-dev if Wayland is enabled as otherwise
the pkg-config files can't be used - RB
(From OE-Core rev: b610145b1aadb093ced72a7958d8df00ef1250b6)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
gtk+3: depend on wayland-protocols if wayland enabled
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch deleted file mode 100644 index 3b4beeb712..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/hardcoded_libtool.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | |||
5 | Index: gtk+-3.8.2/configure.ac | ||
6 | =================================================================== | ||
7 | --- gtk+-3.8.2.orig/configure.ac | ||
8 | +++ gtk+-3.8.2/configure.ac | ||
9 | @@ -531,7 +531,7 @@ AC_MSG_CHECKING([Whether to write depend | ||
10 | case $enable_explicit_deps in | ||
11 | auto) | ||
12 | export SED | ||
13 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
14 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
15 | if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then | ||
16 | enable_explicit_deps=yes | ||
17 | else | ||
18 | @@ -793,7 +793,7 @@ else | ||
19 | dnl Now we check to see if our libtool supports shared lib deps | ||
20 | dnl (in a rather ugly way even) | ||
21 | if $dynworks; then | ||
22 | - module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" | ||
23 | + module_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" | ||
24 | module_deplibs_check=`$module_libtool_config | \ | ||
25 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | ||
26 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | ||
27 | @@ -1528,7 +1528,7 @@ fi | ||
28 | # We are using gmodule-no-export now, but I'm leaving the stripping | ||
29 | # code in place for now, since pango and atk still require gmodule. | ||
30 | export SED | ||
31 | -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
32 | +export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
33 | if test -n "$export_dynamic"; then | ||
34 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||
35 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||