diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-24 19:39:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-24 19:39:46 +0000 |
| commit | ffdc33ee9f98213b0206cbbd8496ec3b48ae1c8f (patch) | |
| tree | b83355fd177bb16b3309ba991b02d2815c42d7c1 /packages/gnome | |
| parent | 4f7b18b2325b460f224f13ad1f562ee4489e9e56 (diff) | |
| parent | 1afd7b0bd9371f8bb52f7f63edcbca4e4e2af998 (diff) | |
merge of '2e75cbd37f40c36e60bc1e60a02e967304b6b338'
and '887e1a4016c96ca69eca2047591511a955459515'
Diffstat (limited to 'packages/gnome')
| -rw-r--r-- | packages/gnome/gnome-games_2.23.6.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/orbit2/pkgconfig-fix.patch | 12 | ||||
| -rw-r--r-- | packages/gnome/orbit2_2.14.12.bb | 13 |
3 files changed, 15 insertions, 12 deletions
diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb index 6fb4dd7d89..c8e1c19da3 100644 --- a/packages/gnome/gnome-games_2.23.6.bb +++ b/packages/gnome/gnome-games_2.23.6.bb @@ -19,7 +19,7 @@ do_configure_prepend() { done } -do_configure_prepend() { +do_configure_append() { for i in $(find ${S} -name "Makefile") ; do sed -i -e s:'-I /usr/include -I /usr/local/include'::g $i done diff --git a/packages/gnome/orbit2/pkgconfig-fix.patch b/packages/gnome/orbit2/pkgconfig-fix.patch new file mode 100644 index 0000000000..f629e506dd --- /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 1ac0136e10..140776114d 100644 --- 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} |