dbus-glib: Upgrade to 0.102
Remove obsolete_automake_macros.patch, since upstream has merged it. (From OE-Core rev: 5873734b21735f9fb598c7d8e67ce8cef9ddb39c) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
89a8e1c4e1
commit
1654f385da
|
@ -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"
|
|
|
@ -13,7 +13,6 @@ DEPENDS_class-native = "glib-2.0-native dbus-native"
|
||||||
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
|
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
|
||||||
file://no-examples.patch \
|
file://no-examples.patch \
|
||||||
file://test-install-makefile.patch \
|
file://test-install-makefile.patch \
|
||||||
file://obsolete_automake_macros.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit autotools pkgconfig gettext
|
inherit autotools pkgconfig gettext
|
||||||
|
|
|
@ -3,26 +3,46 @@ Change Makefile.am to install regression tests for test package purpose.
|
||||||
Upstream-Status: Inappropriate [test not install is for purpose from upstream]
|
Upstream-Status: Inappropriate [test not install is for purpose from upstream]
|
||||||
|
|
||||||
Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
|
Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
|
||||||
|
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
||||||
|
---
|
||||||
|
test/Makefile.am | 3 ++-
|
||||||
|
test/core/Makefile.am | 3 ++-
|
||||||
|
test/interfaces/Makefile.am | 3 ++-
|
||||||
|
3 files changed, 6 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||||
index 7ba11a8..249f0e7 100644
|
index 379c8c3..6580927 100644
|
||||||
--- a/test/Makefile.am
|
--- a/test/Makefile.am
|
||||||
+++ b/test/Makefile.am
|
+++ b/test/Makefile.am
|
||||||
@@ -13,7 +13,8 @@ else
|
@@ -48,7 +48,8 @@ TESTS = \
|
||||||
TEST_BINARIES=
|
$(test_scripts) \
|
||||||
endif
|
$(NULL)
|
||||||
|
|
||||||
-noinst_PROGRAMS= $(TEST_BINARIES)
|
-noinst_PROGRAMS = \
|
||||||
+testdir = $(datadir)/@PACKAGE@/tests
|
+testdir = $(datadir)/@PACKAGE@/tests
|
||||||
+test_PROGRAMS= $(TEST_BINARIES)
|
+test_PROGRAMS = \
|
||||||
|
$(test_programs) \
|
||||||
|
$(test_related_programs) \
|
||||||
|
$(NULL)
|
||||||
|
diff --git a/test/core/Makefile.am b/test/core/Makefile.am
|
||||||
|
index e4bceb4..54b077d 100644
|
||||||
|
--- a/test/core/Makefile.am
|
||||||
|
+++ b/test/core/Makefile.am
|
||||||
|
@@ -64,7 +64,8 @@ endif
|
||||||
|
|
||||||
test_service_SOURCES= \
|
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
|
||||||
test-service.c
|
## build even when not doing "make check"
|
||||||
|
-noinst_PROGRAMS = \
|
||||||
|
+testdir = $(datadir)/@PACKAGE@/tests/core
|
||||||
|
+test_PROGRAMS = \
|
||||||
|
test-dbus-glib \
|
||||||
|
test-error-mapping \
|
||||||
|
test-service-glib \
|
||||||
diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
|
diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
|
||||||
index 3cb2c39..e6de67d 100644
|
index a94d08d..707dcac 100644
|
||||||
--- a/test/interfaces/Makefile.am
|
--- a/test/interfaces/Makefile.am
|
||||||
+++ b/test/interfaces/Makefile.am
|
+++ b/test/interfaces/Makefile.am
|
||||||
@@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS
|
@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS
|
||||||
|
|
||||||
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
|
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
|
||||||
## build even when not doing "make check"
|
## build even when not doing "make check"
|
||||||
|
@ -32,17 +52,6 @@ index 3cb2c39..e6de67d 100644
|
||||||
|
|
||||||
test_service_SOURCES = \
|
test_service_SOURCES = \
|
||||||
test-interfaces.c \
|
test-interfaces.c \
|
||||||
diff --git a/test/core/Makefile.am b/test/core/Makefile.am
|
--
|
||||||
index ef6cb26..9786c3a 100644
|
1.9.1
|
||||||
--- 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) \
|
|
|
@ -1,5 +0,0 @@
|
||||||
require dbus-glib.inc
|
|
||||||
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
|
|
||||||
SRC_URI[sha256sum] = "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
require dbus-glib.inc
|
||||||
|
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
|
||||||
|
SRC_URI[sha256sum] = "6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"
|
Loading…
Reference in New Issue