1 Index: dbus-0.23/configure.in
2 ===================================================================
3 --- dbus-0.23.orig/configure.in 2005-04-02 17:14:37.780040976 -0500
4 +++ dbus-0.23/configure.in 2005-04-02 17:14:38.024003888 -0500
9 +AM_GNU_GETTEXT_VERSION(0.11.5)
10 +AM_GNU_GETTEXT([external], [need-ngettext])
12 AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto)
13 AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto)
14 AC_ARG_ENABLE(gtk, [ --enable-gtk enable GTK-requiring executables],enable_gtk=$enableval,enable_gtk=auto)
15 Index: dbus-0.23/glib/Makefile.am
16 ===================================================================
17 --- dbus-0.23.orig/glib/Makefile.am 2004-07-29 04:00:45.000000000 -0400
18 +++ dbus-0.23/glib/Makefile.am 2005-04-02 17:22:27.302662688 -0500
23 -libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
24 +libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(LIBINTL) $(top_builddir)/dbus/libdbus-1.la
25 ## don't export symbols that start with "_" (we use this
26 ## convention for internal symbols)
27 libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
28 Index: dbus-0.23/glib/dbus-glib-tool.c
29 ===================================================================
30 --- dbus-0.23.orig/glib/dbus-glib-tool.c 2004-08-09 23:07:00.000000000 -0400
31 +++ dbus-0.23/glib/dbus-glib-tool.c 2005-04-02 17:14:38.024003888 -0500
33 #include "dbus-gparser.h"
34 #include "dbus-gutils.h"
39 #define _(x) dgettext (GETTEXT_PACKAGE, x)
46 Index: dbus-0.23/glib/dbus-glib.c
47 ===================================================================
48 --- dbus-0.23.orig/glib/dbus-glib.c 2004-08-09 23:07:00.000000000 -0400
49 +++ dbus-0.23/glib/dbus-glib.c 2005-04-02 17:14:38.024003888 -0500
51 #include "dbus-gtest.h"
52 #include "dbus-gutils.h"
56 #define _(x) dgettext (GETTEXT_PACKAGE, x)
63 Index: dbus-0.23/glib/dbus-gmain.c
64 ===================================================================
65 --- dbus-0.23.orig/glib/dbus-gmain.c 2004-11-13 02:07:47.000000000 -0500
66 +++ dbus-0.23/glib/dbus-gmain.c 2005-04-02 17:14:38.025003736 -0500
68 #include "dbus-gtest.h"
69 #include "dbus-gutils.h"
73 #define _(x) dgettext (GETTEXT_PACKAGE, x)
80 Index: dbus-0.23/glib/dbus-gparser.c
81 ===================================================================
82 --- dbus-0.23.orig/glib/dbus-gparser.c 2004-08-09 23:07:00.000000000 -0400
83 +++ dbus-0.23/glib/dbus-gparser.c 2005-04-02 17:14:38.025003736 -0500
85 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
90 #include "dbus-gparser.h"
91 #include "dbus-gidl.h"
96 #define _(x) gettext ((x))
102 #ifndef DOXYGEN_SHOULD_SKIP_THIS
103 Index: dbus-0.23/tools/Makefile.am
104 ===================================================================
105 --- dbus-0.23.orig/tools/Makefile.am 2004-04-21 17:29:07.000000000 -0400
106 +++ dbus-0.23/tools/Makefile.am 2005-04-02 17:22:00.712704976 -0500
109 dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
110 dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
111 -dbus_launch_LDADD= $(DBUS_X_LIBS)
112 -dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS)
113 +dbus_launch_LDADD= $(DBUS_X_LIBS) $(LIBINTL)
114 +dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(LIBINTL) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS)
116 man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
117 EXTRA_DIST = $(man_MANS)
118 Index: dbus-0.23/tools/dbus-launch.c
119 ===================================================================
120 --- dbus-0.23.orig/tools/dbus-launch.c 2004-08-09 23:07:01.000000000 -0400
121 +++ dbus-0.23/tools/dbus-launch.c 2005-04-02 17:14:38.026003584 -0500
126 +#include <sys/time.h>
127 +#include <sys/types.h>
131 Index: dbus-0.23/tools/dbus-tree-view.c
132 ===================================================================
133 --- dbus-0.23.orig/tools/dbus-tree-view.c 2004-08-09 23:07:01.000000000 -0400
134 +++ dbus-0.23/tools/dbus-tree-view.c 2005-04-02 17:14:38.026003584 -0500
137 #include "dbus-tree-view.h"
141 #define _(x) dgettext (GETTEXT_PACKAGE, x)
148 Index: dbus-0.23/tools/dbus-viewer.c
149 ===================================================================
150 --- dbus-0.23.orig/tools/dbus-viewer.c 2004-08-09 23:07:01.000000000 -0400
151 +++ dbus-0.23/tools/dbus-viewer.c 2005-04-02 17:14:38.027003432 -0500
153 #include <glib/dbus-gparser.h>
154 #include <glib/dbus-gutils.h>
158 #define _(x) dgettext (GETTEXT_PACKAGE, x)