diff options
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 4 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.32.bb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb index 99c84c6dda..e4f2eee976 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb | |||
@@ -69,7 +69,7 @@ python populate_packages_prepend () { | |||
69 | 69 | ||
70 | loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') | 70 | loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') |
71 | 71 | ||
72 | packages = ' '.join(do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')) | 72 | packages = ' '.join(do_split_packages(d, loaders_root, r'^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')) |
73 | d.setVar('PIXBUF_PACKAGES', packages) | 73 | d.setVar('PIXBUF_PACKAGES', packages) |
74 | 74 | ||
75 | # The test suite exercises all the loaders, so ensure they are all | 75 | # The test suite exercises all the loaders, so ensure they are all |
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 519a9840f4..1b0829de07 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -123,11 +123,11 @@ python populate_packages_prepend () { | |||
123 | immodules_root = os.path.join(gtk_libdir, 'immodules') | 123 | immodules_root = os.path.join(gtk_libdir, 'immodules') |
124 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); | 124 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); |
125 | 125 | ||
126 | immodules = do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s') | 126 | immodules = do_split_packages(d, immodules_root, r'^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s') |
127 | if immodules: | 127 | if immodules: |
128 | d.setVar("GTKIMMODULES_PACKAGES", " ".join(immodules)) | 128 | d.setVar("GTKIMMODULES_PACKAGES", " ".join(immodules)) |
129 | 129 | ||
130 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') | 130 | do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') |
131 | 131 | ||
132 | if (d.getVar('DEBIAN_NAMES')): | 132 | if (d.getVar('DEBIAN_NAMES')): |
133 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') | 133 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') |
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb index 89fca736b2..682d31e49e 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb | |||
@@ -27,8 +27,8 @@ python populate_packages_prepend () { | |||
27 | immodules_root = os.path.join(gtk_libdir, 'immodules') | 27 | immodules_root = os.path.join(gtk_libdir, 'immodules') |
28 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); | 28 | printmodules_root = os.path.join(gtk_libdir, 'printbackends'); |
29 | 29 | ||
30 | d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s'))) | 30 | d.setVar('GTKIMMODULES_PACKAGES', ' '.join(do_split_packages(d, immodules_root, r'^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s'))) |
31 | do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') | 31 | do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') |
32 | 32 | ||
33 | if (d.getVar('DEBIAN_NAMES')): | 33 | if (d.getVar('DEBIAN_NAMES')): |
34 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0') | 34 | d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-2.0') |