* libdbus-c++: added patches

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6822 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 217 insertions, 0 deletions

diff --git a/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_autogen_files.diff b/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_autogen_files.diff
new file mode 100644
index 000000000..8e952c68a
--- /dev/null
+++ b/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_autogen_files.diff
@@ -0,0 +1,147 @@
+diff -ur libdbus-c++-r9139-orig/aclocal.m4 libdbus-c++-r9139-autogen/aclocal.m4
+--- libdbus-c++-r9139-orig/aclocal.m4	2007-01-06 16:32:13.000000000 +0100
++++ libdbus-c++-r9139-autogen/aclocal.m4	2007-01-06 17:02:17.000000000 +0100
+@@ -6867,18 +6867,6 @@
+      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+ 
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 8
+-
+-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+-
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Only in libdbus-c++-r9139-autogen: autom4te.cache
+diff -ur libdbus-c++-r9139-orig/examples/echo/Makefile.in libdbus-c++-r9139-autogen/examples/echo/Makefile.in
+--- libdbus-c++-r9139-orig/examples/echo/Makefile.in	2007-01-06 16:32:15.000000000 +0100
++++ libdbus-c++-r9139-autogen/examples/echo/Makefile.in	2007-01-06 17:02:20.000000000 +0100
+@@ -48,7 +48,9 @@
+ CONFIG_CLEAN_FILES =
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_echo_server_OBJECTS = echo-server.$(OBJEXT)
+-echo_server_OBJECTS = $(am_echo_server_OBJECTS)
++nodist_echo_server_OBJECTS =
++echo_server_OBJECTS = $(am_echo_server_OBJECTS) \
++	$(nodist_echo_server_OBJECTS)
+ echo_server_DEPENDENCIES = $(top_builddir)/src/libdbus-c++-1.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/dbus-c++
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -69,7 +71,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(echo_server_SOURCES)
++SOURCES = $(echo_server_SOURCES) $(nodist_echo_server_SOURCES)
+ DIST_SOURCES = $(echo_server_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -189,7 +191,8 @@
+ xml_LIBS = @xml_LIBS@
+ EXTRA_DIST = README echo-introspect.xml
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+-echo_server_SOURCES = echo-glue.h echo-server.h echo-server.cpp
++echo_server_SOURCES = echo-server.h echo-server.cpp
++nodist_echo_server_SOURCES = echo-glue.h
+ echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la
+ BUILT_SOURCES = echo-glue.h
+ CLEANFILES = $(BUILT_SOURCES)
+@@ -355,9 +358,6 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	$(MAKE) $(AM_MAKEFLAGS) \
+-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+-	  dist-hook
+ check-am: all-am
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+@@ -443,7 +443,7 @@
+ uninstall-am: uninstall-info-am
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libtool clean-noinstPROGRAMS ctags dist-hook distclean \
++	clean-libtool clean-noinstPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-exec \
+@@ -457,9 +457,6 @@
+ 
+ echo-glue.h: echo-introspect.xml
+ 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@
+-
+-dist-hook:
+-	cd $(distdir); rm -f $(BUILT_SOURCES)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -ur libdbus-c++-r9139-orig/examples/properties/Makefile.in libdbus-c++-r9139-autogen/examples/properties/Makefile.in
+--- libdbus-c++-r9139-orig/examples/properties/Makefile.in	2007-01-06 16:32:15.000000000 +0100
++++ libdbus-c++-r9139-autogen/examples/properties/Makefile.in	2007-01-06 17:02:20.000000000 +0100
+@@ -48,7 +48,9 @@
+ CONFIG_CLEAN_FILES =
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_props_server_OBJECTS = props-server.$(OBJEXT)
+-props_server_OBJECTS = $(am_props_server_OBJECTS)
++nodist_props_server_OBJECTS =
++props_server_OBJECTS = $(am_props_server_OBJECTS) \
++	$(nodist_props_server_OBJECTS)
+ props_server_DEPENDENCIES = $(top_builddir)/src/libdbus-c++-1.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include/dbus-c++
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -69,7 +71,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(props_server_SOURCES)
++SOURCES = $(props_server_SOURCES) $(nodist_props_server_SOURCES)
+ DIST_SOURCES = $(props_server_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -189,7 +191,8 @@
+ xml_LIBS = @xml_LIBS@
+ EXTRA_DIST = README props-introspect.xml
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+-props_server_SOURCES = props-glue.h props-server.h props-server.cpp
++props_server_SOURCES = props-server.h props-server.cpp
++nodist_props_server_SOURCES = props-glue.h
+ props_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la
+ BUILT_SOURCES = props-glue.h
+ CLEANFILES = $(BUILT_SOURCES)
+@@ -355,9 +358,6 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	$(MAKE) $(AM_MAKEFLAGS) \
+-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+-	  dist-hook
+ check-am: all-am
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+@@ -443,7 +443,7 @@
+ uninstall-am: uninstall-info-am
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libtool clean-noinstPROGRAMS ctags dist-hook distclean \
++	clean-libtool clean-noinstPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-exec \
+@@ -457,9 +457,6 @@
+ 
+ props-glue.h: props-introspect.xml
+ 	$(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@
+-
+-dist-hook:
+-	cd $(distdir); rm -f $(BUILT_SOURCES)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_autogen_headerfiles.diff b/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_autogen_headerfiles.diff
new file mode 100644
index 000000000..8566546c5
--- /dev/null
+++ b/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_autogen_headerfiles.diff
@@ -0,0 +1,54 @@
+
+This patch handles the fact that generated header files shouldn't be
+distributed in a better way than before. It is now possible to run "make
+dist" directly after configure, so it is not necessary to run "make"
+before "dist".
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+Index: examples/echo/Makefile.am
+===================================================================
+--- examples/echo/Makefile.am.orig
++++ examples/echo/Makefile.am
+@@ -4,7 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ noinst_PROGRAMS = echo-server
+ 
+-echo_server_SOURCES = echo-glue.h echo-server.h echo-server.cpp
++echo_server_SOURCES = echo-server.h echo-server.cpp
++nodist_echo_server_SOURCES = echo-glue.h
+ echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la
+ 
+ echo-glue.h: echo-introspect.xml
+@@ -13,8 +14,5 @@ echo-glue.h: echo-introspect.xml
+ BUILT_SOURCES = echo-glue.h
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+-dist-hook:
+-	cd $(distdir); rm -f $(BUILT_SOURCES)
+-
+ MAINTAINERCLEANFILES = \
+ 	Makefile.in
+Index: examples/properties/Makefile.am
+===================================================================
+--- examples/properties/Makefile.am.orig
++++ examples/properties/Makefile.am
+@@ -4,7 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ noinst_PROGRAMS = props-server
+ 
+-props_server_SOURCES = props-glue.h props-server.h props-server.cpp
++props_server_SOURCES = props-server.h props-server.cpp
++nodist_props_server_SOURCES = props-glue.h
+ props_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la
+ 
+ props-glue.h: props-introspect.xml
+@@ -13,8 +14,5 @@ props-glue.h: props-introspect.xml
+ BUILT_SOURCES = props-glue.h
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+-dist-hook:
+-	cd $(distdir); rm -f $(BUILT_SOURCES)
+-
+ MAINTAINERCLEANFILES = \
+ 	Makefile.in
diff --git a/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_config_h.diff b/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_config_h.diff
new file mode 100644
index 000000000..603fdaa50
--- /dev/null
+++ b/patches/libdbus-c++-r9139/generic/libdbus-c++-r9139_config_h.diff
@@ -0,0 +1,13 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -4,7 +4,7 @@ AC_PREREQ(2.59)
+ AC_INIT([libdbus-c++], r9139, [shackan@gmail.com])
+ 
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+-AM_CONFIG_HEADER([include/dbus-c++/config.h])
++AC_CONFIG_HEADERS([include/dbus-c++/config.h])
+ 
+ AC_CANONICAL_HOST
+ 
diff --git a/patches/libdbus-c++-r9139/generic/series b/patches/libdbus-c++-r9139/generic/series
new file mode 100644
index 000000000..94e50ec21
--- /dev/null
+++ b/patches/libdbus-c++-r9139/generic/series
@@ -0,0 +1,3 @@
+libdbus-c++-r9139_config_h.diff -p0
+libdbus-c++-r9139_autogen_headerfiles.diff -p0
+libdbus-c++-r9139_autogen_files.diff