[oe-commits] org.oe.dev orbit2: upgrade to 2.14.12 to cope with glib >= 2.15

[xjqian commit]

orbit2: upgrade to 2.14.12 to cope with glib >= 2.15
* restore sanity of .pc after do_install
* fix packaing

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 79bff7df1e9d050419ad89d4e515f264e3858e85
ViewMTN: http://monotone.openembedded.org/revision/info/79bff7df1e9d050419ad89d4e515f264e3858e85
Files:
1
packages/gnome/orbit2-native_2.14.0.bb
packages/gnome/orbit2-native_2.14.12.bb
packages/gnome/orbit2_2.14.0.bb
packages/gnome/orbit2_2.14.12.bb
Diffs:

#
# mt diff -refbba0f30c31059b997317c4ea40342a11b3ed4f -r79bff7df1e9d050419ad89d4e515f264e3858e85
#
#
#
# rename "packages/gnome/orbit2-native_2.14.0.bb"
#     to "packages/gnome/orbit2-native_2.14.12.bb"
# 
# rename "packages/gnome/orbit2_2.14.0.bb"
#     to "packages/gnome/orbit2_2.14.12.bb"
# 
# patch "packages/gnome/orbit2-native_2.14.12.bb"
#  from [886fdcc1b49563a180e71e236d1d65c70468ac29]
#    to [b2d8ea30d41eb53755abf5033fa9db3ef661a68a]
# 
# patch "packages/gnome/orbit2_2.14.12.bb"
#  from [231a0628e22a006b6c2fb04bfebadb96be700ffa]
#    to [f816d1f85d577a0fa022ebd1e2373dedac41c79e]
#
============================================================
--- packages/gnome/orbit2-native_2.14.0.bb	886fdcc1b49563a180e71e236d1d65c70468ac29
+++ packages/gnome/orbit2-native_2.14.12.bb	b2d8ea30d41eb53755abf5033fa9db3ef661a68a
@@ -1,4 +1,5 @@ DESCRIPTION = "CORBA ORB"
 DESCRIPTION = "CORBA ORB"
+PR = "r0"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
============================================================
--- packages/gnome/orbit2_2.14.0.bb	231a0628e22a006b6c2fb04bfebadb96be700ffa
+++ packages/gnome/orbit2_2.14.12.bb	f816d1f85d577a0fa022ebd1e2373dedac41c79e
@@ -1,5 +1,5 @@ LICENSE = "GPL"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r0"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
@@ -10,9 +10,13 @@ FILES_${PN} += "${libdir}/orbit-2.0/*.so
 PARALLEL_MAKE = ""
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so"
+FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la"
+FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug"
 
 S = "${WORKDIR}/ORBit2-${PV}"
 
+LEAD_SONAME = "libORBit-2.so"
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
@@ -25,10 +29,15 @@ do_compile_append () {
 }
 
 do_compile_append () {
-	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
-	mv ORBit-2.0.pc.new ORBit-2.0.pc
+        cp ORBit-2.0.pc ORBit-2.0.pc.old
+        sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+        mv ORBit-2.0.pc.new ORBit-2.0.pc
 }
 
+do_install_append () {
+        mv ORBit-2.0.pc.old ORBit-2.0.pc
+}
+
 do_stage() {
 	oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR}
 	oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR}