orbit2: patch ORBit-2.0.pc.in instead of using sed on ORBit-2.0.pc (fixes QA issue)

diff --git a/packages/gnome/orbit2/pkgconfig-fix.patch b/packages/gnome/orbit2/pkgconfig-fix.patch
new file mode 100644 (file)
index 0000000..f629e50
--- /dev/null
+++ b/packages/gnome/orbit2/pkgconfig-fix.patch
@@ -0,0 +1,12 @@
+diff -urN ORBit2-2.14.12.orig/ORBit-2.0.pc.in ORBit2-2.14.12/ORBit-2.0.pc.in
+--- ORBit2-2.14.12.orig/ORBit-2.0.pc.in        2008-01-29 13:45:22.000000000 +0100
++++ ORBit2-2.14.12/ORBit-2.0.pc.in     2008-09-23 20:13:07.000000000 +0200
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-orbit_idl=@bindir@/orbit-idl-2@EXEEXT@
++orbit_idl=@exec_prefix@/bin/orbit-idl-2@EXEEXT@
+ 
+ 
+ Name: ORBit-2.0

diff --git a/packages/gnome/orbit2_2.14.12.bb b/packages/gnome/orbit2_2.14.12.bb
index 1ac0136..1407761 100644 (file)
--- a/packages/gnome/orbit2_2.14.12.bb
+++ b/packages/gnome/orbit2_2.14.12.bb
@@ -1,9 +1,10 @@
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
            file://configure-lossage.patch;patch=1;pnum=1 \
+           file://pkgconfig-fix.patch;patch=1 \
           file://gtk-doc.m4 \
           file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native gtk-doc"
@@ -28,16 +29,6 @@ do_configure_prepend() {
        install ${WORKDIR}/gtk-doc.make ./
 }
 
-do_compile_append () {
-        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}