[oe-commits] org.oe.dev gtk-engines: remove hard-coded paths. Closes 2364.

[Laibsch commit]

gtk-engines: remove hard-coded paths.  Closes 2364.
* drop versions prior ro 2.6.5
* some cosmetic clean-up
* backport solution from 2.7.4 to 2.6.5 and smooth-engine

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: c81579411a660148403ffc26d57e203f491f1be5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c81579411a660148403ffc26d57e203f491f1be5
Files:
1
packages/gtk-engines/gtk-engines_2.2.0.bb
packages/gtk-engines/gtk-engines_2.6.1.bb
packages/gtk-engines/gtk-engines_2.6.3.bb
packages/gtk-engines/gtk-engines_2.6.5.bb
packages/gtk-engines/gtk-smooth-engine_0.5.8.bb
Diffs:

#
# mt diff -r2a6d1b343e9a1fe7e1093eca307c4cd6a5b614d8 -rc81579411a660148403ffc26d57e203f491f1be5
#
# 
# 
# delete "packages/gtk-engines/gtk-engines_2.2.0.bb"
# 
# delete "packages/gtk-engines/gtk-engines_2.6.1.bb"
# 
# delete "packages/gtk-engines/gtk-engines_2.6.3.bb"
# 
# patch "packages/gtk-engines/gtk-engines_2.6.5.bb"
#  from [00baa41dbbba23f4928eb3e8495db69b7ec70261]
#    to [52ab3ad99583f0676cc06360f36619a93e110045]
# 
# patch "packages/gtk-engines/gtk-smooth-engine_0.5.8.bb"
#  from [8c9c07f7c0c409b5a7a21d072189056c8e0d052b]
#    to [60bb670683c89a7726cf26ae729fce8ca28fca6c]
# 
============================================================
--- packages/gtk-engines/gtk-engines_2.6.5.bb	00baa41dbbba23f4928eb3e8495db69b7ec70261
+++ packages/gtk-engines/gtk-engines_2.6.5.bb	52ab3ad99583f0676cc06360f36619a93e110045
@@ -1,7 +1,9 @@
-LICENSE = "GPL"
+DESCRIPTION = "GTK theme engines"
 SECTION = "x11/base"
-DESCRIPTION = "GTK theme engines"
+PRIORITY = "optional"
+LICENSE = "GPL"
 DEPENDS = "gtk+"
+PR = "r1"
 
 RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
 RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
@@ -20,10 +22,11 @@ python populate_packages_prepend() {
 python populate_packages_prepend() {
 	import os.path
 
-	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines")
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
 	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
 
 	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
 	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
 }
-
============================================================
--- packages/gtk-engines/gtk-smooth-engine_0.5.8.bb	8c9c07f7c0c409b5a7a21d072189056c8e0d052b
+++ packages/gtk-engines/gtk-smooth-engine_0.5.8.bb	60bb670683c89a7726cf26ae729fce8ca28fca6c
@@ -1,11 +1,22 @@
-PR = "r0"
+DESCRIPTION = "GTK theme engine Smooth"
+SECTION = "x11/base"
+PRIORITY = "optional"
 LICENSE = "LGPL"
-SECTION = "x11/base"
-DESCRIPTION = "GTK theme engine Smooth"
 DEPENDS = "gtk+"
+PR = "r1"
 
-FILES_${PN} = "${libdir}/gtk-2.0/2.4.0/engines/libsmooth.so"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/smooth-engine/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
+
+python populate_packages_prepend() {
+	import os.path
+
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
+	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
+
+	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
+	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
+}