From c8e5702127e507e82e6f68a4b8c546803accea9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Jun 2005 08:19:37 +0000 Subject: import clean BK tree at cset 1.3670 --- packages/python/python-dbus/.mtn2git_empty | 0 packages/python/python-dbus/cross.patch | 15 +++ packages/python/python-dbus/gettext.patch | 164 +++++++++++++++++++++++++++++ packages/python/python-dbus/tmpdir.patch | 30 ++++++ 4 files changed, 209 insertions(+) create mode 100644 packages/python/python-dbus/.mtn2git_empty (limited to 'packages/python/python-dbus') diff --git a/packages/python/python-dbus/.mtn2git_empty b/packages/python/python-dbus/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-dbus/cross.patch b/packages/python/python-dbus/cross.patch index e69de29bb2..6d1d9d8e7e 100644 --- a/packages/python/python-dbus/cross.patch +++ b/packages/python/python-dbus/cross.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- dbus-0.20/configure.in~cross ++++ dbus-0.20/configure.in +@@ -466,6 +466,7 @@ + exit (0); + ]])], + [have_abstract_sockets=yes], ++ [have_abstract_sockets=no], + [have_abstract_sockets=no]) + AC_LANG_POP(C) + AC_MSG_RESULT($have_abstract_sockets) diff --git a/packages/python/python-dbus/gettext.patch b/packages/python/python-dbus/gettext.patch index e69de29bb2..7042bd0903 100644 --- a/packages/python/python-dbus/gettext.patch +++ b/packages/python/python-dbus/gettext.patch @@ -0,0 +1,164 @@ +Index: dbus-0.23/configure.in +=================================================================== +--- dbus-0.23.orig/configure.in 2005-04-02 17:14:37.780040976 -0500 ++++ dbus-0.23/configure.in 2005-04-02 17:14:38.024003888 -0500 +@@ -22,6 +22,9 @@ + AC_ISC_POSIX + AC_HEADER_STDC + ++AM_GNU_GETTEXT_VERSION(0.11.5) ++AM_GNU_GETTEXT([external], [need-ngettext]) ++ + AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto) + AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto) + AC_ARG_ENABLE(gtk, [ --enable-gtk enable GTK-requiring executables],enable_gtk=$enableval,enable_gtk=auto) +Index: dbus-0.23/glib/Makefile.am +=================================================================== +--- dbus-0.23.orig/glib/Makefile.am 2004-07-29 04:00:45.000000000 -0400 ++++ dbus-0.23/glib/Makefile.am 2005-04-02 17:22:27.302662688 -0500 +@@ -15,7 +15,7 @@ + dbus-gvalue.c \ + dbus-gvalue.h + +-libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la ++libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(LIBINTL) $(top_builddir)/dbus/libdbus-1.la + ## don't export symbols that start with "_" (we use this + ## convention for internal symbols) + libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" +Index: dbus-0.23/glib/dbus-glib-tool.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-glib-tool.c 2004-08-09 23:07:00.000000000 -0400 ++++ dbus-0.23/glib/dbus-glib-tool.c 2005-04-02 17:14:38.024003888 -0500 +@@ -26,8 +26,13 @@ + #include "dbus-gparser.h" + #include "dbus-gutils.h" + #include ++ ++#ifdef HAVE_GETTEXT + #include + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + #include + #include +Index: dbus-0.23/glib/dbus-glib.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-glib.c 2004-08-09 23:07:00.000000000 -0400 ++++ dbus-0.23/glib/dbus-glib.c 2005-04-02 17:14:38.024003888 -0500 +@@ -27,8 +27,12 @@ + #include "dbus-gtest.h" + #include "dbus-gutils.h" + ++#ifdef HAVE_GETTEXT + #include + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + /** +Index: dbus-0.23/glib/dbus-gmain.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-gmain.c 2004-11-13 02:07:47.000000000 -0500 ++++ dbus-0.23/glib/dbus-gmain.c 2005-04-02 17:14:38.025003736 -0500 +@@ -27,8 +27,12 @@ + #include "dbus-gtest.h" + #include "dbus-gutils.h" + ++#ifdef HAVE_GETTEXT + #include + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + /** +Index: dbus-0.23/glib/dbus-gparser.c +=================================================================== +--- dbus-0.23.orig/glib/dbus-gparser.c 2004-08-09 23:07:00.000000000 -0400 ++++ dbus-0.23/glib/dbus-gparser.c 2005-04-02 17:14:38.025003736 -0500 +@@ -20,12 +20,18 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ ++ ++#include + #include "dbus-gparser.h" + #include "dbus-gidl.h" + #include + ++#ifdef HAVE_GETTEXT + #include + #define _(x) gettext ((x)) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + #ifndef DOXYGEN_SHOULD_SKIP_THIS +Index: dbus-0.23/tools/Makefile.am +=================================================================== +--- dbus-0.23.orig/tools/Makefile.am 2004-04-21 17:29:07.000000000 -0400 ++++ dbus-0.23/tools/Makefile.am 2005-04-02 17:22:00.712704976 -0500 +@@ -37,8 +37,8 @@ + + dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la + dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la +-dbus_launch_LDADD= $(DBUS_X_LIBS) +-dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS) ++dbus_launch_LDADD= $(DBUS_X_LIBS) $(LIBINTL) ++dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(LIBINTL) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_LIBS) + + man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 + EXTRA_DIST = $(man_MANS) +Index: dbus-0.23/tools/dbus-launch.c +=================================================================== +--- dbus-0.23.orig/tools/dbus-launch.c 2004-08-09 23:07:01.000000000 -0400 ++++ dbus-0.23/tools/dbus-launch.c 2005-04-02 17:14:38.026003584 -0500 +@@ -22,6 +22,8 @@ + */ + #include + #include ++#include ++#include + #include + #include + #include +Index: dbus-0.23/tools/dbus-tree-view.c +=================================================================== +--- dbus-0.23.orig/tools/dbus-tree-view.c 2004-08-09 23:07:01.000000000 -0400 ++++ dbus-0.23/tools/dbus-tree-view.c 2005-04-02 17:14:38.026003584 -0500 +@@ -24,8 +24,12 @@ + #include + #include "dbus-tree-view.h" + ++#ifdef HAVE_GETTEXT + #include + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + enum +Index: dbus-0.23/tools/dbus-viewer.c +=================================================================== +--- dbus-0.23.orig/tools/dbus-viewer.c 2004-08-09 23:07:01.000000000 -0400 ++++ dbus-0.23/tools/dbus-viewer.c 2005-04-02 17:14:38.027003432 -0500 +@@ -30,8 +30,12 @@ + #include + #include + ++#ifdef HAVE_GETTEXT + #include + #define _(x) dgettext (GETTEXT_PACKAGE, x) ++#else ++#define _(x) x ++#endif + #define N_(x) x + + typedef struct diff --git a/packages/python/python-dbus/tmpdir.patch b/packages/python/python-dbus/tmpdir.patch index e69de29bb2..838b903f0a 100644 --- a/packages/python/python-dbus/tmpdir.patch +++ b/packages/python/python-dbus/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" -- cgit v1.2.3