| @@ -0,0 +1,588 @@
+Index: configure.in
+================================================================================
+--- browser/installer/unix/packages-static
++++ browser/installer/unix/packages-static
+@@ -341,6 +341,7 @@
+ ;
+ bin/components/libnkgnomevfs.so
+ bin/components/libauth.so
++bin/components/libdbusservice.so
+
+ ; [Additional Developer Tools]
+ [adt]
+--- config/autoconf.mk.in
++++ config/autoconf.mk.in
+@@ -458,6 +458,12 @@
+ MOZ_GTK2_CFLAGS = @MOZ_GTK2_CFLAGS@
+ MOZ_GTK2_LIBS = @MOZ_GTK2_LIBS@
+
++MOZ_DBUS_GLIB_CFLAGS = @MOZ_DBUS_GLIB_CFLAGS@
++MOZ_DBUS_GLIB_LIBS = @MOZ_DBUS_GLIB_LIBS@
++
++MOZ_GTHREAD_CFLAGS = @MOZ_GTHREAD_CFLAGS@
++MOZ_GTHREAD_LIBS = @MOZ_GTHREAD_LIBS@
++
+ MOZ_XLIB_CFLAGS = @MOZ_XLIB_CFLAGS@
+ MOZ_XLIB_LDFLAGS = @MOZ_XLIB_LDFLAGS@
+
+--- configure.in
++++ configure.in
+@@ -4776,6 +4776,33 @@
+ AC_SUBST(MOZ_GNOMEUI_LIBS)
+
+ dnl ========================================================
++dnl = dbus support
++dnl ========================================================
++
++if test "$MOZ_ENABLE_GTK2"
++then
++ MOZ_ARG_ENABLE_BOOL(dbus,
++ [ --enable-dbus Enable dbus support (default: disabled) ],
++ MOZ_ENABLE_DBUS=1,
++ MOZ_ENABLE_DBUS=)
++
++ if test "$MOZ_ENABLE_DBUS"
++ then
++ PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-1)
++ PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0)
++ fi
++
++ if test "$MOZ_ENABLE_DBUS"; then
++ AC_DEFINE(MOZ_ENABLE_DBUS)
++ fi
++fi
++AC_SUBST(MOZ_ENABLE_DBUS)
++AC_SUBST(MOZ_DBUS_GLIB_CFLAGS)
++AC_SUBST(MOZ_DBUS_GLIB_LIBS)
++AC_SUBST(MOZ_GTHREAD_CFLAGS)
++AC_SUBST(MOZ_GTHREAD_LIBS)
++
++dnl ========================================================
+ dnl = Setting MOZ_EXTRA_X11CONVERTERS turns on additional
+ dnl = converters in intl/uconv that are used only by X11 gfx
+ dnl = implementations. By default, it's undefined so that
+@@ -5128,6 +5155,13 @@
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
+ fi
+
++if test -z "$MOZ_ENABLE_DBUS" && test `echo "$MOZ_EXTENSIONS" | grep -c dbus` -ne 0; then
++ if test -n "$MOZ_X11"; then
++ AC_MSG_WARN([Cannot build dbus without required libraries. Removing dbus from MOZ_EXTENSIONS.])
++ fi
++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|dbus||'`
++fi
++
+ if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
+ AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
+--- extensions/dbus/Makefile.in
++++ extensions/dbus/Makefile.in
+@@ -0,0 +1,70 @@
++# ###### BEGIN LICENSE BLOCK ######
++# Version: NPL 1.1/GPL 2.0/LGPL 2.1
++#
++#
++# The contents of this file are subject to the Mozilla Public
++# License Version 1.1 (the "License"); you may not use this file
++# except in compliance with the License. You may obtain a copy of
++# the License at http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS
++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++# implied. See the License for the specific language governing
++# rights and limitations under the License.
++#
++# The Original Code is Novell code.
++#
++# The Initial Developer of the Original Code is Novell, Inc.
++#
++# Original Author: Robert O'Callahan (rocallahan@novell.com)
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the NPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the NPL, the GPL or the LGPL.
++#
++# ###### END LICENSE BLOCK ######
++
++DEPTH = ../..
++topsrcdir = @top_srcdir@
++srcdir = @srcdir@
++VPATH = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++MODULE = dbus
++LIBRARY_NAME = dbusservice
++GRE_MODULE = 1
++#EXPORT_LIBRARY = 1
++IS_COMPONENT = 1
++FORCE_SHARED_LIB = 1
++
++REQUIRES = xpcom \
++ string \
++ necko \
++ embedcomponents \
++ $(NULL)
++
++EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \
++ $(NSPR_LIBS) \
++ $(MOZ_DBUS_GLIB_LIBS) \
++ $(MOZ_GTHREAD_LIBS) \
++ $(NULL)
++
++CPPSRCS = \
++ nsDBusModule.cpp \
++ $(NULL)
++
++include $(topsrcdir)/config/rules.mk
++
++CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
++CXXFLAGS := $(subst -pedantic,,$(CXXFLAGS))
+Index: config/system-headers
+===================================================================
+RCS file: /cvsroot/mozilla/config/system-headers,v
+retrieving revision 3.4.4.3
+diff -u -r3.4.4.3 system-headers
+--- config/system-headers 18 Dec 2006 23:48:58 -0000 3.4.4.3
++++ config/system-headers 13 Nov 2007 23:04:10 -0000
+@@ -141,6 +141,9 @@
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
++dbus/dbus.h
++dbus/dbus-glib.h
++dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+ dem.h
+--- extensions/dbus/nsDBusModule.cpp.none 1970-01-01 01:00:00.000000000 +0100
++++ extensions/dbus/nsDBusModule.cpp 2008-01-15 17:09:51.000000000 +0100
+@@ -0,0 +1,418 @@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++/* vim:expandtab:shiftwidth=4:tabstop=4:
++ */
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
++ *
++ *
++ * The contents of this file are subject to the Mozilla Public
++ * License Version 1.1 (the "License"); you may not use this file
++ * except in compliance with the License. You may obtain a copy of
++ * the License at http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS
++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++ * implied. See the License for the specific language governing
++ * rights and limitations under the License.
++ *
++ * The Original Code is Novell code.
++ *
++ * The Initial Developer of the Original Code is Novell, Inc.
++ *
++ * Original Author: Robert O'Callahan (rocallahan@novell.com)
++ *
++ * Contributor(s):
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either the GNU General Public License Version 2 or later (the "GPL"), or
++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++ * in which case the provisions of the GPL or the LGPL are applicable instead
|
