[oe-commits] org.oe.dev add gtk-binver parsing gtk_binary_version out of .pc file. close #1455

[mickeyl commit]

add gtk-binver parsing gtk_binary_version out of .pc file. close #1455
NOTE1: patch based on work of XorA
NOTE2: we might want to make this more generic (i.e. get-pkgconfig-entry) eventually
NOTE3: please adapt this to other gtk-engine versions as suitable

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 593b9e6f5ea7ab1790ec54c7599baf883f22f12b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=593b9e6f5ea7ab1790ec54c7599baf883f22f12b
Files:
1
classes/gtk-binver.bbclass
packages/gtk-engines/gtk-engines_2.7.4.bb
Diffs:

#
# mt diff -rc1c58152e12d208c30b3e36b988116eaf94ba68e -r593b9e6f5ea7ab1790ec54c7599baf883f22f12b
#
# 
# 
# add_file "classes/gtk-binver.bbclass"
#  content [75758edccd17de18f4a0a32d3c414c098e73a075]
# 
# patch "packages/gtk-engines/gtk-engines_2.7.4.bb"
#  from [580c8d864b506396e2590700f456ce30a10251a6]
#    to [fc028ff3dd56265f42caacf2c7ec259ddc019078]
# 
============================================================
--- classes/gtk-binver.bbclass	75758edccd17de18f4a0a32d3c414c098e73a075
+++ classes/gtk-binver.bbclass	75758edccd17de18f4a0a32d3c414c098e73a075
@@ -0,0 +1,9 @@
+def gtkbinver_find(d):
+    import bb
+    try:
+        for line in file( "%s/pkgconfig/gtk+-2.0.pc" % bb.data.getVar('STAGING_DATADIR', d, 1) ).readlines():
+            if line.startswith( "gtk_binary_version" ):
+                # bb.note( "gtk_binary_version = '%s'" % line.split("=")[1].strip() )
+                return line.split("=")[1].strip()
+    except OSError:
+        return "0.0.0"
============================================================
--- packages/gtk-engines/gtk-engines_2.7.4.bb	580c8d864b506396e2590700f456ce30a10251a6
+++ packages/gtk-engines/gtk-engines_2.7.4.bb	fc028ff3dd56265f42caacf2c7ec259ddc019078
@@ -14,14 +14,16 @@ SRC_URI = "${GNOME_MIRROR}/${PN}/2.7/${P
 
 SRC_URI = "${GNOME_MIRROR}/${PN}/2.7/${P}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-binver
 
 PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
 
 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='')