mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

libbonobo: Update to latest versions and fix build when S != B

Browse Source 
Do not install idl files which are already installed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2014-04-25 15:55:00 -07:00
committed by Martin Jansa
parent 96619ff2bb
commit fd984397eb
5 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/bonobo/libbonobo.inc
-2
View File
@@ -35,6 +35,4 @@ do_compile() {
do_install() {
oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
install -d ${D}${datadir}/idl/bonobo-activation-2.0/
install idl/*.idl ${D}${datadir}/idl/bonobo-activation-2.0/
}
meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch
+7 -7
View File
@@ -9,16 +9,16 @@ st-properties.sh'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Not Submitted
Index: libbonobo-2.24.3/tests/Makefile.am
Index: libbonobo-2.32.1/tests/Makefile.am
===================================================================
--- libbonobo-2.24.3.orig/tests/Makefile.am 2009-04-18 05:27:41.000000000 -0700
+++ libbonobo-2.24.3/tests/Makefile.am 2013-10-17 16:59:45.612989079 -0700
@@ -53,7 +53,7 @@
--- libbonobo-2.32.1.orig/tests/Makefile.am 2010-08-29 04:56:00.000000000 -0700
+++ libbonobo-2.32.1/tests/Makefile.am 2014-04-25 15:38:22.024744384 -0700
@@ -55,7 +55,7 @@
MODELS_DIR="$(srcdir)/models"
TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \
- test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \
+ test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \
test-generic-factory.sh test-main-loop$(EXEEXT)
check_SCRIPTS = test-properties.sh test-generic-factory.sh
EXTRA_DIST=$(check_SCRIPTS) Test_Generic_Factory.server
test-main-loop$(EXEEXT)
# TESTS += test-generic-factory.sh
meta-gnome/recipes-gnome/bonobo/libbonobo_2.24.3.bb
-8
View File
@@ -1,8 +0,0 @@
require libbonobo.inc
PR = "r2"
SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \
file://do-not-use-srcdir-variable.patch \
"
SRC_URI[archive.md5sum] = "b217cef6a187505290c66c5bf8225d38"
SRC_URI[archive.sha256sum] = "5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe"
meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb
+8
View File
@@ -0,0 +1,8 @@
require libbonobo.inc
SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \
file://do-not-use-srcdir-variable.patch \
"
SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b"
SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b"
meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb → meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
+2 -5
View File
@@ -4,11 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
inherit gnomebase pkgconfig gtk-doc
PR = "r2"
SRC_URI[archive.md5sum] = "3a754b1df0a4d5fd4836a05020a0bb4a"
SRC_URI[archive.sha256sum] = "0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84"
SRC_URI[archive.md5sum] = "853be8e28aaa4ce48ba60be7d9046bf4"
SRC_URI[archive.sha256sum] = "fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd"
DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gconf libxml2 libglade"