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/gtk+ | |
| 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/gtk+')
| -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 |
4 files changed, 12 insertions, 12 deletions
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" |
