[meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3

All of lore.kernel.org
 help / color / mirror / Atom feed

* [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3
@ 2015-05-05 19:09 Khem Raj
  2015-05-05 19:09 ` [meta-oe][PATCH 2/7] polkit-gnome: Upgrade 0.102 -> 0.105 Khem Raj
                   ` (5 more replies)
  0 siblings, 6 replies; 11+ messages in thread
From: Khem Raj @ 2015-05-05 19:09 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../gnome/libgnomeprint/bison3-support.patch       | 30 ++++++++++++++++++++++
 .../recipes-gnome/gnome/libgnomeprint_2.18.8.bb    |  5 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch

diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch
new file mode 100644
index 0000000..29d410a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch
@@ -0,0 +1,30 @@
+Index: libgnomeprint-2.18.8/libgnomeprint/grammar.y
+===================================================================
+--- libgnomeprint-2.18.8.orig/libgnomeprint/grammar.y
++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y
+@@ -99,7 +99,7 @@ gnome_print_filter_parse_prop (GnomePrin
+ }
+ 
+ static int yylex (void *lvalp);
+-static int yyerror (const char *s);
++static int yyerror (graph_t *g, const char *s);
+ %}
+ 
+ %union {
+@@ -117,6 +117,7 @@ static int yyerror (const char *s);
+ %type <p> pool
+ 
+ %pure_parser
++%parse-param { graph_t *graph }
+ 
+ %start graph
+ %%
+@@ -185,7 +186,7 @@ graph: filter {
+ %%
+ 
+ static int
+-yyerror (const char *s)
++yyerror (graph_t *g, const char *s)
+ {
+ 	return -1;
+ }
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
index 15e513a..b17062b 100644
--- a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
@@ -1,15 +1,16 @@
 LICENSE = "GPLv2"
 SECTION = "x11/gnome/libs"
 
-DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype"
+DEPENDS = "bison-native flex-native libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-inherit pkgconfig gnomebase
+inherit gnomebase
 
 SRC_URI += "file://fix.includes.patch \
             file://freetype.patch \
             file://0001-configure-use-pkgconfig-for-freetype.patch \
+            file://bison3-support.patch \
            "
 SRC_URI[archive.md5sum] = "63b05ffb5386e131487c6af30f4c56ac"
 SRC_URI[archive.sha256sum] = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 2/7] polkit-gnome: Upgrade 0.102 -> 0.105
  2015-05-05 19:09 [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3 Khem Raj
@ 2015-05-05 19:09 ` Khem Raj
  2015-05-05 19:09 ` [meta-oe][PATCH 3/7] imagemagick: Update PATCHSET to 10 Khem Raj
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2015-05-05 19:09 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch    | 12 ++++++++++++
 .../polkit/{polkit-gnome_0.102.bb => polkit-gnome_0.105.bb}  | 12 ++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
 rename meta-oe/recipes-extended/polkit/{polkit-gnome_0.102.bb => polkit-gnome_0.105.bb} (63%)

diff --git a/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch b/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
new file mode 100644
index 0000000..4b6ad75
--- /dev/null
+++ b/meta-oe/recipes-extended/polkit/files/gtk-doc-check.patch
@@ -0,0 +1,12 @@
+--- polkit-gnome-0.105/configure.ac.org	2015-05-04 22:33:03.925977953 -0700
++++ polkit-gnome-0.105/configure.ac	2015-05-04 22:33:16.862288030 -0700
+@@ -120,6 +120,9 @@
+ # Check for required packages
+ # ***************************
+ 
++# check for gtk-doc
++GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
++
+ POLKIT_AGENT_REQUIRED=0.97
+ POLKIT_GOBJECT_REQUIRED=0.97
+ GTK_REQUIRED=3.0.0
diff --git a/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
similarity index 63%
rename from meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb
rename to meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
index f5480e7..7ab69b6 100644
--- a/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-gnome_0.105.bb
@@ -7,16 +7,18 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \
                     file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795"
 
-SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \
+SRC_URI = "https://download.gnome.org/sources/polkit-gnome/${PV}/polkit-gnome-${PV}.tar.xz \
+           file://gtk-doc-check.patch \
 "
+SRC_URI[md5sum] = "50ecad37c8342fb4a52f590db7530621"
+SRC_URI[sha256sum] = "1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369"
 
-PNBLACKLIST[polkit-gnome] ?= "Fails to build, m4:configure.ac:125: recursion limit of 1024 exceeded, use -L<N> to change it"
-
-PR = "r2"
+#PNBLACKLIST[polkit-gnome] ?= "Fails to build, m4:configure.ac:125: recursion limit of 1024 exceeded, use -L<N> to change it"
 
 EXTRA_OECONF = "\
     --disable-examples \
     --disable-introspection \
+    --disable-static \
 "
 
 inherit autotools gtk-doc pkgconfig
@@ -24,5 +26,3 @@ inherit autotools gtk-doc pkgconfig
 FILES_${PN} += " ${datadir}/dbus-1 \
                  ${datadir}/PolicyKit \
 "
-SRC_URI[md5sum] = "f6b485ffd7bd605af815fd2747180481"
-SRC_URI[sha256sum] = "81caa6972e651e90ef4ac31d7ed41bc79543d46b850dbd5b14b40f8ef7107d11"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 3/7] imagemagick: Update PATCHSET to 10
  2015-05-05 19:09 [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3 Khem Raj
  2015-05-05 19:09 ` [meta-oe][PATCH 2/7] polkit-gnome: Upgrade 0.102 -> 0.105 Khem Raj
@ 2015-05-05 19:09 ` Khem Raj
  2015-05-05 19:09 ` [meta-oe][PATCH 4/7] pangomm: Use http instead of ftp for SRC_URI Khem Raj
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2015-05-05 19:09 UTC (permalink / raw)
  To: openembedded-devel

PATCHSET 9 is removed from upstream URL

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
index 1252020..accbbed 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.9.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
 # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype"
 
-PATCHSET = "9"
+PATCHSET = "10"
 SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
 "
-SRC_URI[md5sum] = "971648be6ae5f5070d98e2b6c5fb004d"
-SRC_URI[sha256sum] = "ea0c4f00019b58b290b1329e4e747972c61a00780a67b35df9228a76f26f1592"
+SRC_URI[md5sum] = "c4f70046420db9b22d9dfd1c3d179b55"
+SRC_URI[sha256sum] = "4e702c1c3b4632fde2a93af33dcd3d013a9ebfa598060aca11f06d80676ecbf4"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
 
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 4/7] pangomm: Use http instead of ftp for SRC_URI
  2015-05-05 19:09 [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3 Khem Raj
  2015-05-05 19:09 ` [meta-oe][PATCH 2/7] polkit-gnome: Upgrade 0.102 -> 0.105 Khem Raj
  2015-05-05 19:09 ` [meta-oe][PATCH 3/7] imagemagick: Update PATCHSET to 10 Khem Raj
@ 2015-05-05 19:09 ` Khem Raj
  2015-05-05 19:09 ` [meta-oe][PATCH 5/7] libsigc++: Use http instead of ftp in SRC_URI Khem Raj
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2015-05-05 19:09 UTC (permalink / raw)
  To: openembedded-devel

Fixes fetch failures

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb b/meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb
index 45218c2..00f9e36 100644
--- a/meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb
+++ b/meta-oe/recipes-graphics/pango/pangomm_2.34.0.bb
@@ -8,7 +8,7 @@ DEPENDS = "mm-common cairomm glibmm pango"
 
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz"
 SRC_URI[md5sum] = "2c702caede167323c9ed9eed2b933098"
 SRC_URI[sha256sum] = "0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41"
 
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 5/7] libsigc++: Use http instead of ftp in SRC_URI
  2015-05-05 19:09 [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3 Khem Raj
                   ` (2 preceding siblings ...)
  2015-05-05 19:09 ` [meta-oe][PATCH 4/7] pangomm: Use http instead of ftp for SRC_URI Khem Raj
@ 2015-05-05 19:09 ` Khem Raj
  2015-05-05 19:09 ` [meta-gnome][PATCH 6/7] gdm: Whitelist it Khem Raj
  2015-05-05 19:09 ` [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5 Khem Raj
  5 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2015-05-05 19:09 UTC (permalink / raw)
  To: openembedded-devel

Fixes fetch failures

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb
index b6ce5fc..546305f 100644
--- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb
+++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.2.11.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
 DEPENDS = "mm-common"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-${PV}.tar.xz"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-${PV}.tar.xz"
 SRC_URI[md5sum] = "815d0c6d61601f51bbcaeef6826606b0"
 SRC_URI[sha256sum] = "9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957"
 
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-gnome][PATCH 6/7] gdm: Whitelist it
  2015-05-05 19:09 [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3 Khem Raj
                   ` (3 preceding siblings ...)
  2015-05-05 19:09 ` [meta-oe][PATCH 5/7] libsigc++: Use http instead of ftp in SRC_URI Khem Raj
@ 2015-05-05 19:09 ` Khem Raj
  2015-05-05 19:09 ` [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5 Khem Raj
  5 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2015-05-05 19:09 UTC (permalink / raw)
  To: openembedded-devel

polkit-gnome has been fixed to build

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index fcd51ff..723eee8 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -6,8 +6,6 @@ DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolek
 
 PR = "r18"
 
-PNBLACKLIST[gdm] ?= "Depends on broken polkit-gnome"
-
 inherit gnome update-rc.d systemd useradd
 
 SRC_URI += " \
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5
  2015-05-05 19:09 [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3 Khem Raj
                   ` (4 preceding siblings ...)
  2015-05-05 19:09 ` [meta-gnome][PATCH 6/7] gdm: Whitelist it Khem Raj
@ 2015-05-05 19:09 ` Khem Raj
  2015-05-11  9:16   ` Martin Jansa
  5 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2015-05-05 19:09 UTC (permalink / raw)
  To: openembedded-devel

bluez4 is removed from oe-core
this needs runtime testing

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipes-connectivity/obex/obexd_0.48.bb                 | 4 ++--
 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 2 +-
 meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb        | 3 +--
 meta-oe/recipes-connectivity/obex/openobex_1.5.bb                  | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
index f28f77b..02b364e 100644
--- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
+++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
@@ -1,7 +1,7 @@
 SUMMARY = "OBEX Server and Client"
 # obexd was integrated into bluez5
-DEPENDS = "glib-2.0 dbus bluez4 libical"
-RCONFLICTS_${PN} = "bluez5"
+DEPENDS = "glib-2.0 dbus bluez5 libical"
+#RCONFLICTS_${PN} = "bluez5"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
index 8711b8a..ddc78e6 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 PR = "r1"
 
 SECTION = "x11/gnome"
-DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez4 gnome-keyring virtual/libx11 libxi intltool-native"
+DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez5 gnome-keyring virtual/libx11 libxi intltool-native"
 
 inherit gnomebase gtk-icon-cache
 
diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
index afe6106..8bb5374 100644
--- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
+++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX cli
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex"
-RCONFLICTS_${PN} = "bluez5"
+DEPENDS = "gtk+ bluez5 dbus-glib imagemagick openobex"
 
 SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz"
 SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d"
diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
index b07779d..f4744c0 100644
--- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
+++ b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \
 Object Exchange (OBEX) protocol."
 HOMEPAGE = "http://openobex.triq.net"
 SECTION = "libs"
-DEPENDS = "virtual/libusb0 bluez4"
+DEPENDS = "virtual/libusb0 bluez5"
 LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5
  2015-05-05 19:09 ` [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5 Khem Raj
@ 2015-05-11  9:16   ` Martin Jansa
  2015-05-11 16:06     ` Khem Raj
  0 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2015-05-11  9:16 UTC (permalink / raw)
  To: openembedded-devel

On Tue, May 05, 2015 at 12:09:11PM -0700, Khem Raj wrote:
> bluez4 is removed from oe-core
> this needs runtime testing

Please send v2 with PNBLACKLISTs removal once the runtime testing is
done.

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta-gnome/recipes-connectivity/obex/obexd_0.48.bb                 | 4 ++--
>  meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 2 +-
>  meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb        | 3 +--
>  meta-oe/recipes-connectivity/obex/openobex_1.5.bb                  | 2 +-
>  4 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
> index f28f77b..02b364e 100644
> --- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
> +++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
> @@ -1,7 +1,7 @@
>  SUMMARY = "OBEX Server and Client"
>  # obexd was integrated into bluez5
> -DEPENDS = "glib-2.0 dbus bluez4 libical"
> -RCONFLICTS_${PN} = "bluez5"
> +DEPENDS = "glib-2.0 dbus bluez5 libical"
> +#RCONFLICTS_${PN} = "bluez5"
>  
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
> diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
> index 8711b8a..ddc78e6 100644
> --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
> +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
>  PR = "r1"
>  
>  SECTION = "x11/gnome"
> -DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez4 gnome-keyring virtual/libx11 libxi intltool-native"
> +DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez5 gnome-keyring virtual/libx11 libxi intltool-native"
>  
>  inherit gnomebase gtk-icon-cache
>  
> diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
> index afe6106..8bb5374 100644
> --- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
> +++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
> @@ -2,8 +2,7 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX cli
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  
> -DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex"
> -RCONFLICTS_${PN} = "bluez5"
> +DEPENDS = "gtk+ bluez5 dbus-glib imagemagick openobex"
>  
>  SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz"
>  SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d"
> diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
> index b07779d..f4744c0 100644
> --- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
> +++ b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \
>  Object Exchange (OBEX) protocol."
>  HOMEPAGE = "http://openobex.triq.net"
>  SECTION = "libs"
> -DEPENDS = "virtual/libusb0 bluez4"
> +DEPENDS = "virtual/libusb0 bluez5"
>  LICENSE = "GPLv2 & LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
>                      file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5
  2015-05-11  9:16   ` Martin Jansa
@ 2015-05-11 16:06     ` Khem Raj
  2015-05-11 18:58       ` Martin Jansa
  0 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2015-05-11 16:06 UTC (permalink / raw)
  To: openembeded-devel

On Mon, May 11, 2015 at 2:16 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Please send v2 with PNBLACKLISTs removal once the runtime testing is
> done.

it worked ok runtime in my case. but which recipes are you referring
to wrt blacklisting


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5
  2015-05-11 16:06     ` Khem Raj
@ 2015-05-11 18:58       ` Martin Jansa
  2015-05-11 19:38         ` Khem Raj
  0 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2015-05-11 18:58 UTC (permalink / raw)
  To: openembedded-devel

On Mon, May 11, 2015 at 09:06:33AM -0700, Khem Raj wrote:
> On Mon, May 11, 2015 at 2:16 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > Please send v2 with PNBLACKLISTs removal once the runtime testing is
> > done.
> 
> it worked ok runtime in my case. but which recipes are you referring
> to wrt blacklisting

All where you changed bluez4 dependency to bluez5, see:
http://git.openembedded.org/meta-openembedded/commit/?id=73ba7cd70f75a898bf4c3f8ae38c9904fc3e4724

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5
  2015-05-11 18:58       ` Martin Jansa
@ 2015-05-11 19:38         ` Khem Raj
  0 siblings, 0 replies; 11+ messages in thread
From: Khem Raj @ 2015-05-11 19:38 UTC (permalink / raw)
  To: openembeded-devel

On Mon, May 11, 2015 at 11:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> http://git.openembedded.org/meta-openembedded/commit/?id=73ba7cd70f75a898bf4c3f8ae38c9904fc3e4724

this patch was pushed after I have submitted the changes thats why I
did not see it.


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2015-05-11 19:39 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-05 19:09 [meta-gnome][PATCH 1/7] libgnomeprint: Fix build with newer bison >= 3 Khem Raj
2015-05-05 19:09 ` [meta-oe][PATCH 2/7] polkit-gnome: Upgrade 0.102 -> 0.105 Khem Raj
2015-05-05 19:09 ` [meta-oe][PATCH 3/7] imagemagick: Update PATCHSET to 10 Khem Raj
2015-05-05 19:09 ` [meta-oe][PATCH 4/7] pangomm: Use http instead of ftp for SRC_URI Khem Raj
2015-05-05 19:09 ` [meta-oe][PATCH 5/7] libsigc++: Use http instead of ftp in SRC_URI Khem Raj
2015-05-05 19:09 ` [meta-gnome][PATCH 6/7] gdm: Whitelist it Khem Raj
2015-05-05 19:09 ` [meta-oe][meta-gnome][PATCH 7/7] obex, gnome-bluetooth: Depend on bluez5 Khem Raj
2015-05-11  9:16   ` Martin Jansa
2015-05-11 16:06     ` Khem Raj
2015-05-11 18:58       ` Martin Jansa
2015-05-11 19:38         ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.