summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-02-22 19:26:37 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-14 12:15:29 +0100
commit6fbf74623b71dc8162d831dca4a5fa790d748bc6 (patch)
treea338026a7ef179e6bb9dfa5ca285705e59678ed6
parent35c6a68a85f8e96637f5323fca1d592f804cd876 (diff)
downloadmeta-openembedded-6fbf74623b71dc8162d831dca4a5fa790d748bc6.tar.gz
bluez4: use real introspection instead of legacy pygobject
Now that the real introspection is available, and legacy pygobject is not, the patch to use the latter should be removed. Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch27
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb1
2 files changed, 0 insertions, 28 deletions
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
deleted file mode 100644
index 37037f52e..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Upstream-Status: Inappropriate
2
3use legacy pygobject instead of gobject-introspection
4
5Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
6---
7diff -Nurd bluez-4.101.orig/test/simple-agent bluez-4.101/test/simple-agent
8--- bluez-4.101.orig/test/simple-agent 2013-11-13 17:14:08.138118159 +0800
9+++ bluez-4.101/test/simple-agent 2013-11-13 17:14:29.034118107 +0800
10@@ -2,7 +2,7 @@
11
12 from __future__ import absolute_import, print_function, unicode_literals
13
14-from gi.repository import GObject
15+import gobject
16
17 import sys
18 import dbus
19@@ -122,7 +122,7 @@
20 path = "/test/agent"
21 agent = Agent(bus, path)
22
23- mainloop = GObject.MainLoop()
24+ mainloop = gobject.MainLoop()
25
26 if len(args) > 1:
27 if len(args) > 2:
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
index 7719d05c7..d6d16c00f 100644
--- a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -10,7 +10,6 @@ SRC_URI += "file://bluetooth.conf \
10 file://obsolete_automake_macros.patch \ 10 file://obsolete_automake_macros.patch \
11 file://network-fix-network-Connect-method-parameters.patch \ 11 file://network-fix-network-Connect-method-parameters.patch \
12 file://install-test-script.patch \ 12 file://install-test-script.patch \
13 file://use-legacy-pygobject-instead-ofgobject-introspection.patch \
14 file://fix_encrypt_collision.patch \ 13 file://fix_encrypt_collision.patch \
15" 14"
16 15