[oe-commits] org.oe.dev libbonobo: upgrade broken 2.14.0 to 2.22.0, unify
xjqian commit
oe at amethyst.openembedded.net
Wed Mar 19 04:38:33 UTC 2008
libbonobo: upgrade broken 2.14.0 to 2.22.0, unify
* verifed the pthread patch is still needed to prevent configure from complaining about cross-compile
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 173acf0910a1de8997f933a70422e802d5cea267
ViewMTN: http://monotone.openembedded.org/revision/info/173acf0910a1de8997f933a70422e802d5cea267
Files:
1
packages/gnome/libbonobo_2.14.0.bb
packages/gnome/libbonobo_2.22.0.bb
packages/gnome/libbonobo.inc
packages/gnome/libbonobo_2.10.0.bb
packages/gnome/libbonobo_2.6.0.bb
packages/gnome/libbonobo_2.6.2.bb
Diffs:
#
# mt diff -r79bff7df1e9d050419ad89d4e515f264e3858e85 -r173acf0910a1de8997f933a70422e802d5cea267
#
#
#
# rename "packages/gnome/libbonobo_2.14.0.bb"
# to "packages/gnome/libbonobo_2.22.0.bb"
#
# add_file "packages/gnome/libbonobo.inc"
# content [fbc59695d521326e51e9069383e41324fedf03ce]
#
# patch "packages/gnome/libbonobo_2.10.0.bb"
# from [cbb00ee4f0220e0615ea8acadeb995a8e67c50ed]
# to [467f16599c0024401c9ee460832083e1acfa5880]
#
# patch "packages/gnome/libbonobo_2.22.0.bb"
# from [2dd9143ff9dfbf5c5449481b520e474ab1a439c0]
# to [40a63025e440a4e0b6de38861a4f5fac6165db4a]
#
# patch "packages/gnome/libbonobo_2.6.0.bb"
# from [19ddf23e802c6b56e5a7024fd0c48d92c6c90162]
# to [1f3a6c391d42ed688831aaf4e68761f7b49c0f6a]
#
# patch "packages/gnome/libbonobo_2.6.2.bb"
# from [441604d11b098305d9185cc720a421eee3a50e23]
# to [467f16599c0024401c9ee460832083e1acfa5880]
#
============================================================
--- packages/gnome/libbonobo.inc fbc59695d521326e51e9069383e41324fedf03ce
+++ packages/gnome/libbonobo.inc fbc59695d521326e51e9069383e41324fedf03ce
@@ -0,0 +1,64 @@
+DESCRIPTION = "Bonobo CORBA interfaces library"
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
+
+inherit gnome
+
+SRC_URI += "file://gtk-doc.m4 \
+ file://gtk-doc.make \
+ "
+
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
+FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \
+ ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug"
+FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
+ ${libdir}/bonobo-2.0/samples"
+
+LEAD_SONAME = "libbonobo-2.so"
+
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+ install -d m4
+ install ${WORKDIR}/gtk-doc.m4 m4/
+ install ${WORKDIR}/gtk-doc.make ./
+}
+
+ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
+ bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
+ bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
+ bonobo-activation-server-info.h bonobo-activation-version.h"
+
+BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
+ bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
+ bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
+ bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
+ bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
+ bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
+ bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \
+ bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
+ bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
+ bonobo-app-client.h bonobo-application.h"
+
+do_compile() {
+ oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
+ for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
+ install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
+ for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
+ install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
+ install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
+ install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
+ oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
+ oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
+}
+
+do_install() {
+ oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}
============================================================
--- packages/gnome/libbonobo_2.10.0.bb cbb00ee4f0220e0615ea8acadeb995a8e67c50ed
+++ packages/gnome/libbonobo_2.10.0.bb 467f16599c0024401c9ee460832083e1acfa5880
@@ -1,59 +1,3 @@
-LICENSE = "GPL"
-PR = "r1"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-${PV}.tar.bz2 \
- file://gtk-doc.m4 \
- file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+require libbonobo.inc
+PR = "r2"
-FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
-FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
- ${libdir}/bonobo-2.0/samples"
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
- install -d m4
- install ${WORKDIR}/gtk-doc.m4 m4/
- install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
- bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
- bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
- bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
- bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
- bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
- bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
- bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \
- bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
- bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
- bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
- for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
- install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
- for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
- install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
- install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
============================================================
--- packages/gnome/libbonobo_2.14.0.bb 2dd9143ff9dfbf5c5449481b520e474ab1a439c0
+++ packages/gnome/libbonobo_2.22.0.bb 40a63025e440a4e0b6de38861a4f5fac6165db4a
@@ -1,64 +1,6 @@
-LICENSE = "GPL"
-PR = "r1"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "Bonobo CORBA interfaces library"
+require libbonobo.inc
-inherit gnome
+PR = "r0"
-SRC_URI += "file://configure-gthread.patch;patch=1 \
- file://gtk-doc.m4 \
- file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+SRC_URI += "file://configure-gthread.patch;patch=1"
-FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
-FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \
- ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug"
-FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
- ${libdir}/bonobo-2.0/samples"
-
-LEAD_SONAME = "libbonobo-2.so"
-
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
- install -d m4
- install ${WORKDIR}/gtk-doc.m4 m4/
- install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
- bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
- bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
- bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
- bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
- bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
- bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
- bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \
- bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
- bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
- bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
- for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
- install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
- for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
- install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
- install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
============================================================
--- packages/gnome/libbonobo_2.6.0.bb 19ddf23e802c6b56e5a7024fd0c48d92c6c90162
+++ packages/gnome/libbonobo_2.6.0.bb 1f3a6c391d42ed688831aaf4e68761f7b49c0f6a
@@ -1,52 +1,3 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
- file://gtk-doc.m4 \
- file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+require libbonobo.inc
+PR = "r1"
-inherit autotools pkgconfig
-
-do_configure_prepend() {
- install -d m4
- install ${WORKDIR}/gtk-doc.m4 m4/
- install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
- bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
- bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
- bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
- bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
- bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
- bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
- bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \
- bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
- bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
- bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
- for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
- install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
- for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
- install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
- install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
============================================================
--- packages/gnome/libbonobo_2.6.2.bb 441604d11b098305d9185cc720a421eee3a50e23
+++ packages/gnome/libbonobo_2.6.2.bb 467f16599c0024401c9ee460832083e1acfa5880
@@ -1,59 +1,3 @@
-LICENSE = "GPL"
-PR = "r1"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
- file://gtk-doc.m4 \
- file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+require libbonobo.inc
+PR = "r2"
-FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
-FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
- ${libdir}/bonobo-2.0/samples"
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
- install -d m4
- install ${WORKDIR}/gtk-doc.m4 m4/
- install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
- bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
- bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
- bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
- bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
- bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
- bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
- bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \
- bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
- bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
- bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
- for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
- install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
- for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
- install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
- install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
- oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
- oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
- oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
More information about the Openembedded-commits
mailing list