add patch

4 files changed, 273 insertions, 1 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 02ffe6bd29a9..14bb83e92ad7 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.14 2004/09/18 22:12:17 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.15 2004/09/20 22:23:34 foser Exp $
+
+*dbus-0.22-r1 (21 Sep 2004)
+
+  21 Sep 2004; foser <foser@gentoo.org> dbus-0.22-r1.ebuild :
+  Add python bindings patch to make hal-device-manager work
+  Add inherit python for the python modules
 
   18 Sep 2004; Travis Tilley <lv@gentoo.org> dbus-0.22.ebuild:
   added a fix that gets around a lib64 sandbox bug and added ~amd64 keyword
diff --git a/sys-apps/dbus/dbus-0.22-r1.ebuild b/sys-apps/dbus/dbus-0.22-r1.ebuild
new file mode 100644
index 000000000000..ecfd707e3c2a
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.22-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.22-r1.ebuild,v 1.1 2004/09/20 22:23:34 foser Exp $
+
+# because of the experimental nature debug by default
+inherit debug eutils mono python
+
+# FIXME : fix docs
+#IUSE="X gtk qt python mono doc xml2"
+IUSE="X gtk qt python mono xml2"
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
+HOMEPAGE="http://www.freedesktop.org/software/dbus/"
+SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 | AFL-2.1"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND=">=dev-libs/glib-2
+	xml2? ( >=dev-libs/libxml2-2.6 )
+	!xml2? ( dev-libs/expat )
+	X? ( virtual/x11 )
+	qt? ( >=x11-libs/qt-3 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	python? ( >=dev-lang/python-2.2
+		>=dev-python/pyrex-0.9 )
+	mono? ( >=dev-dotnet/mono-0.95 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+#	doc? ( app-doc/doxygen
+#		app-text/xmlto )"
+
+# needs gcj, we have no neat way of knowing if it was enabled
+#	java? ( sys-devel/gcc )
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-python_int64.patch
+
+}
+
+src_compile() {
+
+	local myconf
+
+	if use xml2; then
+		myconf="--with-xml=libxml";
+	else
+		myconf="--with-xml=expat";
+	fi
+
+	econf \
+		`use_enable X x` \
+		`use_enable gtk` \
+		`use_enable qt` \
+		`use_enable python` \
+		`use_enable mono` \
+		--enable-glib \
+		--enable-verbose-mode \
+		--enable-checks \
+		--enable-asserts \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		--with-session-socket-dir=/tmp \
+		--disable-doxygen-docs \
+		--disable-xml-docs \
+		--disable-mono-docs \
+		${myconf} \
+		|| die
+
+#		`use_enable doc doxygen-docs` \
+#		`use_enable doc xml-docs` \
+
+	# do not build the mono examples, they need gtk-sharp
+	touch ${S}/mono/example/echo-{server,client}.exe
+
+	# this gets around a lib64 sandbox bug. note that this addpredict is
+	# added automatically by sandbox.c for lib.
+	addpredict /usr/lib64/python2.3/
+	addpredict /usr/lib64/python2.2/
+	addpredict /usr/lib64/python2.1/
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	# initscript
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/dbus
+
+	# needs to exist for the system socket
+	keepdir /var/lib/dbus
+
+	keepdir /usr/lib/dbus-1.0/services
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO doc/*html
+
+}
+
+pkg_preinst() {
+
+	enewgroup messagebus || die "Problem adding messagebus group"
+	enewuser messagebus -1 /bin/false /dev/null messagebus || die "Problem adding messagebus user"
+
+}
+
+pkg_postinst() {
+
+	einfo "To start the DBUS system-wide messagebus by default"
+	einfo "you should add it to the default runlevel :"
+	einfo "\`rc-update add dbus default\`"
+
+}
diff --git a/sys-apps/dbus/files/dbus-0.22-python_int64.patch b/sys-apps/dbus/files/dbus-0.22-python_int64.patch
new file mode 100644
index 000000000000..b9532d4cc683
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.22-python_int64.patch
@@ -0,0 +1,143 @@
+Index: python/dbus_bindings.pyx.in
+===================================================================
+RCS file: /cvs/dbus/dbus/python/dbus_bindings.pyx.in,v
+retrieving revision 1.14
+diff -u -p -r1.14 dbus_bindings.pyx.in
+--- python/dbus_bindings.pyx.in	28 Jul 2004 18:14:55 -0000	1.14
++++ python/dbus_bindings.pyx.in	1 Sep 2004 17:20:43 -0000
+@@ -455,6 +455,10 @@ cdef class MessageIter:
+             retval = self.get_int32()
+         elif arg_type == TYPE_UINT32:
+             retval = self.get_uint32()
++        elif arg_type == TYPE_INT64:
++            retval = self.get_int64()
++        elif arg_type == TYPE_UINT64:
++            retval = self.get_uint64()
+         elif arg_type == TYPE_DOUBLE:
+             retval = self.get_double()
+         elif arg_type == TYPE_BYTE:
+@@ -474,6 +478,10 @@ cdef class MessageIter:
+                 retval = self.get_int32_array()
+             elif array_type == TYPE_UINT32:
+                 retval = self.get_uint32_array()
++            elif array_type == TYPE_INT64:
++                retval = self.get_int64_array()
++            elif array_type == TYPE_UINT64:
++                retval = self.get_uint64_array()
+             elif array_type == TYPE_DOUBLE:
+                 retval = self.get_double_array()
+             else:
+@@ -529,6 +537,12 @@ cdef class MessageIter:
+     def get_uint32(self):
+         return dbus_message_iter_get_uint32(self.iter)
+ 
++    def get_int64(self):
++        return dbus_message_iter_get_int64(self.iter)
++
++    def get_uint64(self):
++        return dbus_message_iter_get_uint64(self.iter)
++
+     def get_double(self):
+         return dbus_message_iter_get_double(self.iter)
+ 
+@@ -574,6 +588,26 @@ cdef class MessageIter:
+             python_list.append(retval[i])
+         return python_list
+ 
++    def get_int64_array(self):
++        cdef int len
++        cdef dbus_int64_t *retval
++        cdef int i
++        dbus_message_iter_get_int64_array(self.iter, &retval, <int*>&len)
++        python_list = []
++        for i from 0 <= i < len:
++            python_list.append(retval[i])
++        return python_list
++
++    def get_uint64_array(self):
++        cdef int len
++        cdef dbus_uint64_t *retval
++        cdef int i
++        dbus_message_iter_get_uint64_array(self.iter, &retval, <int*>&len)
++        python_list = []
++        for i from 0 <= i < len:
++            python_list.append(retval[i])
++        return python_list
++
+     def get_double_array(self):
+         cdef int len
+         cdef double *retval
+@@ -615,6 +649,8 @@ cdef class MessageIter:
+             retval = self.append_boolean(value)
+         elif value_type == int:
+             retval = self.append_int32(value)
++        elif value_type == long:
++            retval = self.append_int64(value)
+         elif value_type == str:
+             retval = self.append_string(value)
+         elif value_type == float:
+@@ -631,6 +667,8 @@ cdef class MessageIter:
+                     self.append_string_array(value)
+                 elif list_type == int:
+                     self.append_int32_array(value)
++                elif list_type == long:
++                    self.append_int64_array(value)
+                 elif list_type == float:
+                     self.append_double_array(value)
+                 elif isinstance(value[0], ObjectPath):
+@@ -665,6 +703,12 @@ cdef class MessageIter:
+     def append_uint32(self, value):
+         return dbus_message_iter_append_uint32(self.iter, value)
+ 
++    def append_int64(self, value):
++        return dbus_message_iter_append_int64(self.iter, value)
++
++    def append_uint64(self, value):
++        return dbus_message_iter_append_uint64(self.iter, value)
++
+     def append_double(self, value):
+         return dbus_message_iter_append_double(self.iter, value)
+ 
+@@ -677,7 +721,8 @@ cdef class MessageIter:
+     def append_object_path(self, value):
+         return dbus_message_iter_append_object_path(self.iter, value)
+ 
+-    # FIXME: append_array, append_boolean_array, append_uint32_array
++    # FIXME: append_array, append_boolean_array, append_uint32_array, 
++    # append_uint64_array
+ 
+     def append_dict(self, python_dict):
+         cdef DBusMessageIter c_dict_iter
+@@ -720,6 +765,19 @@ cdef class MessageIter:
+             value[i] = item
+         return dbus_message_iter_append_int32_array(self.iter, value, length)
+ 
++    def append_int64_array(self, python_list):
++        cdef dbus_int64_t *value
++        cdef int length
++        cdef int i
++        length = len(python_list)
++        value = <dbus_int64_t*>malloc(length * sizeof(dbus_int64_t))
++        for i from 0 <= i < length:
++            item = python_list[i]
++            if type(item) != int:
++                raise TypeError
++            value[i] = item
++        return dbus_message_iter_append_int64_array(self.iter, value, length)
++
+     def append_double_array(self, python_list):
+         cdef double *value
+         cdef int length
+@@ -855,6 +913,12 @@ cdef class Message:
+             elif type == TYPE_UINT32:
+                 num = iter.get_uint32()
+                 arg = 'uint32:%u\n' % (num)
++            elif type == TYPE_INT64:
++                num = iter.get_int64()
++                arg = 'int64:%d\n' % (num)
++            elif type == TYPE_UINT64:
++                num = iter.get_uint64()
++                arg = 'uint64:%u\n' % (num)
+             elif type == TYPE_DOUBLE:
+                 num = iter.get_double()
+                 arg = 'double:%f\n' % (num)
diff --git a/sys-apps/dbus/files/digest-dbus-0.22-r1 b/sys-apps/dbus/files/digest-dbus-0.22-r1
new file mode 100644
index 000000000000..d2af6e21be95
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.22-r1
@@ -0,0 +1 @@
+MD5 6b1c2476ea8b82dd9fb7f29ef857cb9f dbus-0.22.tar.gz 1248780