aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus/dbus-glib-0.100
diff options
context:
space:
mode:
authorAndrei Dinu <andrei.adrianx.dinu@intel.com>2013-02-26 14:25:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:14:04 +0000
commiteb43cd15cc0ceffd6b7fa14919646007d6ba99c2 (patch)
tree85fe6f4ada13233fbb4c4a824e4f065764e85274 /meta/recipes-core/dbus/dbus-glib-0.100
parent0662191f2e1ac2d686e2125f7f1bcb0f871c0edf (diff)
downloadopenembedded-core-contrib-eb43cd15cc0ceffd6b7fa14919646007d6ba99c2.tar.gz
dbus-glib : upgrade to 1.100.2
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus/dbus-glib-0.100')
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch15
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch48
3 files changed, 0 insertions, 78 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch
deleted file mode 100644
index fbb4967828..0000000000
--- a/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Disable compiling examples
-
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Kevin Tian <kevin.tian@intel.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
-+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = . examples
-+SUBDIRS = .
-
- INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch
deleted file mode 100644
index 40e3b12b5d..0000000000
--- a/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59003]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd dbus-glib-0.100/configure.ac dbus-glib-0.100/configure.ac
---- dbus-glib-0.100/configure.ac 2012-06-25 19:26:39.000000000 +0300
-+++ dbus-glib-0.100/configure.ac 2013-01-03 04:53:22.314976758 +0200
-@@ -8,7 +8,7 @@
-
- AM_INIT_AUTOMAKE([1.9])
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- # Honor aclocal flags
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch
deleted file mode 100644
index 2e8e178bb7..0000000000
--- a/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Change Makefile.am to install regression tests for test package purpose.
-
-Upstream-Status: Inappropriate [test not install is for purpose from upstream]
-
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 7ba11a8..249f0e7 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -13,7 +13,8 @@ else
- TEST_BINARIES=
- endif
-
--noinst_PROGRAMS= $(TEST_BINARIES)
-+testdir = $(datadir)/@PACKAGE@/tests
-+test_PROGRAMS= $(TEST_BINARIES)
-
- test_service_SOURCES= \
- test-service.c
-diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
-index 3cb2c39..e6de67d 100644
---- a/test/interfaces/Makefile.am
-+++ b/test/interfaces/Makefile.am
-@@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS
-
- ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
- ## build even when not doing "make check"
--noinst_PROGRAMS = test-service test-client
-+testdir = $(datadir)/@PACKAGE@/tests/interfaces
-+test_PROGRAMS = test-service test-client
-
- test_service_SOURCES = \
- test-interfaces.c \
-diff --git a/test/core/Makefile.am b/test/core/Makefile.am
-index ef6cb26..9786c3a 100644
---- a/test/core/Makefile.am
-+++ b/test/core/Makefile.am
-@@ -46,7 +46,8 @@ endif
-
- ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
- ## build even when not doing "make check"
--noinst_PROGRAMS = \
-+testdir = $(datadir)/@PACKAGE@/tests/core
-+test_PROGRAMS = \
- test-dbus-glib \
- test-service-glib \
- $(THREAD_APPS) \