New patch for gcj handling detection of jar. Use emake -j1 to let gcj compile. 2 AMD64 fixes as well

(Portage version: 2.1_pre4-r1)

4 files changed, 84 insertions, 0 deletions

diff --git a/sys-apps/dbus/files/dbus-0.60-gcj-2.patch b/sys-apps/dbus/files/dbus-0.60-gcj-2.patch
new file mode 100644
index 000000000000..2366ab138ab4
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.60-gcj-2.patch
@@ -0,0 +1,29 @@
+--- configure.in.old	2005-11-22 21:42:49.000000000 +0100
++++ configure.in	2006-01-25 13:28:47.000000000 +0100
+@@ -210,6 +210,8 @@
+ if test x$enable_gcj = xyes; then
+     if test x$have_gcj = xno ; then
+ 	AC_MSG_ERROR([Building gcj explicitly required, but gcj not found])
++    else 
++        AC_CHECK_PROGS(JAR, gcj-jar fastjar jar)
+     fi
+ fi
+ 
+@@ -1395,7 +1397,8 @@
+ if test x$enable_gcj = xyes ; then
+ echo \
+ "        gcj:            	  ${GCJ}
+-	gcjflags:	          ${GCJFLAGS}"
++	gcjflags:	          ${GCJFLAGS}
++	jar:                      ${JAR}"
+ else
+ echo \
+ "        gcj:                      (not enabled)"
+--- gcj/Makefile.am.old	2003-06-23 19:39:48.000000000 +0200
++++ gcj/Makefile.am	2006-01-25 14:36:04.000000000 +0100
+@@ -1,5 +1,4 @@
+ SUBDIRS=org
+-JAR=jar
+ 
+ CLEANFILES=dbus-1.jar
+ 
diff --git a/sys-apps/dbus/files/dbus-0.60-mono-arguments.patch b/sys-apps/dbus/files/dbus-0.60-mono-arguments.patch
new file mode 100644
index 000000000000..d5b447c74486
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.60-mono-arguments.patch
@@ -0,0 +1,38 @@
+diff -aur dbus-0.60-orig/mono/Arguments.cs dbus-0.60/mono/Arguments.cs
+--- dbus-0.60-orig/mono/Arguments.cs	2005-03-08 20:36:15.000000000 -0800
++++ dbus-0.60/mono/Arguments.cs	2006-01-28 01:41:59.000000000 -0800
+@@ -10,7 +10,7 @@
+ 	public class Arguments : IEnumerable, IDisposable
+   {
+     // Must follow sizeof(DBusMessageIter)
+-    internal const int DBusMessageIterSize = 14*4;
++    internal static readonly int DBusMessageIterSize = Marshal.SizeOf (typeof(_DBusMessageIter));
+     private static Hashtable dbusTypes = null;
+     private Message message;
+     private IntPtr appenderIter;
+@@ -240,6 +240,25 @@
+       return new ArgumentsEnumerator(this);
+     }
+ 
++    [StructLayout(LayoutKind.Sequential)]
++    private class _DBusMessageIter
++    {
++       IntPtr dummy1;
++       IntPtr dummy2;
++       int    dummy3;
++       int    dummy4;
++       int    dummy5;
++       int    dummy6;
++       int    dummy7;
++       int    dummy8;
++       int    dummy9;
++       int    dummy10;
++       int    dummy11;
++       int    pad1;
++       int    pad2;
++       IntPtr pad3;
++   }
++	    
+     private class ArgumentsEnumerator : IEnumerator
+     {
+       private Arguments arguments;
diff --git a/sys-apps/dbus/files/dbus-0.60-qdbusmarshall.patch b/sys-apps/dbus/files/dbus-0.60-qdbusmarshall.patch
new file mode 100644
index 000000000000..794ba93278eb
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.60-qdbusmarshall.patch
@@ -0,0 +1,14 @@
+--- qt/qdbusmarshall.cpp	23 Sep 2005 13:08:26 -0000	1.1
++++ qt/qdbusmarshall.cpp	19 Dec 2005 21:40:02 -0000
+@@ -69,9 +69,9 @@ static QVariant qFetchParameter(DBusMess
+     case DBUS_TYPE_BOOLEAN:
+         return qIterGet<dbus_bool_t>(it);
+     case DBUS_TYPE_INT64:
+-        return qIterGet<dbus_int64_t>(it);
++        return QVariant((qlonglong)qIterGet<dbus_int64_t>(it));
+     case DBUS_TYPE_UINT64:
+-        return qIterGet<dbus_uint64_t>(it);
++        return QVariant((qulonglong)qIterGet<dbus_uint64_t>(it));
+     case DBUS_TYPE_STRING:
+     case DBUS_TYPE_OBJECT_PATH:
+     case DBUS_TYPE_SIGNATURE:
diff --git a/sys-apps/dbus/files/digest-dbus-0.60-r4 b/sys-apps/dbus/files/digest-dbus-0.60-r4
new file mode 100644
index 000000000000..d2478aa01cd9
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.60-r4
@@ -0,0 +1,3 @@
+MD5 da9561b5e579cedddc34f53427e99a93 dbus-0.60.tar.gz 1674899
+RMD160 035e0de53c2917b6e4b53a43026191d6de39a5f7 dbus-0.60.tar.gz 1674899
+SHA256 32ff1b1c7388cd2bfd4a23d4b9f460b2265579f1e097f0d4c0261c7e00adf8a8 dbus-0.60.tar.gz 1674899