summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-23 12:37:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-17 16:45:33 +0100
commitd5abb656972306bd74709fe9121920fa8fe763fb (patch)
tree14a8bd9e1d66d5b06104bb9e52cf4d20a90fe2f7 /meta
parent91c347d0a09512c13052140e0a3031bfaade7422 (diff)
downloadpoky-d5abb656972306bd74709fe9121920fa8fe763fb.tar.gz
gtk+3: update to 3.8.2
Drop cross.patch as it was a backport and is integrated upstream. (From OE-Core rev: 8148ed73914e631ef88fdaf2f45d4e6f63b626ce) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/cross.patch293
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb)9
2 files changed, 5 insertions, 297 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/cross.patch b/meta/recipes-gnome/gtk+/gtk+3/cross.patch
deleted file mode 100644
index f2ea99b16c..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+3/cross.patch
+++ /dev/null
@@ -1,293 +0,0 @@
1Upstream-Status: Backport [SHA 53083ea7b423482b203372f02d097edbef894a7d]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From b670abe861e8dde067f544b9131edc28575d63ab Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 7 Jan 2013 12:49:27 +0000
7Subject: [PATCH] build: support cross-compilation by natively building
8 gtk-update-icon-cache
9
10When cross-compiling, instead of depending on a natively built GTK+ (which means
11building Glib, ATK, Pango, gdk-pixbuf, libX11...) for gtk-update-icon-cache,
12find the host compiler and gdk-pixbuf, and build another gtk-update-icon-cache
13with that.
14
15This uses AX_PROG_CC_FOR_BUILD from autostars to find the host compiler, and
16assumes that you'd set PKG_CONFIG_FOR_BUILD to a host pkg-config binary.
17
18https://bugzilla.gnome.org/show_bug.cgi?id=691301
19---
20 configure.ac | 39 ++++++++++----
21 gtk/Makefile.am | 12 ++++-
22 gtk/native/Makefile.am | 12 +++++
23 m4/ax_prog_cc_for_build.m4 | 125 ++++++++++++++++++++++++++++++++++++++++++++
24 4 files changed, 177 insertions(+), 11 deletions(-)
25 create mode 100644 gtk/native/Makefile.am
26 create mode 100644 m4/ax_prog_cc_for_build.m4
27
28diff --git a/configure.ac b/configure.ac
29index 0069a9f..f502e06 100644
30--- a/configure.ac
31+++ b/configure.ac
32@@ -29,6 +29,9 @@ AC_CONFIG_SRCDIR([gdk/gdktypes.h])
33 AC_CONFIG_MACRO_DIR([m4])
34 AC_CONFIG_AUX_DIR([build-aux])
35
36+AC_CANONICAL_HOST
37+AC_CANONICAL_TARGET
38+
39 # Define a string for the earliest version that this release has
40 # backwards binary compatibility with for all interfaces a module
41 # might. Unless we add module-only API with lower stability
42@@ -123,6 +126,7 @@ AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
43
44 # Checks for programs.
45 AC_PROG_CC
46+AX_PROG_CC_FOR_BUILD
47 AC_PROG_CC_C_O
48 AC_PROG_CC_STDC
49 AC_PROG_MKDIR_P
50@@ -135,8 +139,6 @@ AC_SUBST(GETTEXT_PACKAGE)
51 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
52 [The prefix for our gettext translation domains.])
53
54-AC_CANONICAL_HOST
55-
56 MATH_LIB=-lm
57 AC_MSG_CHECKING([for native Win32])
58 LIB_EXE_MACHINE_FLAG=X86
59@@ -868,14 +870,32 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
60
61 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
62
63-if test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes; then
64- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
65- if test x$GTK_UPDATE_ICON_CACHE = xno; then
66- REBUILD_PNGS=#
67- fi
68-fi
69+AS_IF([test "x$enable_gtk2_dependency" = xyes],
70+ [AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
71+ if test x$GTK_UPDATE_ICON_CACHE = xno; then
72+ REBUILD_PNGS=#
73+ fi],
74+
75+ [test "x$cross_compiling" = xyes],
76+ [# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf.
77+ # pkg.m4 blocks all variable starting with PKG, so allow this one
78+ m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
79+
80+ AS_IF([test x$PKG_CONFIG_FOR_BUILD = x],
81+ [AC_MSG_ERROR([You must define PKG_CONFIG_FOR_BUILD when cross compiling])])
82+
83+ AC_MSG_CHECKING([for native gdk-pixbuf])
84+ AS_IF([AC_RUN_LOG([$PKG_CONFIG_FOR_BUILD --exists --print-errors gdk-pixbuf-2.0])],
85+ [AC_MSG_RESULT([yes])],
86+ [AC_MSG_ERROR([native gdk-pixbuf not found])])
87+
88+ NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
89+ NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
90+ AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
91+ AC_SUBST(NATIVE_GDKPIXBUF_LIBS)]
92+)
93
94-AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes])
95+AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
96
97 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
98
99@@ -1742,6 +1762,7 @@ gtk/makefile.msc
100 gtk/gtkversion.h
101 gtk/gtk-win32.rc
102 gtk/a11y/Makefile
103+gtk/native/Makefile
104 gtk/tests/Makefile
105 libgail-util/Makefile
106 modules/Makefile
107diff --git a/gtk/Makefile.am b/gtk/Makefile.am
108index e763ca8..6b1ec65 100644
109--- a/gtk/Makefile.am
110+++ b/gtk/Makefile.am
111@@ -16,7 +16,7 @@ else
112 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
113 endif
114
115-SUBDIRS = a11y . tests
116+SUBDIRS = a11y native . tests
117
118 if HAVE_PAPI_CUPS
119 GTK_PRINT_BACKENDS=file,papi,cups
120@@ -1569,12 +1569,20 @@ stamp-icons: $(STOCK_ICONS)
121 if USE_EXTERNAL_ICON_CACHE
122 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
123 else
124+if CROSS_COMPILING
125+gtk_update_icon_cache_program = ./native/native-update-icon-cache
126+else
127 gtk_update_icon_cache_program = ./gtk-update-icon-cache
128 endif
129+endif
130
131 gtkbuiltincache.h: @REBUILD@ stamp-icons
132 if !USE_EXTERNAL_ICON_CACHE
133- $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
134+if CROSS_COMPILING
135+ $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) -C native/
136+else
137+ $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
138+endif
139 endif
140 $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \
141 --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
142diff --git a/gtk/native/Makefile.am b/gtk/native/Makefile.am
143new file mode 100644
144index 0000000..4f029f6
145--- /dev/null
146+++ b/gtk/native/Makefile.am
147@@ -0,0 +1,12 @@
148+CC = @CC_FOR_BUILD@
149+CFLAGS = @CFLAGS_FOR_BUILD@
150+CPP = @CPP_FOR_BUILD@
151+CPPFLAGS = @CPPFLAGS_FOR_BUILD@
152+LDFLAGS = @LDFLAGS_FOR_BUILD@
153+
154+if CROSS_COMPILING
155+noinst_PROGRAMS = native-update-icon-cache
156+native_update_icon_cache_CFLAGS = $(NATIVE_GDKPIXBUF_CFLAGS)
157+native_update_icon_cache_LDADD = $(NATIVE_GDKPIXBUF_LIBS)
158+native_update_icon_cache_SOURCES = $(srcdir)/../updateiconcache.c
159+endif
160diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4
161new file mode 100644
162index 0000000..96cd98a
163--- /dev/null
164+++ b/m4/ax_prog_cc_for_build.m4
165@@ -0,0 +1,125 @@
166+# ===========================================================================
167+# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
168+# ===========================================================================
169+#
170+# SYNOPSIS
171+#
172+# AX_PROG_CC_FOR_BUILD
173+#
174+# DESCRIPTION
175+#
176+# This macro searches for a C compiler that generates native executables,
177+# that is a C compiler that surely is not a cross-compiler. This can be
178+# useful if you have to generate source code at compile-time like for
179+# example GCC does.
180+#
181+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
182+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
183+# The value of these variables can be overridden by the user by specifying
184+# a compiler with an environment variable (like you do for standard CC).
185+#
186+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
187+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
188+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
189+# substituted in the Makefile.
190+#
191+# LICENSE
192+#
193+# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
194+#
195+# Copying and distribution of this file, with or without modification, are
196+# permitted in any medium without royalty provided the copyright notice
197+# and this notice are preserved. This file is offered as-is, without any
198+# warranty.
199+
200+#serial 7
201+
202+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
203+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
204+AC_REQUIRE([AC_PROG_CC])dnl
205+AC_REQUIRE([AC_PROG_CPP])dnl
206+AC_REQUIRE([AC_EXEEXT])dnl
207+AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
208+
209+dnl Use the standard macros, but make them use other variable names
210+dnl
211+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
212+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
213+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
214+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
215+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
216+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
217+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
218+pushdef([ac_exeext], ac_build_exeext)dnl
219+pushdef([ac_objext], ac_build_objext)dnl
220+pushdef([CC], CC_FOR_BUILD)dnl
221+pushdef([CPP], CPP_FOR_BUILD)dnl
222+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
223+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
224+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
225+pushdef([host], build)dnl
226+pushdef([host_alias], build_alias)dnl
227+pushdef([host_cpu], build_cpu)dnl
228+pushdef([host_vendor], build_vendor)dnl
229+pushdef([host_os], build_os)dnl
230+pushdef([ac_cv_host], ac_cv_build)dnl
231+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
232+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
233+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
234+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
235+pushdef([ac_cpp], ac_build_cpp)dnl
236+pushdef([ac_compile], ac_build_compile)dnl
237+pushdef([ac_link], ac_build_link)dnl
238+
239+save_cross_compiling=$cross_compiling
240+save_ac_tool_prefix=$ac_tool_prefix
241+cross_compiling=no
242+ac_tool_prefix=
243+
244+AC_PROG_CC
245+AC_PROG_CPP
246+AC_EXEEXT
247+
248+ac_tool_prefix=$save_ac_tool_prefix
249+cross_compiling=$save_cross_compiling
250+
251+dnl Restore the old definitions
252+dnl
253+popdef([ac_link])dnl
254+popdef([ac_compile])dnl
255+popdef([ac_cpp])dnl
256+popdef([ac_cv_host_os])dnl
257+popdef([ac_cv_host_vendor])dnl
258+popdef([ac_cv_host_cpu])dnl
259+popdef([ac_cv_host_alias])dnl
260+popdef([ac_cv_host])dnl
261+popdef([host_os])dnl
262+popdef([host_vendor])dnl
263+popdef([host_cpu])dnl
264+popdef([host_alias])dnl
265+popdef([host])dnl
266+popdef([LDFLAGS])dnl
267+popdef([CPPFLAGS])dnl
268+popdef([CFLAGS])dnl
269+popdef([CPP])dnl
270+popdef([CC])dnl
271+popdef([ac_objext])dnl
272+popdef([ac_exeext])dnl
273+popdef([ac_cv_objext])dnl
274+popdef([ac_cv_exeext])dnl
275+popdef([ac_cv_prog_cc_g])dnl
276+popdef([ac_cv_prog_cc_cross])dnl
277+popdef([ac_cv_prog_cc_works])dnl
278+popdef([ac_cv_prog_gcc])dnl
279+popdef([ac_cv_prog_CPP])dnl
280+
281+dnl Finally, set Makefile variables
282+dnl
283+BUILD_EXEEXT=$ac_build_exeext
284+BUILD_OBJEXT=$ac_build_objext
285+AC_SUBST(BUILD_EXEEXT)dnl
286+AC_SUBST(BUILD_OBJEXT)dnl
287+AC_SUBST([CFLAGS_FOR_BUILD])dnl
288+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
289+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
290+])
291--
2921.7.10.4
293
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
index 16e3f1fc2a..3c03addc3c 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.4.4.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.8.2.bb
@@ -16,10 +16,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
16 file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ 16 file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \
17 file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" 17 file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1"
18 18
19SRC_URI = "http://download.gnome.org/sources/gtk+/3.4/gtk+-${PV}.tar.xz \ 19MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
20 file://cross.patch" 20
21SRC_URI[md5sum] = "1b2cf29502a6394e8d4b30f7f5bb9131" 21SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz"
22SRC_URI[sha256sum] = "f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7" 22SRC_URI[md5sum] = "8e878e18fc385f2b813419dc7b40a968"
23SRC_URI[sha256sum] = "1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297"
23 24
24inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache 25inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache
25 26