diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-gnome | |
parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
download | meta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz |
Convert to new override syntax
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-gnome')
-rw-r--r-- | meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb | 10 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtk+.inc | 16 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-gnome/vte9/vte9.inc | 6 |
12 files changed, 30 insertions, 30 deletions
diff --git a/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb b/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb index a3e8bbf492..b305fe5733 100644 --- a/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb +++ b/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb | |||
@@ -17,4 +17,4 @@ SRC_URI[archive.sha256sum] = "a0bb49765ceccc293ab2c6735ba100431807d384ffa14c2ebd | |||
17 | 17 | ||
18 | EXTRA_OEMESON = "-Dbuild-documentation=false" | 18 | EXTRA_OEMESON = "-Dbuild-documentation=false" |
19 | 19 | ||
20 | FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" | 20 | FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" |
diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb index e70b747892..7f38d42bed 100644 --- a/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb +++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb | |||
@@ -13,6 +13,6 @@ SRC_URI[archive.sha256sum] = "2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a | |||
13 | 13 | ||
14 | export ac_cv_have_iconv_detect_h="yes" | 14 | export ac_cv_have_iconv_detect_h="yes" |
15 | 15 | ||
16 | do_configure_append () { | 16 | do_configure:append () { |
17 | cp ${WORKDIR}/iconv-detect.h ${S} | 17 | cp ${WORKDIR}/iconv-detect.h ${S} |
18 | } | 18 | } |
diff --git a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb index d874164540..634b60940f 100644 --- a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb +++ b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb | |||
@@ -18,7 +18,7 @@ DEPENDS = "" | |||
18 | PACKAGECONFIG ??= "autoconf-archive" | 18 | PACKAGECONFIG ??= "autoconf-archive" |
19 | PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive" | 19 | PACKAGECONFIG[autoconf-archive] = "--with-autoconf-archive, --without-autoconf-archive, autoconf-archive" |
20 | 20 | ||
21 | FILES_${PN} += "${datadir}/aclocal" | 21 | FILES:${PN} += "${datadir}/aclocal" |
22 | FILES_${PN}-dev = "" | 22 | FILES:${PN}-dev = "" |
23 | 23 | ||
24 | BBCLASSEXTEND = "native" | 24 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index f7fbedd6e0..ec258ae982 100644 --- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | |||
@@ -9,10 +9,10 @@ SRC_URI = "file://gnome-doc-utils.m4" | |||
9 | 9 | ||
10 | PROVIDES = "gnome-doc-utils" | 10 | PROVIDES = "gnome-doc-utils" |
11 | 11 | ||
12 | do_install_append() { | 12 | do_install:append() { |
13 | install -d ${D}${datadir}/aclocal/ | 13 | install -d ${D}${datadir}/aclocal/ |
14 | install ${WORKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/ | 14 | install ${WORKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/ |
15 | } | 15 | } |
16 | 16 | ||
17 | FILES_${PN} += "${datadir}" | 17 | FILES:${PN} += "${datadir}" |
18 | 18 | ||
diff --git a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb index ac594711cd..3a018bb519 100644 --- a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb +++ b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb | |||
@@ -17,7 +17,7 @@ SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a | |||
17 | 17 | ||
18 | EXTRA_OECONF = "--disable-gtk3-engine" | 18 | EXTRA_OECONF = "--disable-gtk3-engine" |
19 | 19 | ||
20 | do_install_append() { | 20 | do_install:append() { |
21 | # Only building Adwaita, remove highcontrast files | 21 | # Only building Adwaita, remove highcontrast files |
22 | rm -rf ${D}${prefix}/share/themes/HighContrast \ | 22 | rm -rf ${D}${prefix}/share/themes/HighContrast \ |
23 | ${D}${prefix}/share/icons | 23 | ${D}${prefix}/share/icons |
@@ -32,11 +32,11 @@ PACKAGES += "gnome-theme-adwaita \ | |||
32 | gnome-theme-adwaita-dark \ | 32 | gnome-theme-adwaita-dark \ |
33 | " | 33 | " |
34 | 34 | ||
35 | FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ | 35 | FILES:gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ |
36 | ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" | 36 | ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" |
37 | 37 | ||
38 | FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" | 38 | FILES:gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" |
39 | RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita" | 39 | RDEPENDS:gnome-theme-adwaita-dark = "gnome-theme-adwaita" |
40 | 40 | ||
41 | # gnome-themes-standard is empty and doesn't exist | 41 | # gnome-themes-standard is empty and doesn't exist |
42 | RDEPENDS_${PN}-dev = "" | 42 | RDEPENDS:${PN}-dev = "" |
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+.inc b/meta-oe/recipes-gnome/gtk+/gtk+.inc index ccbcfc8da4..124e3db9b9 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+.inc +++ b/meta-oe/recipes-gnome/gtk+/gtk+.inc | |||
@@ -32,12 +32,12 @@ inherit autotools gtk-doc pkgconfig update-alternatives gtk-immodules-cache gobj | |||
32 | 32 | ||
33 | PACKAGES += "libgail gtk-demo" | 33 | PACKAGES += "libgail gtk-demo" |
34 | 34 | ||
35 | FILES_${PN} += "${bindir}/gtk-update-icon-cache-2.0 \ | 35 | FILES:${PN} += "${bindir}/gtk-update-icon-cache-2.0 \ |
36 | ${bindir}/gtk-query-immodules-2.0 \ | 36 | ${bindir}/gtk-query-immodules-2.0 \ |
37 | ${datadir}/themes ${sysconfdir} \ | 37 | ${datadir}/themes ${sysconfdir} \ |
38 | ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" | 38 | ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" |
39 | 39 | ||
40 | FILES_${PN}-dev += " \ | 40 | FILES:${PN}-dev += " \ |
41 | ${datadir}/gtk-2.0/include \ | 41 | ${datadir}/gtk-2.0/include \ |
42 | ${libdir}/gtk-2.0/include \ | 42 | ${libdir}/gtk-2.0/include \ |
43 | ${libdir}/gtk-2.0/modules/*.la \ | 43 | ${libdir}/gtk-2.0/modules/*.la \ |
@@ -47,12 +47,12 @@ FILES_${PN}-dev += " \ | |||
47 | ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ | 47 | ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ |
48 | ${bindir}/gtk-builder-convert" | 48 | ${bindir}/gtk-builder-convert" |
49 | 49 | ||
50 | FILES_gtk-demo = " \ | 50 | FILES:gtk-demo = " \ |
51 | ${datadir}/gtk-2.0/demo/* \ | 51 | ${datadir}/gtk-2.0/demo/* \ |
52 | ${bindir}/gtk-demo \ | 52 | ${bindir}/gtk-demo \ |
53 | " | 53 | " |
54 | 54 | ||
55 | FILES_libgail = " \ | 55 | FILES:libgail = " \ |
56 | ${libdir}/gtk-2.0/modules/libgail.so \ | 56 | ${libdir}/gtk-2.0/modules/libgail.so \ |
57 | ${libdir}/gtk-2.0/modules/libferret.so \ | 57 | ${libdir}/gtk-2.0/modules/libferret.so \ |
58 | " | 58 | " |
@@ -67,13 +67,13 @@ GTKBASE_RRECOMMENDS ?= "liberation-fonts \ | |||
67 | " | 67 | " |
68 | GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" | 68 | GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" |
69 | 69 | ||
70 | RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" | 70 | RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" |
71 | RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" | 71 | RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" |
72 | 72 | ||
73 | ALTERNATIVE_${PN} = "gtk-update-icon-cache" | 73 | ALTERNATIVE:${PN} = "gtk-update-icon-cache" |
74 | ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-2.0" | 74 | ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-2.0" |
75 | 75 | ||
76 | do_compile_prepend() { | 76 | do_compile:prepend() { |
77 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" | 77 | export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" |
78 | } | 78 | } |
79 | 79 | ||
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 0c2e353a9a..ccd82b91f2 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb +++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb | |||
@@ -21,7 +21,7 @@ LIBV = "2.10.0" | |||
21 | 21 | ||
22 | PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" | 22 | PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*" |
23 | 23 | ||
24 | python populate_packages_prepend () { | 24 | python populate_packages:prepend () { |
25 | gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') | 25 | gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') |
26 | immodules_root = os.path.join(gtk_libdir, 'immodules') | 26 | immodules_root = os.path.join(gtk_libdir, 'immodules') |
27 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); | 27 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); |
@@ -30,5 +30,5 @@ python populate_packages_prepend () { | |||
30 | do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | 30 | do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') |
31 | 31 | ||
32 | if (d.getVar('DEBIAN_NAMES')): | 32 | if (d.getVar('DEBIAN_NAMES')): |
33 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0') | 33 | d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-2.0') |
34 | } | 34 | } |
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb index 2c5012cb2e..428ec69d76 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb | |||
@@ -20,4 +20,4 @@ SRC_URI[archive.sha256sum] = "856333de86689f6a81c123f2db15d85db9addc438bc3574c36 | |||
20 | 20 | ||
21 | EXTRA_OEMESON = "-Dbuild-demos=false" | 21 | EXTRA_OEMESON = "-Dbuild-demos=false" |
22 | 22 | ||
23 | FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" | 23 | FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" |
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb index bb179447b8..a9bb3387bb 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb | |||
@@ -17,4 +17,4 @@ SRC_URI[archive.sha256sum] = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09 | |||
17 | 17 | ||
18 | EXTRA_OECONF = " --disable-documentation " | 18 | EXTRA_OECONF = " --disable-documentation " |
19 | 19 | ||
20 | FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" | 20 | FILES:${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" |
diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb index b857cc5bd3..e96ef004a3 100644 --- a/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb +++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.1.7.bb | |||
@@ -29,6 +29,6 @@ PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" | |||
29 | EXTRA_OEMESON = "-Dman=false" | 29 | EXTRA_OEMESON = "-Dman=false" |
30 | GTKDOC_MESON_OPTION = "gtkdoc" | 30 | GTKDOC_MESON_OPTION = "gtkdoc" |
31 | 31 | ||
32 | RDEPENDS_${PN}_class-target = "\ | 32 | RDEPENDS:${PN}:class-target = "\ |
33 | ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ | 33 | ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ |
34 | " | 34 | " |
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb index 316a927846..d2e01833df 100644 --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb +++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb | |||
@@ -17,10 +17,10 @@ SRC_URI[archive.sha256sum] = "0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d | |||
17 | PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" | 17 | PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" |
18 | 18 | ||
19 | PACKAGES =+ "${PN}-demo ${PN}-python3" | 19 | PACKAGES =+ "${PN}-demo ${PN}-python3" |
20 | FILES_${PN}-demo = " \ | 20 | FILES:${PN}-demo = " \ |
21 | ${bindir}/peas-demo \ | 21 | ${bindir}/peas-demo \ |
22 | ${libdir}/peas-demo \ | 22 | ${libdir}/peas-demo \ |
23 | " | 23 | " |
24 | 24 | ||
25 | RDEPENDS_${PN}-python3 = "python3-pygobject" | 25 | RDEPENDS:${PN}-python3 = "python3-pygobject" |
26 | FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" | 26 | FILES:${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" |
diff --git a/meta-oe/recipes-gnome/vte9/vte9.inc b/meta-oe/recipes-gnome/vte9/vte9.inc index 14d194004e..c191a6d29c 100644 --- a/meta-oe/recipes-gnome/vte9/vte9.inc +++ b/meta-oe/recipes-gnome/vte9/vte9.inc | |||
@@ -2,7 +2,7 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" | |||
2 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" | 2 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" |
3 | LICENSE = "LGPLv2.0" | 3 | LICENSE = "LGPLv2.0" |
4 | DEPENDS = " glib-2.0 gtk+ intltool-native gnome-common-native ncurses" | 4 | DEPENDS = " glib-2.0 gtk+ intltool-native gnome-common-native ncurses" |
5 | RDEPENDS_libvte = "vte-termcap" | 5 | RDEPENDS:libvte = "vte-termcap" |
6 | 6 | ||
7 | # help gnomebase get the SRC_URI correct | 7 | # help gnomebase get the SRC_URI correct |
8 | GNOMEBN = "vte" | 8 | GNOMEBN = "vte" |
@@ -14,5 +14,5 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | |||
14 | EXTRA_OECONF = "--disable-python" | 14 | EXTRA_OECONF = "--disable-python" |
15 | 15 | ||
16 | PACKAGES =+ "libvte9 vte9-termcap" | 16 | PACKAGES =+ "libvte9 vte9-termcap" |
17 | FILES_libvte9 = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper" | 17 | FILES:libvte9 = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper" |
18 | FILES_vte9-termcap = "${datadir}/vte/termcap-0.0" | 18 | FILES:vte9-termcap = "${datadir}/vte/termcap-0.0" |