[oe-commits] org.oe.dev gtk+: fix the immodules postinst to use 'gtk-query-immodules-2.0' instead of the non-existant 'gtk-query-immodules'

[koen commit]

gtk+: fix the immodules postinst to use 'gtk-query-immodules-2.0' instead of the non-existant 'gtk-query-immodules'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c9f8df179204629099327279de68b9917d765fd5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c9f8df179204629099327279de68b9917d765fd5
Files:
1
packages/gtk+/gtk+_2.10.3.bb
packages/gtk+/gtk+_2.10.6.bb
packages/gtk+/gtk+_2.6.10.bb
packages/gtk+/gtk+_2.6.7.bb
packages/gtk+/gtk+_2.8.16.bb
packages/gtk+/gtk+_2.8.9.bb
Diffs:

#
# mt diff -ref3cd9b6bded0574f0761ea0b7f5da1559028c96 -rc9f8df179204629099327279de68b9917d765fd5
#
# 
# 
# patch "packages/gtk+/gtk+_2.10.3.bb"
#  from [0544722b7add454700957f48f93158a693598ac6]
#    to [8da07725607810844f75f203d69b07ef0e361b1f]
# 
# patch "packages/gtk+/gtk+_2.10.6.bb"
#  from [9e3304945e22969ff51cb6fdeee5c56ce8ab9d95]
#    to [0e760f9e497470748fccd1fe9fa11c132fbae1b0]
# 
# patch "packages/gtk+/gtk+_2.6.10.bb"
#  from [d51cb7ad72b124f7f36ef3acd12e60f6cef2a8f0]
#    to [fc92e4c4491fb76a354ec5b469508508624c9358]
# 
# patch "packages/gtk+/gtk+_2.6.7.bb"
#  from [cc8afaefb17566079e2db95525083536058d786d]
#    to [3dc4cf489abf30e0a049d1a31a6469657c83e020]
# 
# patch "packages/gtk+/gtk+_2.8.16.bb"
#  from [e08b612ea805b2a48c5d28753416be75dd839464]
#    to [f455273a9635bab016e0d10192ac0854dda5ee4a]
# 
# patch "packages/gtk+/gtk+_2.8.9.bb"
#  from [41ef94b7bab795a01b7ce04ae86c990521f8a2b0]
#    to [56db9f8ff353e06a0a5dc9d8f59bb5c2680ff5db]
# 
============================================================
--- packages/gtk+/gtk+_2.10.3.bb	0544722b7add454700957f48f93158a693598ac6
+++ packages/gtk+/gtk+_2.10.3.bb	8da07725607810844f75f203d69b07ef0e361b1f
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r2"
+PR = "r3"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
@@ -95,7 +95,7 @@ python populate_packages_prepend () {
 	printmodules_root = os.path.join(gtk_libdir, 'printbackends');
 
 	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+	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')
 	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
============================================================
--- packages/gtk+/gtk+_2.10.6.bb	9e3304945e22969ff51cb6fdeee5c56ce8ab9d95
+++ packages/gtk+/gtk+_2.10.6.bb	0e760f9e497470748fccd1fe9fa11c132fbae1b0
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
-PR = "r2"
+PR = "r3"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
@@ -96,7 +96,7 @@ python populate_packages_prepend () {
 	printmodules_root = os.path.join(gtk_libdir, 'printbackends');
 
 	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+	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')
 	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
============================================================
--- packages/gtk+/gtk+_2.6.10.bb	d51cb7ad72b124f7f36ef3acd12e60f6cef2a8f0
+++ packages/gtk+/gtk+_2.6.10.bb	fc92e4c4491fb76a354ec5b469508508624c9358
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-PR = "r4"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://help.patch;patch=1 \
@@ -89,7 +89,7 @@ python populate_packages_prepend () {
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
 
 	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+	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')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
============================================================
--- packages/gtk+/gtk+_2.6.7.bb	cc8afaefb17566079e2db95525083536058d786d
+++ packages/gtk+/gtk+_2.6.7.bb	3dc4cf489abf30e0a049d1a31a6469657c83e020
@@ -76,7 +76,7 @@ python populate_packages_prepend () {
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
 
 	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+	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')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
============================================================
--- packages/gtk+/gtk+_2.8.16.bb	e08b612ea805b2a48c5d28753416be75dd839464
+++ packages/gtk+/gtk+_2.8.16.bb	f455273a9635bab016e0d10192ac0854dda5ee4a
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r4"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -92,7 +92,7 @@ python populate_packages_prepend () {
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
 
 	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+	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')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
============================================================
--- packages/gtk+/gtk+_2.8.9.bb	41ef94b7bab795a01b7ce04ae86c990521f8a2b0
+++ packages/gtk+/gtk+_2.8.9.bb	56db9f8ff353e06a0a5dc9d8f59bb5c2680ff5db
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
@@ -90,7 +90,7 @@ python populate_packages_prepend () {
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
 
 	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
-	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
+	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')
 
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)