summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 10:59:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 18:22:56 (GMT)
commit06f2f8ce0a3093973ca54b48f542f8485b666079 (patch)
treedbcfa5c491eb2e5d237aa539cb7c6e77dc07dd6f /meta/recipes-gnome
parentd01dadfb87cfd2284b3e849d35a35fe5df0239c4 (diff)
downloadpoky-06f2f8ce0a3093973ca54b48f542f8485b666079.tar.gz
meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
Using "1" with getVar is bad coding style and "True" is preferred. This patch is a sed over the meta directory of the form: sed \ -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \ -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \ -i `grep -ril getVar *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.12.7.bb6
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.16.6.bb6
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.8.bb4
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb4
5 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 121babd..603b38f 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -58,7 +58,7 @@ PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
58PACKAGES_DYNAMIC_virtclass-native = "" 58PACKAGES_DYNAMIC_virtclass-native = ""
59 59
60python populate_packages_prepend () { 60python populate_packages_prepend () {
61 postinst_pixbufloader = d.getVar("postinst_pixbufloader", 1) 61 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
62 62
63 loaders_root = bb.data.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders', d) 63 loaders_root = bb.data.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders', d)
64 64
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index c6077ec..e45768d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -34,8 +34,8 @@ PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
34python populate_packages_prepend () { 34python populate_packages_prepend () {
35 import os.path 35 import os.path
36 36
37 prologue = d.getVar("postinst_prologue", 1) 37 prologue = d.getVar("postinst_prologue", True)
38 postinst_pixbufloader = d.getVar("postinst_pixbufloader", 1) 38 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
39 39
40 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) 40 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
41 loaders_root = os.path.join(gtk_libdir, 'loaders') 41 loaders_root = os.path.join(gtk_libdir, 'loaders')
@@ -46,6 +46,6 @@ python populate_packages_prepend () {
46 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') 46 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
47 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 47 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
48 48
49 if (d.getVar('DEBIAN_NAMES', 1)): 49 if (d.getVar('DEBIAN_NAMES', True)):
50 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0') 50 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
51} 51}
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 5fcb576..1e7a87f 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -34,8 +34,8 @@ PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
34python populate_packages_prepend () { 34python populate_packages_prepend () {
35 import os.path 35 import os.path
36 36
37 prologue = d.getVar("postinst_prologue", 1) 37 prologue = d.getVar("postinst_prologue", True)
38 postinst_pixbufloader = d.getVar("postinst_pixbufloader", 1) 38 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
39 39
40 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) 40 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
41 loaders_root = os.path.join(gtk_libdir, 'loaders') 41 loaders_root = os.path.join(gtk_libdir, 'loaders')
@@ -46,6 +46,6 @@ python populate_packages_prepend () {
46 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') 46 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
47 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 47 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
48 48
49 if (d.getVar('DEBIAN_NAMES', 1)): 49 if (d.getVar('DEBIAN_NAMES', True)):
50 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0') 50 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
51} 51}
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index dab66c7..c27826c 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -41,7 +41,7 @@ PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*"
41python populate_packages_prepend () { 41python populate_packages_prepend () {
42 import os.path 42 import os.path
43 43
44 prologue = d.getVar("postinst_prologue", 1) 44 prologue = d.getVar("postinst_prologue", True)
45 45
46 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) 46 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
47 immodules_root = os.path.join(gtk_libdir, 'immodules') 47 immodules_root = os.path.join(gtk_libdir, 'immodules')
@@ -50,6 +50,6 @@ python populate_packages_prepend () {
50 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') 50 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
51 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 51 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
52 52
53 if (d.getVar('DEBIAN_NAMES', 1)): 53 if (d.getVar('DEBIAN_NAMES', True)):
54 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0') 54 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
55} 55}
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 233a6ee..3ca6e81 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -31,8 +31,8 @@ inherit gnome
31python populate_packages_prepend() { 31python populate_packages_prepend() {
32 import os.path 32 import os.path
33 33
34 engines_root = os.path.join(d.getVar('libdir', 1), "gtk-2.0/2.10.0/engines") 34 engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")
35 themes_root = os.path.join(d.getVar('datadir', 1), "themes") 35 themes_root = os.path.join(d.getVar('datadir', True), "themes")
36 36
37 do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') 37 do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
38 do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') 38 do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')