diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-gnome/gtk+ | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
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.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 1445c406d8..47cdb83dce 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -15,7 +15,7 @@ inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-ca | |||
15 | 15 | ||
16 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
17 | 17 | ||
18 | GSETTINGS_PACKAGE_class-native = "" | 18 | GSETTINGS_PACKAGE:class-native = "" |
19 | 19 | ||
20 | # versions >= 3.90 are development versions, otherwise like upstream-version-is-even | 20 | # versions >= 3.90 are development versions, otherwise like upstream-version-is-even |
21 | UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar" | 21 | UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar" |
@@ -26,7 +26,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
26 | # it here avoids rebuilding everything. | 26 | # it here avoids rebuilding everything. |
27 | export PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" | 27 | export PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native" |
28 | 28 | ||
29 | do_configure_prepend() { | 29 | do_configure:prepend() { |
30 | # Do this because the configure script is running ./libtool directly | 30 | # Do this because the configure script is running ./libtool directly |
31 | rm -f libtool | 31 | rm -f libtool |
32 | ln -s ${TARGET_PREFIX}libtool libtool | 32 | ln -s ${TARGET_PREFIX}libtool libtool |
@@ -48,14 +48,14 @@ EXTRA_OECONF += " \ | |||
48 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \ | 48 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \ |
49 | " | 49 | " |
50 | 50 | ||
51 | do_compile_prepend() { | 51 | do_compile:prepend() { |
52 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" | 52 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" |
53 | } | 53 | } |
54 | 54 | ||
55 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ | 55 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ |
56 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" | 56 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" |
57 | PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 57 | PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
58 | PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 58 | PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
59 | 59 | ||
60 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" | 60 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" |
61 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build | 61 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build |
@@ -73,15 +73,15 @@ prepare_gtk_scripts() { | |||
73 | ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 | 73 | ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 |
74 | } | 74 | } |
75 | 75 | ||
76 | do_install_append_class-target() { | 76 | do_install:append:class-target() { |
77 | prepare_gtk_scripts | 77 | prepare_gtk_scripts |
78 | } | 78 | } |
79 | 79 | ||
80 | do_install_append_class-nativesdk() { | 80 | do_install:append:class-nativesdk() { |
81 | prepare_gtk_scripts | 81 | prepare_gtk_scripts |
82 | } | 82 | } |
83 | 83 | ||
84 | do_install_append_class-native() { | 84 | do_install:append:class-native() { |
85 | create_wrapper ${D}/${bindir}/gtk-update-icon-cache \ | 85 | create_wrapper ${D}/${bindir}/gtk-update-icon-cache \ |
86 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache | 86 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache |
87 | create_wrapper ${D}/${bindir}/gtk-encode-symbolic-svg \ | 87 | create_wrapper ${D}/${bindir}/gtk-encode-symbolic-svg \ |
@@ -92,7 +92,7 @@ PROVIDES += "gtk-icon-utils" | |||
92 | PACKAGES =+ "${PN}-demo" | 92 | PACKAGES =+ "${PN}-demo" |
93 | LIBV = "3.0.0" | 93 | LIBV = "3.0.0" |
94 | 94 | ||
95 | FILES_${PN}-demo = "${bindir}/gtk3-demo \ | 95 | FILES:${PN}-demo = "${bindir}/gtk3-demo \ |
96 | ${bindir}/gtk3-demo-application \ | 96 | ${bindir}/gtk3-demo-application \ |
97 | ${bindir}/gtk3-icon-browser \ | 97 | ${bindir}/gtk3-icon-browser \ |
98 | ${bindir}/gtk3-widget-factory \ | 98 | ${bindir}/gtk3-widget-factory \ |
@@ -103,14 +103,14 @@ FILES_${PN}-demo = "${bindir}/gtk3-demo \ | |||
103 | ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ | 103 | ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ |
104 | ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" | 104 | ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" |
105 | 105 | ||
106 | FILES_${PN}_append = " ${bindir}/gtk-update-icon-cache-3.0 \ | 106 | FILES:${PN}:append = " ${bindir}/gtk-update-icon-cache-3.0 \ |
107 | ${bindir}/gtk-query-immodules-3.0 \ | 107 | ${bindir}/gtk-query-immodules-3.0 \ |
108 | ${bindir}/gtk-launch \ | 108 | ${bindir}/gtk-launch \ |
109 | ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ | 109 | ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ |
110 | ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \ | 110 | ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \ |
111 | ${libdir}/gtk-3.0/modules/*.so" | 111 | ${libdir}/gtk-3.0/modules/*.so" |
112 | 112 | ||
113 | FILES_${PN}-dev += " \ | 113 | FILES:${PN}-dev += " \ |
114 | ${datadir}/gtk-3.0/gtkbuilder.rng \ | 114 | ${datadir}/gtk-3.0/gtkbuilder.rng \ |
115 | ${datadir}/gtk-3.0/include \ | 115 | ${datadir}/gtk-3.0/include \ |
116 | ${datadir}/gtk-3.0/valgrind \ | 116 | ${datadir}/gtk-3.0/valgrind \ |
@@ -136,22 +136,22 @@ GTKBASE_RRECOMMENDS ?= "liberation-fonts \ | |||
136 | adwaita-icon-theme-symbolic \ | 136 | adwaita-icon-theme-symbolic \ |
137 | " | 137 | " |
138 | 138 | ||
139 | GTKBASE_RRECOMMENDS_class-native ?= "\ | 139 | GTKBASE_RRECOMMENDS:class-native ?= "\ |
140 | " | 140 | " |
141 | 141 | ||
142 | GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" | 142 | GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" |
143 | 143 | ||
144 | RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" | 144 | RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" |
145 | RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" | 145 | RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" |
146 | RDEPENDS_${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" | 146 | RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" |
147 | 147 | ||
148 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" | 148 | PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" |
149 | 149 | ||
150 | ALTERNATIVE_${PN} = "gtk-update-icon-cache" | 150 | ALTERNATIVE:${PN} = "gtk-update-icon-cache" |
151 | ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" | 151 | ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" |
152 | ALTERNATIVE_PRIORITY = "30" | 152 | ALTERNATIVE_PRIORITY = "30" |
153 | 153 | ||
154 | python populate_packages_prepend () { | 154 | python populate_packages:prepend () { |
155 | import os.path | 155 | import os.path |
156 | 156 | ||
157 | gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') | 157 | gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') |
@@ -165,5 +165,5 @@ python populate_packages_prepend () { | |||
165 | do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') | 165 | do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') |
166 | 166 | ||
167 | if (d.getVar('DEBIAN_NAMES')): | 167 | if (d.getVar('DEBIAN_NAMES')): |
168 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') | 168 | d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-3.0') |
169 | } | 169 | } |