diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-04-01 21:36:47 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 15:09:17 +0100 |
commit | 88ea8748809043be61d501c1ce8a9c8e8c06b9ae (patch) | |
tree | 4a91c84f6680e8c36751aa540a5375463cefc75a /meta/recipes-gnome/gtk+/gtk+3.inc | |
parent | f71e47361cf8b934bcff1eebd13d71b43ee5cd6d (diff) | |
download | poky-88ea8748809043be61d501c1ce8a9c8e8c06b9ae.tar.gz |
gtk+3: Upgrade to 3.16.4
* Drop --disable-gtk2-dependency and the patch for
gtk/native/Makefile.am: gtk-update-icon-cache is no longer used at
build time and as a result the option was removed.
* Add dependency to libepoxy
* Add dependency to virtual/mesa for wayland-egl
* Package new binaries gtk3-icon-browser and gtk-encode-symbolic-svg
* Add a backported patch that allows server side window decorations
in all cases
* RRECOMMEND adwaita-icon-theme-symbolic: GTK+ widgets expect a
symbolic theme to be installed
(From OE-Core rev: 8d34b4db648756d3474c809d2895b15299fc8a6a)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3.inc')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 3e36676ac4..f29f0d3031 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/" | |||
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | 7 | ||
8 | DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ | 8 | DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ |
9 | docbook-utils-native gdk-pixbuf-native" | 9 | docbook-utils-native gdk-pixbuf-native libepoxy" |
10 | 10 | ||
11 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" | 11 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" |
12 | 12 | ||
@@ -22,10 +22,7 @@ do_configure_prepend() { | |||
22 | ln -s ${TARGET_PREFIX}libtool libtool | 22 | ln -s ${TARGET_PREFIX}libtool libtool |
23 | } | 23 | } |
24 | 24 | ||
25 | # Forcibly disable the GTK+ 2 dependency as we don't want to natively build the | ||
26 | # entire GTK+ stack, or need GTK+ 2 for gtk-update-icon-cache. | ||
27 | EXTRA_OECONF += " \ | 25 | EXTRA_OECONF += " \ |
28 | --disable-gtk2-dependency \ | ||
29 | --disable-glibtest \ | 26 | --disable-glibtest \ |
30 | --disable-xinerama \ | 27 | --disable-xinerama \ |
31 | --enable-modules \ | 28 | --enable-modules \ |
@@ -37,7 +34,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} | |||
37 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" | 34 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" |
38 | 35 | ||
39 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" | 36 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" |
40 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon" | 37 | PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon virtual/mesa" |
41 | 38 | ||
42 | do_install_append() { | 39 | do_install_append() { |
43 | mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 | 40 | mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 |
@@ -48,12 +45,14 @@ LIBV = "3.0.0" | |||
48 | 45 | ||
49 | FILES_${PN}-demo = "${bindir}/gtk3-demo \ | 46 | FILES_${PN}-demo = "${bindir}/gtk3-demo \ |
50 | ${bindir}/gtk3-demo-application \ | 47 | ${bindir}/gtk3-demo-application \ |
48 | ${bindir}/gtk3-icon-browser \ | ||
51 | ${bindir}/gtk3-widget-factory \ | 49 | ${bindir}/gtk3-widget-factory \ |
52 | ${datadir}/gtk-3.0/demo \ | 50 | ${datadir}/gtk-3.0/demo \ |
53 | ${datadir}/applications/gtk3-demo.desktop \ | 51 | ${datadir}/applications/gtk3-demo.desktop \ |
52 | ${datadir}/applications/gtk3-icon-browser.desktop \ | ||
54 | ${datadir}/applications/gtk3-widget-factory.desktop \ | 53 | ${datadir}/applications/gtk3-widget-factory.desktop \ |
55 | ${datadir}/icons/hicolor/*/apps/gtk3-demo.png \ | 54 | ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ |
56 | ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png" | 55 | ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" |
57 | 56 | ||
58 | # The demo uses PNG files and mime type sniffing, so ensure that these | 57 | # The demo uses PNG files and mime type sniffing, so ensure that these |
59 | # dependencies are present. | 58 | # dependencies are present. |
@@ -76,7 +75,8 @@ FILES_${PN}-dev += " \ | |||
76 | ${libdir}/gtk-3.0/3.0.0/printbackends/*.la \ | 75 | ${libdir}/gtk-3.0/3.0.0/printbackends/*.la \ |
77 | ${libdir}/gtk-3.0/${LIBV}/engines/*.la \ | 76 | ${libdir}/gtk-3.0/${LIBV}/engines/*.la \ |
78 | ${libdir}/gtk-3.0/modules/*.la \ | 77 | ${libdir}/gtk-3.0/modules/*.la \ |
79 | ${bindir}/gtk-builder-convert" | 78 | ${bindir}/gtk-builder-convert \ |
79 | ${bindir}/gtk-encode-symbolic-svg" | ||
80 | 80 | ||
81 | FILES_${PN}-dbg += " \ | 81 | FILES_${PN}-dbg += " \ |
82 | ${libdir}/gtk-3.0/${LIBV}/loaders/.debug \ | 82 | ${libdir}/gtk-3.0/${LIBV}/loaders/.debug \ |
@@ -85,6 +85,7 @@ FILES_${PN}-dbg += " \ | |||
85 | ${libdir}/gtk-3.0/${LIBV}/printbackends/.debug \ | 85 | ${libdir}/gtk-3.0/${LIBV}/printbackends/.debug \ |
86 | ${libdir}/gtk-3.0/modules/.debug" | 86 | ${libdir}/gtk-3.0/modules/.debug" |
87 | 87 | ||
88 | RRECOMMENDS_${PN} = "adwaita-icon-theme-symbolic" | ||
88 | 89 | ||
89 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" | 90 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" |
90 | 91 | ||