diff options
author | Koen Kooi <koen@openembedded.org> | 2006-08-09 13:11:18 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2006-08-09 13:11:18 +0000 |
commit | 52882c747b8dbbc8db5bef86c95f9456cd422699 (patch) | |
tree | c6e0431e4f5e2b8e98d6dca81d667c877ffd3e90 /packages | |
parent | 36460fdf5f4cf582543750f486fec6d96b6c8481 (diff) | |
parent | e6bc829ae2d1bf9020b1fb22e50607c13eab324e (diff) |
merge of '14667242175a1d72fe6a6278ffb941a5c170c04f'
and 'f09491a3dc7f40ea6081d29c8983a1cc97e84ad3'
Diffstat (limited to 'packages')
34 files changed, 99 insertions, 11 deletions
diff --git a/packages/dbus/dbus-0.90/.mtn2git_empty b/packages/dbus/dbus-0.90/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/dbus/dbus-0.90/.mtn2git_empty +++ /dev/null diff --git a/packages/dbus/dbus-python/.mtn2git_empty b/packages/dbus/dbus-python/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/dbus/dbus-python/.mtn2git_empty +++ /dev/null diff --git a/packages/dbus/dbus_0.20.bb b/packages/dbus/dbus_0.20.bb index 0a08862f10..6d0a777fef 100644 --- a/packages/dbus/dbus_0.20.bb +++ b/packages/dbus/dbus_0.20.bb @@ -2,6 +2,7 @@ SECTION = "base" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" LICENSE = "GPL" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ diff --git a/packages/dbus/dbus_0.21.bb b/packages/dbus/dbus_0.21.bb index abd234712f..d7b164e8cc 100644 --- a/packages/dbus/dbus_0.21.bb +++ b/packages/dbus/dbus_0.21.bb @@ -3,6 +3,7 @@ PR = "r4" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" LICENSE = "GPL" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ diff --git a/packages/dbus/dbus_0.22.bb b/packages/dbus/dbus_0.22.bb index 424c27908b..8eacbeca27 100644 --- a/packages/dbus/dbus_0.22.bb +++ b/packages/dbus/dbus_0.22.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.1-osso5.bb b/packages/dbus/dbus_0.23.1-osso5.bb index b2fc9c44ac..1cb72cb792 100644 --- a/packages/dbus/dbus_0.23.1-osso5.bb +++ b/packages/dbus/dbus_0.23.1-osso5.bb @@ -5,6 +5,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/d/${PN}/${PN}_${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb index dc3f6f2e72..6fd86ae1aa 100644 --- a/packages/dbus/dbus_0.23.4.bb +++ b/packages/dbus/dbus_0.23.4.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.23.bb b/packages/dbus/dbus_0.23.bb index c0faeec1a6..de224f307e 100644 --- a/packages/dbus/dbus_0.23.bb +++ b/packages/dbus/dbus_0.23.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" +PROVIDES = "dbus-glib" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/dbus/dbus_0.60.bb b/packages/dbus/dbus_0.60.bb index 2d9a27e74d..57a1c10242 100644 --- a/packages/dbus/dbus_0.60.bb +++ b/packages/dbus/dbus_0.60.bb @@ -2,6 +2,7 @@ require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.61.bb b/packages/dbus/dbus_0.61.bb index 2d9a27e74d..57a1c10242 100644 --- a/packages/dbus/dbus_0.61.bb +++ b/packages/dbus/dbus_0.61.bb @@ -2,6 +2,7 @@ require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/dbus/dbus_0.62.bb b/packages/dbus/dbus_0.62.bb index 2d9a27e74d..57a1c10242 100644 --- a/packages/dbus/dbus_0.62.bb +++ b/packages/dbus/dbus_0.62.bb @@ -2,6 +2,7 @@ require dbus_${PV}.inc FILESPATH = "${FILE_DIRNAME}/dbus-0.6x:${FILE_DIRNAME}/dbus" DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" +PROVIDES = "dbus-glib" SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" FILES_${PN} += "${bindir}/dbus-daemon" diff --git a/packages/devmem2/devmem2.bb b/packages/devmem2/devmem2.bb index 0ddaec5637..64de9fcbf3 100644 --- a/packages/devmem2/devmem2.bb +++ b/packages/devmem2/devmem2.bb @@ -1,4 +1,4 @@ -SRC_URI = "http://www.lart.tudelft.nl/lartware/port/devmem2.c" +SRC_URI = "http://www.abcsinc.com/small-linux/devmem2.c" LICENSE = "GPL" S = "${WORKDIR}" diff --git a/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch new file mode 100644 index 0000000000..38480c21e1 --- /dev/null +++ b/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch @@ -0,0 +1,78 @@ +--- trunk/dbus-daemon/vfs-daemon.c.orig 2006-08-09 10:43:26.000000000 +0100 ++++ trunk/dbus-daemon/vfs-daemon.c 2006-08-09 10:45:59.000000000 +0100 +@@ -91,7 +91,7 @@ + g_warning ("Failed to acquire vfs-daemon service: %s", error.message); + dbus_error_free (&error); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -101,7 +101,7 @@ + if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) { + g_printerr ("VFS daemon already running, exiting.\n"); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -111,7 +111,7 @@ + if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + g_printerr ("Not primary owner of the service, exiting.\n"); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -124,7 +124,7 @@ + NULL)) { + g_printerr ("Failed to register object with D-BUS.\n"); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + conn = NULL; + +@@ -152,7 +152,7 @@ + return; + } + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + } + +--- trunk/dbus-daemon/daemon-connection.c.orig 2006-08-09 10:43:32.000000000 +0100 ++++ trunk/dbus-daemon/daemon-connection.c 2006-08-09 10:46:26.000000000 +0100 +@@ -321,7 +321,7 @@ + d(g_print ("Last unref\n")); + + if (dbus_connection_get_is_connected (conn->conn)) { +- dbus_connection_disconnect (conn->conn); ++ dbus_connection_close (conn->conn); + } + dbus_connection_unref (conn->conn); + +--- trunk/dbus-daemon/dbus-method.c.orig 2006-08-09 10:43:38.000000000 +0100 ++++ trunk/dbus-daemon/dbus-method.c 2006-08-09 10:46:57.000000000 +0100 +@@ -220,7 +220,7 @@ + if (!dbus_connection_add_filter (dbus_conn, message_handler, + NULL, NULL)) { + g_warning ("Failed to add filter to the connection."); +- dbus_connection_disconnect (dbus_conn); ++ dbus_connection_close (dbus_conn); + dbus_connection_unref (dbus_conn); + + dbus_conn = NULL; +@@ -1666,7 +1666,7 @@ + vfs_module_shutdown (GnomeVFSMethod* method) + { + if (dbus_conn) { +- dbus_connection_disconnect (dbus_conn); ++ dbus_connection_close (dbus_conn); + dbus_connection_unref (dbus_conn); + + dbus_conn = NULL; diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb index 466d52adbe..7a48fb6ca3 100644 --- a/packages/gnome/gnome-vfs-dbus_svn.bb +++ b/packages/gnome/gnome-vfs-dbus_svn.bb @@ -18,7 +18,8 @@ SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=htt file://glib-after-nameser.patch;patch=1;pnum=1 \ file://gtk-doc.m4 \ file://gtk-doc.make \ - file://werror_compile.patch;patch=1;pnum=1" + file://werror_compile.patch;patch=1;pnum=1 \ + file://dbus-api-change.patch;patch=1" EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc" S = "${WORKDIR}/trunk" diff --git a/packages/puzzles/puzzles_r6712.bb b/packages/puzzles/puzzles_r6712.bb index fe641570e2..41a6e808ab 100644 --- a/packages/puzzles/puzzles_r6712.bb +++ b/packages/puzzles/puzzles_r6712.bb @@ -7,7 +7,7 @@ SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=6712 \ S = "${WORKDIR}/puzzles/" do_configure() { - cd ${S} && ${STAGING_BINDIR}/perl mkfiles.pl + cd ${S} && perl mkfiles.pl } do_compile_prepend = " \ diff --git a/packages/xfonts/.mtn2git_empty b/packages/xfonts/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xfonts/.mtn2git_empty +++ /dev/null diff --git a/packages/xhost/.mtn2git_empty b/packages/xhost/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xhost/.mtn2git_empty +++ /dev/null diff --git a/packages/xlibs/.mtn2git_empty b/packages/xlibs/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xlibs/.mtn2git_empty +++ /dev/null diff --git a/packages/xmodmap/.mtn2git_empty b/packages/xmodmap/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xmodmap/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc index 78146b1e78..53aa991b9f 100644 --- a/packages/xorg-app/xorg-app-common.inc +++ b/packages/xorg-app/xorg-app-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/packages/xorg-data/xorg-data-common.inc b/packages/xorg-data/xorg-data-common.inc index ade9fdec58..095bc095fc 100644 --- a/packages/xorg-data/xorg-data-common.inc +++ b/packages/xorg-data/xorg-data-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/data/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-doc/xorg-doc-common.inc b/packages/xorg-doc/xorg-doc-common.inc index 91a297265b..3be252d076 100644 --- a/packages/xorg-doc/xorg-doc-common.inc +++ b/packages/xorg-doc/xorg-doc-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/doc/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index 361914db24..6d8204b9b1 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -7,7 +7,7 @@ LICENSE = "MIT-X" DEPENDS = "randrproto xorg-server xproto" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/driver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index 38fd1af5a5..8a6bd0b475 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -7,7 +7,7 @@ DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-n RDEPENDS = "encodings font-util font-alias" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-fonts/.mtn2git_empty b/packages/xorg-fonts/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xorg-fonts/.mtn2git_empty +++ /dev/null diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index 7a3e0425c7..8e5ba5874f 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -5,7 +5,7 @@ LICENSE = "MIT-X" DEPENDS = "util-macros" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/lib/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-proto/xorg-proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc index 74e7312a50..4d189235f4 100644 --- a/packages/xorg-proto/xorg-proto-common.inc +++ b/packages/xorg-proto/xorg-proto-common.inc @@ -6,7 +6,7 @@ LICENSE = "MIT-X" #DEPENDS = "" XORG_PN = "${PN}" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.gz" +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/proto/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 6c1bbd34a9..5f5f5c0dea 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -18,7 +18,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" REPENDS="rgb" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \ +SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ file://xorg.conf" S = "${WORKDIR}/${XORG_PN}-${PV}" diff --git a/packages/xprop/.mtn2git_empty b/packages/xprop/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xprop/.mtn2git_empty +++ /dev/null diff --git a/packages/xproto/.mtn2git_empty b/packages/xproto/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xproto/.mtn2git_empty +++ /dev/null diff --git a/packages/xrandr/.mtn2git_empty b/packages/xrandr/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xrandr/.mtn2git_empty +++ /dev/null diff --git a/packages/xrdb/.mtn2git_empty b/packages/xrdb/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xrdb/.mtn2git_empty +++ /dev/null diff --git a/packages/xserver-common/.mtn2git_empty b/packages/xserver-common/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xserver-common/.mtn2git_empty +++ /dev/null diff --git a/packages/xset/.mtn2git_empty b/packages/xset/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xset/.mtn2git_empty +++ /dev/null |