[PATCH 00/34] Initial gobject introspection support for meta-openembedded

[PATCH 00/34] Initial gobject introspection support for meta-openembedded

[Alexander Kanavin]

This patch adds gobject introspection support to recipes in meta-openembedded.
To make it work, you need to fetch the following poky branch and build against it:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/gobject-introspection-experimental

For general information about gobject introspection support in openembedded, see here:
http://lists.openembedded.org/pipermail/openembedded-core/2015-November/113390.html

NOTE to meta-oe maintainers: this patchset is meant for testing and review. It depends
on changes to oe-core that are not yet available in master branch, and therefore
it should not be merged yet.

The following changes since commit dafd61fa87c31fab97e36f71974fc097a1841c91:

  net-snmp: fix cross-compile breakage, add libnl pkgconfig option (2016-02-22 15:51:20 -0500)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib akanavin/gobject-introspection-fixes
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=akanavin/gobject-introspection-fixes

Alexander Kanavin (34):
  evolution-data-server: fix gobject introspection
  evince: update to 3.18.2
  gnome-bluetooth: update to 3.18.2
  gnome-desktop: remove pygtk dependency
  gnumeric: fix gobject introspection support
  libgdata: update to 0.16.1
  libgsf: fix gobject introspection
  libwnck: fix gobject introspection
  libxklavier: fix gobject introspection
  goffice: fix gobject introspection
  tracker: fix gobject introspection
  gupnp: fix gobject introspection
  rygel: fix gobject introspection
  media-service-demo: remove the recipe
  python-gst: remove the 0.10 recipe
  gstreamer-0.10: disable gobject introspection
  libmediaart: fix gobject introspection
  bluez4: use real introspection instead of legacy pygobject
  modemmanager: fix vala support
  networkmanager: fix introspection and vala support
  telepathy-glib: fix gobject introspection support
  libgee: fix gobject introspection support
  polkit: fix gobject introspection support
  gtkextra: fix gobject introspection support
  libunique: fix gobject introspection support
  babl: update to 0.1.16
  gegl: update to 0.3.4
  gimp: accept newer versins of babl and gegl
  omgps: remove the recipe
  poppler-data: fix do_install()
  poppler: fix gobject introspection
  udisks2: fix gobject introspection
  upower: fix gobject introspection
  python-dbusmock: use real introspection instead on legacy pygobject

 .../recipes-gnome/eds/evolution-data-server_git.bb |   6 +-
 .../evince/0001-help-remove-YELP-macro.patch       |  24 ++++
 .../evince/0001-tiff-fix-compile-warning.patch     |  33 ------
 ...ove-pkg-config-check-for-gnome-icon-theme.patch |  35 ------
 .../evince/evince/cross-compile-fix.patch          |  25 -----
 .../evince/{evince_2.32.0.bb => evince_3.18.2.bb}  |  29 ++---
 .../0001-bluetooth-input-Fix-compile-errors.patch  |  37 ------
 ...luetooth-client-use-valid-interface-names.patch | 122 --------------------
 .../0003-Fix-build-with-libnotify-0.7.0.patch      |  47 --------
 .../gnome-bluetooth/gnome-bluetooth_2.32.0.bb      |  38 -------
 .../gnome-bluetooth/gnome-bluetooth_3.18.2.bb      |  20 ++++
 .../gnome-desktop/gnome-desktop_2.32.1.bb          |   6 +-
 ...n-drop-introspection-macros-replace-them-.patch |  84 ++++++++++++++
 .../recipes-gnome/gnumeric/gnumeric_1.12.0.bb      |   5 +-
 .../{libgdata_0.7.1.bb => libgdata_0.16.1.bb}      |  21 +++-
 ...c-drop-a-copy-paste-of-introspection.m4-m.patch | 103 +++++++++++++++++
 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb  |   2 +
 meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb |   2 +-
 .../recipes-gnome/libxklavier/libxklavier_5.3.bb   |   2 -
 ...igure.ac-fix-paths-to-introspection-tools.patch |  41 +++++++
 .../recipes-support/goffice/goffice_0.10.1.bb      |   2 +
 .../recipes-support/tracker/tracker_0.14.2.bb      |   7 +-
 .../recipes-connectivity/gupnp/gssdp.inc           |  12 +-
 .../recipes-connectivity/gupnp/gupnp-av.inc        |   9 +-
 .../recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb |   4 +-
 .../recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb  |   6 +-
 .../recipes-connectivity/gupnp/gupnp.inc           |  12 +-
 .../recipes-connectivity/gupnp/no-vala.inc         |   5 -
 .../recipes-connectivity/rygel/rygel_0.28.2.bb     |   2 +-
 .../dleyna/media-service-demo_git.bb               |  18 ---
 .../gstreamer-0.10/gst-plugins.inc                 |   2 +-
 .../gstreamer-0.10/gst-rtsp_0.10.8.bb              |   2 +
 .../gstreamer-0.10/gstreamer_0.10.36.bb            |   1 +
 .../gstreamer-0.10/python-gst/python-path.patch    |  28 -----
 .../gstreamer-0.10/python-gst_0.10.22.bb           |  29 -----
 .../recipes-support/libmediaart/libmediaart.inc    |   2 +-
 ...pygobject-instead-ofgobject-introspection.patch |  27 -----
 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb |   1 -
 .../modemmanager/modemmanager_1.4.12.bb            |   2 +-
 .../networkmanager/networkmanager_1.0.10.bb        |   8 +-
 .../telepathy/telepathy-glib_0.24.0.bb             |   2 +-
 meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb   |   4 +-
 meta-oe/recipes-extended/polkit/polkit_0.113.bb    |  14 ++-
 meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb   |   4 +-
 ...-use-LIBTOOL-instead-of-hardcoded-libtool.patch |  27 +++++
 meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb |   6 +-
 .../babl/{babl_0.1.10.bb => babl_0.1.16.bb}        |   4 +-
 .../gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb}          |  22 ++--
 .../gimp/gimp/bump_Babl-GEGL_versions.patch        |  53 +++++++++
 meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb       |   1 +
 ...g_type_init-is-deprecated-for-glib-2.35.0.patch |  33 ------
 .../omgps/omgps/fix.build.with.gcc.4.9.patch       |  22 ----
 .../omgps/omgps/fix.build.with.glib.2.34.patch     | 125 ---------------------
 .../omgps/omgps/fix.capability.patch               |  62 ----------
 .../recipes-navigation/omgps/omgps/gcc-4.4.patch   |  71 ------------
 .../omgps/omgps/gdk-pixbuf-2.26.5.patch            |  15 ---
 .../omgps/omgps/sysfs.node.2.6.32.patch            |  14 ---
 .../omgps/omgps/use.unused.variable.patch          |  15 ---
 meta-oe/recipes-navigation/omgps/omgps_svn.bb      |  29 -----
 .../recipes-support/poppler/poppler-data_0.4.7.bb  |   2 +-
 meta-oe/recipes-support/poppler/poppler_0.37.0.bb  |   6 +-
 meta-oe/recipes-support/udisks/udisks2_2.1.5.bb    |   4 +-
 meta-oe/recipes-support/upower/upower_0.9.14.bb    |   4 +-
 ...-t-use-gobject-introspection-for-bindings.patch |  29 -----
 .../python/python-dbusmock_0.10.1.bb               |   1 -
 65 files changed, 484 insertions(+), 946 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
 rename meta-gnome/recipes-gnome/evince/{evince_2.32.0.bb => evince_3.18.2.bb} (60%)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0003-Fix-build-with-libnotify-0.7.0.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
 create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
 create mode 100644 meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
 rename meta-gnome/recipes-gnome/libgdata/{libgdata_0.7.1.bb => libgdata_0.16.1.bb} (43%)
 create mode 100644 meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch
 create mode 100644 meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch
 delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
 delete mode 100644 meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb
 delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
 create mode 100644 meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch
 rename meta-oe/recipes-graphics/babl/{babl_0.1.10.bb => babl_0.1.16.bb} (72%)
 rename meta-oe/recipes-graphics/gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb} (46%)
 create mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps_svn.bb
 delete mode 100644 meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch

-- 
2.7.0

[PATCH 01/34] evolution-data-server: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
index 426076f..a5664b0 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
@@ -28,7 +28,7 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-inherit autotools gtk-doc pkgconfig gettext
+inherit autotools gtk-doc pkgconfig gettext gobject-introspection
 
 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread"
@@ -42,6 +42,10 @@ do_configure_append () {
     cp ${WORKDIR}/iconv-detect.h ${S}
 }
 
+do_compile_prepend() {
+        export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
+}
+
 EXTRA_OECONF = "--without-openldap \
                 --with-libdb=${STAGING_DIR_HOST}${prefix} \
                 --disable-nntp --disable-goa --disable-weather"
-- 
2.7.0

[PATCH 02/34] evince: update to 3.18.2

[Alexander Kanavin]

This is done to enable gobject introspection support.
Drop obsolete patches.
Add a patch that disables yelp m4 macro (which we don't have).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../evince/0001-help-remove-YELP-macro.patch       | 24 +++++++++++++++
 .../evince/0001-tiff-fix-compile-warning.patch     | 33 --------------------
 ...ove-pkg-config-check-for-gnome-icon-theme.patch | 35 ----------------------
 .../evince/evince/cross-compile-fix.patch          | 25 ----------------
 .../evince/{evince_2.32.0.bb => evince_3.18.2.bb}  | 29 ++++++++++--------
 5 files changed, 40 insertions(+), 106 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
 rename meta-gnome/recipes-gnome/evince/{evince_2.32.0.bb => evince_3.18.2.bb} (60%)

diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch b/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
new file mode 100644
index 0000000..592f466
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
@@ -0,0 +1,24 @@
+From 40921037d8e7205a3889d529fb4e06f79e1e88b0 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 19 Feb 2016 16:52:18 +0200
+Subject: [PATCH] help: remove YELP macro
+
+Upstream-Status: Inappropriate [embedded-specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ help/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 7835810..37c88ce 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -1,5 +1,3 @@
+-@YELP_HELP_RULES@
+-
+ SUBDIRS = reference
+ 
+ HELP_ID = evince
+-- 
+2.7.0
+
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch b/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
deleted file mode 100644
index ebc8976..0000000
--- a/meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 00b5e55c90477eeac02bec58f032cb6916a1eb5c Mon Sep 17 00:00:00 2001
-From: Hib Eris <hib@hiberis.nl>
-Date: Mon, 20 Feb 2012 21:36:16 +0100
-Subject: [PATCH] tiff: fix compile warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- backend/tiff/tiff2ps.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/backend/tiff/tiff2ps.c b/backend/tiff/tiff2ps.c
-index c0dc0bf..fc63c2e 100644
---- a/backend/tiff/tiff2ps.c
-+++ b/backend/tiff/tiff2ps.c
-@@ -1127,8 +1127,8 @@ PS_Lvl2page(TIFF2PSContext* ctx, TIFF* tif, uint32 w, uint32 h)
- 	}
- 	buf_data = (unsigned char *)_TIFFmalloc(chunk_size);
- 	if (!buf_data) {
--		TIFFError(ctx->filename, "Can't alloc %u bytes for %s.",
--			chunk_size, tiled_image ? "tiles" : "strips");
-+		TIFFError(ctx->filename, "Can't alloc %u bytes for %s.",
-+			(uint) chunk_size, tiled_image ? "tiles" : "strips");
- 		return(FALSE);
- 	}
- 
--- 
-1.7.6.5
-
diff --git a/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch b/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch
deleted file mode 100644
index 6368a31..0000000
--- a/meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f4051f27aee7cbe88f206783461784c936d7f5db Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Tue, 15 Sep 2015 16:17:50 +0300
-Subject: [PATCH] Remove pkg-config check for gnome-icon-theme
-
-Theme is not required for building and the icons are provided by
-adwaita-icon-theme anyway
-
-Upstream-Status: Inappropriate [Current versions are fixed]
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- configure.ac | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d061c2e..7856410 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -175,13 +175,6 @@ case "$with_platform" in
-           SHELL_PLATFORM_PKGS="hildon-1 hildon-fm-2 libosso"
-           ;;
-   gnome)
--        # Evince has a rather soft run-time dependency on hicolor-icon-theme.
--        # If the hicolor theme is not available, Evince fails to display some
--        # icons. Because we cannot check for it at run-time, we instead
--        # would like to require the icon theme at compile-time. But, because
--        # the hicolor-icon-theme does not have a pkgconfig file, on gnome we
--        # require the gnome icon theme instead.
--        SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED"
-         # The totem-screensaver and egg_smclient code use x11 directly.
-         SHELL_PLATFORM_PKGS="$SHELL_PLATFORM_PKGS x11"
-         ;;
--- 
-2.1.4
-
diff --git a/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
deleted file mode 100644
index 6f5420a..0000000
--- a/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: evince-2.30.0/gnome-doc-utils.make
-===================================================================
---- evince-2.30.0.orig/gnome-doc-utils.make	2010-03-29 11:52:47.000000000 -0700
-+++ evince-2.30.0/gnome-doc-utils.make	2010-08-17 15:20:22.597646001 -0700
-@@ -132,13 +132,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
- 
- _xml2po ?= `which xml2po`
- _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
--
--_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
--_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
--_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
--_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
--_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
--_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
-+_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
-+_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
-+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
- 
- if ENABLE_SK
- _ENABLE_SK = true
-
diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb
similarity index 60%
rename from meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
rename to meta-gnome/recipes-gnome/evince/evince_3.18.2.bb
index 2d91075..3d90764 100644
--- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb
@@ -2,27 +2,24 @@ SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
 SECTION = "x11/office"
-DEPENDS = "gnome-doc-utils-native libgnome-keyring tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
+DEPENDS = "gtk+3 libsecret gnome-desktop3 poppler gstreamer1.0-plugins-base orc"
 PR = "r5"
 
 inherit gnome pkgconfig gtk-icon-cache gsettings
 
-SRC_URI += " \
-    file://cross-compile-fix.patch \
-    file://0001-tiff-fix-compile-warning.patch \
-    file://Remove-pkg-config-check-for-gnome-icon-theme.patch \
-"
+SRC_URI[archive.md5sum] = "c39af6b8b1c44d4393ef8ac9dab99c0b"
+SRC_URI[archive.sha256sum] = "42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17"
 
-SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319"
-SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"
-GNOME_COMPRESS_TYPE="bz2"
+SRC_URI += "file://0001-help-remove-YELP-macro.patch"
 
 EXTRA_OECONF = " --enable-thumbnailer \
-                 --disable-scrollkeeper \
-                 --enable-pixbuf \
-                 --disable-help \
 "
 
+do_compile_prepend() {
+        export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs"
+}
+
+
 do_install_append() {
     install -d install -d ${D}${datadir}/pixmaps
     install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/
@@ -30,12 +27,17 @@ do_install_append() {
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
+PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin,"
 
 RDEPENDS_${PN} += "glib-2.0-utils"
 RRECOMMMENDS_${PN} = "adwaita-icon-theme"
 
 PACKAGES =+ "${PN}-nautilus-extension"
-FILES_${PN} += "${datadir}/dbus-1"
+PACKAGES =+ "${PN}-browser-plugin"
+FILES_${PN} += "${datadir}/dbus-1 \
+                ${datadir}/appdata \
+                ${datadir}/thumbnailers \
+               "
 FILES_${PN}-dbg += "${libdir}/*/*/.debug \
                     ${libdir}/*/*/*/.debug"
 FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
@@ -43,3 +45,4 @@ FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
 FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \
                           ${libdir}/evince/*/backends/*.a"
 FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so"
+FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so"
-- 
2.7.0

[PATCH 03/34] gnome-bluetooth: update to 3.18.2

[Alexander Kanavin]

This also enable gobject introspection support.
Drop obsolete patches.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../0001-bluetooth-input-Fix-compile-errors.patch  |  37 -------
 ...luetooth-client-use-valid-interface-names.patch | 122 ---------------------
 .../0003-Fix-build-with-libnotify-0.7.0.patch      |  47 --------
 .../gnome-bluetooth/gnome-bluetooth_2.32.0.bb      |  38 -------
 .../gnome-bluetooth/gnome-bluetooth_3.18.2.bb      |  20 ++++
 5 files changed, 20 insertions(+), 244 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0003-Fix-build-with-libnotify-0.7.0.patch
 delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
 create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb

diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
deleted file mode 100644
index 0b0cf8b..0000000
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e3c789d6dca9a8a99b60b86e28d8119c55253c13 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 May 2013 08:37:03 -0700
-Subject: [PATCH] bluetooth-input: Fix compile errors
-
-XID is unsigned long type so %d will error out with -Wformat
-where format warnings are being treated at errors
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Unknown
----
- wizard/bluetooth-input.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/wizard/bluetooth-input.c b/wizard/bluetooth-input.c
-index b3fbdaf..d17e67c 100644
---- a/wizard/bluetooth-input.c
-+++ b/wizard/bluetooth-input.c
-@@ -190,12 +190,12 @@ bluetooth_input_check_for_devices (BluetoothInput *input)
- 		if (bluetooth_input_device_get_type (&device_info[i], &is_mouse, &is_keyboard) == FALSE)
- 			continue;
- 		if (is_mouse != FALSE) {
--			g_message ("has mouse: %s (id = %d)", device_info[i].name, device_info[i].id);
-+			g_message ("has mouse: %s (id = %lu)", device_info[i].name, device_info[i].id);
- 			has_mouse = TRUE;
- 			//break;
- 		}
- 		if (is_keyboard != FALSE) {
--			g_message ("has keyboard: %s (id = %d)", device_info[i].name, device_info[i].id);
-+			g_message ("has keyboard: %s (id = %lu)", device_info[i].name, device_info[i].id);
- 			has_keyboard = TRUE;
- 			//break;
- 		}
--- 
-1.7.9.5
-
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch
deleted file mode 100644
index 99049a0..0000000
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 1555f85b222db0d536efe277d31b57b2a8b938f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 12 Feb 2015 01:19:41 +0100
-Subject: [PATCH] bluetooth-client: use valid interface names
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate[version unmaintained upstream]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- lib/bluetooth-client.c   | 12 ++++++------
- lib/bluetooth-client.xml |  6 +++---
- lib/test-agent.c         |  2 +-
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
-index d62d56d..02e194c 100644
---- a/lib/bluetooth-client.c
-+++ b/lib/bluetooth-client.c
-@@ -721,7 +721,7 @@ static void add_device(DBusGProxy *adapter, GtkTreeIter *parent,
- 						BLUEZ_DEVICE_INTERFACE, path);
- 
- 		if (device != NULL)
--			device_get_properties(device, &hash, NULL);
-+			org_bluez_device_get_properties(device, &hash, NULL);
- 	} else
- 		device = NULL;
- 
-@@ -945,7 +945,7 @@ static void adapter_added(DBusGProxy *manager,
- 	adapter = dbus_g_proxy_new_from_proxy(manager,
- 					BLUEZ_ADAPTER_INTERFACE, path);
- 
--	adapter_get_properties(adapter, &hash, NULL);
-+	org_bluez_adapter_get_properties(adapter, &hash, NULL);
- 	if (hash != NULL) {
- 		value = g_hash_table_lookup(hash, "Address");
- 		address = value ? g_value_get_string(value) : NULL;
-@@ -1178,7 +1178,7 @@ static void bluetooth_client_init(BluetoothClient *client)
- 	dbus_g_proxy_connect_signal(priv->manager, "DefaultAdapterChanged",
- 			G_CALLBACK(default_adapter_changed), client, NULL);
- 
--	manager_list_adapters(priv->manager, &array, NULL);
-+	org_bluez_manager_list_adapters(priv->manager, &array, NULL);
- 	if (array != NULL) {
- 		int i;
- 
-@@ -1189,7 +1189,7 @@ static void bluetooth_client_init(BluetoothClient *client)
- 		}
- 	}
- 
--	manager_default_adapter(priv->manager, &default_path, NULL);
-+	org_bluez_manager_default_adapter(priv->manager, &default_path, NULL);
- 	if (default_path != NULL) {
- 		default_adapter_changed(priv->manager, default_path, client);
- 		g_free(default_path);
-@@ -1541,7 +1541,7 @@ gboolean bluetooth_client_start_discovery(BluetoothClient *client)
- 	if (adapter == NULL)
- 		return FALSE;
- 
--	adapter_start_discovery(adapter, NULL);
-+	org_bluez_adapter_start_discovery(adapter, NULL);
- 
- 	g_object_unref(adapter);
- 
-@@ -1568,7 +1568,7 @@ gboolean bluetooth_client_stop_discovery(BluetoothClient *client)
- 	if (adapter == NULL)
- 		return FALSE;
- 
--	adapter_stop_discovery(adapter, NULL);
-+	org_bluez_adapter_stop_discovery(adapter, NULL);
- 
- 	g_object_unref(adapter);
- 
-diff --git a/lib/bluetooth-client.xml b/lib/bluetooth-client.xml
-index 2326277..38c7fb0 100644
---- a/lib/bluetooth-client.xml
-+++ b/lib/bluetooth-client.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8" ?>
- 
- <node name="/">
--  <interface name="manager">
-+  <interface name="org.bluez.manager">
-     <method name="DefaultAdapter">
-       <arg type="o" direction="out"/>
-     </method>
-@@ -16,7 +16,7 @@
-     </method>
-   </interface>
- 
--  <interface name="adapter">
-+  <interface name="org.bluez.adapter">
-     <method name="GetProperties">
-       <arg type="a{sv}" direction="out"/>
-     </method>
-@@ -44,7 +44,7 @@
-     </method>
-   </interface>
- 
--  <interface name="device">
-+  <interface name="org.bluez.device">
-     <method name="GetProperties">
-       <arg type="a{sv}" direction="out"/>
-     </method>
-diff --git a/lib/test-agent.c b/lib/test-agent.c
-index 8d60da6..83464eb 100644
---- a/lib/test-agent.c
-+++ b/lib/test-agent.c
-@@ -40,7 +40,7 @@ static gboolean agent_pincode(DBusGMethodInvocation *context,
- 	GValue *value;
- 	const gchar *address, *name;
- 
--	device_get_properties(device, &hash, NULL);
-+	org_bluez_device_get_properties(device, &hash, NULL);
- 
- 	if (hash != NULL) {
- 		value = g_hash_table_lookup(hash, "Address");
--- 
-1.9.3
-
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0003-Fix-build-with-libnotify-0.7.0.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0003-Fix-build-with-libnotify-0.7.0.patch
deleted file mode 100644
index 118ef93..0000000
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0003-Fix-build-with-libnotify-0.7.0.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 08a5b66d709781c0c596108278979a11b26331d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 30 Aug 2015 12:14:53 +0200
-Subject: [PATCH] Fix build with libnotify >= 0.7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport [1]
-
-[1] https://github.com/GNOME/gnome-bluetooth/commit/9f256799cc6b8367b2466f35b82f1d07076a950e
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- applet/notify.c | 2 +-
- configure.ac    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/applet/notify.c b/applet/notify.c
-index d2a4f51..cb01dfc 100644
---- a/applet/notify.c
-+++ b/applet/notify.c
-@@ -71,7 +71,7 @@ void show_notification(const gchar *summary, const gchar *message,
- 		notify_notification_close(notify, NULL);
- 	}
- 
--	notify = notify_notification_new(summary, message, icon_name, NULL);
-+	notify = notify_notification_new(summary, message, icon_name);
- 
- 	notify_notification_set_timeout(notify, timeout);
- 
-diff --git a/configure.ac b/configure.ac
-index 8bbce4e..98ec86e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
- GTK_REQUIRED=2.19.1
- GLIB_REQUIRED=2.25.7
- DBUS_GLIB_REQUIRED=0.74
--NOTIFY_REQUIRED=0.4.3
-+NOTIFY_REQUIRED=0.7.0
- NAUTILUS_SENDTO_REQUIRED=2.31.7
- 
- dnl Requires for the properties window
--- 
-2.1.0
-
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
deleted file mode 100644
index f2128d8..0000000
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-SUMMARY = "GNOME bluetooth manager"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
-                    file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-"
-
-PR = "r1"
-
-SECTION = "x11/gnome"
-DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify libgnome-keyring virtual/libx11 libxi intltool-native"
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
-
-inherit gnomebase gtk-icon-cache
-
-SRC_URI += " \
-    file://0001-bluetooth-input-Fix-compile-errors.patch \
-    file://0002-bluetooth-client-use-valid-interface-names.patch \
-    file://0003-Fix-build-with-libnotify-0.7.0.patch \
-"
-SRC_URI[archive.md5sum] = "f129686fe46c4c98eb70a0cc85d59cae"
-SRC_URI[archive.sha256sum] = "57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973"
-GNOME_COMPRESS_TYPE="bz2"
-
-# No 'nautilus-sendto' recipe in meta-gnome yet
-EXTRA_OECONF += "--enable-nautilus-sendto=no"
-
-# No native docbook XSL stylesheets recipe in OE yet
-do_configure_prepend() {
-    sed -i s/help// ${S}/Makefile.am
-}
-
-do_configure_append() {
-    sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${HOST_SYS}-libtool
-}
-
-RRECOMMENDS_${PN} += "obexd obex-data-server"
-
-FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/"
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
new file mode 100644
index 0000000..77e9a15
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
@@ -0,0 +1,20 @@
+SUMMARY = "GNOME bluetooth manager"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
+                    file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+"
+
+SECTION = "x11/gnome"
+
+# systemd is needed because it has a necessary version of libudev
+# Effectively this means that systemd must be in DISTRO_FEATURES
+DEPENDS = "systemd gtk+3 libnotify libcanberra"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
+
+inherit gnomebase gtk-icon-cache distro_features_check
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+SRC_URI[archive.md5sum] = "75d09c924468ec0c687f9ab3acf7f113"
+SRC_URI[archive.sha256sum] = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398"
+
+FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/"
-- 
2.7.0

[PATCH 04/34] gnome-desktop: remove pygtk dependency

[Alexander Kanavin]

pygtk is no longer provided in oe-core as it's obsolete and incompatible
with pygobject 3.x

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
index 4fedbe6..703c397 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb
@@ -14,7 +14,7 @@ GNOME_COMPRESS_TYPE="bz2"
 
 DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification"
 
-EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
+EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-about"
 
 do_configure_prepend () {
     sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in
@@ -23,7 +23,3 @@ do_configure_prepend () {
 PACKAGES =+ "libgnome-desktop"
 FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop/pnp.ids"
 FILES_${PN} += "${datadir}/gnome-about"
-
-# for gnome-about
-RRECOMMENDS_${PN} += "python-pygtk python-pycairo"
-
-- 
2.7.0

[PATCH 05/34] gnumeric: fix gobject introspection support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...n-drop-introspection-macros-replace-them-.patch | 84 ++++++++++++++++++++++
 .../recipes-gnome/gnumeric/gnumeric_1.12.0.bb      |  5 +-
 2 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch

diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
new file mode 100644
index 0000000..914d2cc
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
@@ -0,0 +1,84 @@
+From de5f0a535d6ea1932d2c7de53bd33510c8682ee7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 22 Feb 2016 16:34:03 +0200
+Subject: [PATCH] configure.in: drop introspection macros, replace them with a
+ standard one
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.in | 57 +--------------------------------------------------------
+ 1 file changed, 1 insertion(+), 56 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 8e1aa37..3086503 100644
+--- a/configure.in
++++ b/configure.in
+@@ -934,63 +934,8 @@ AC_SUBST(MONO_CFLAGS)
+ AC_SUBST(MONO_LIBS)
+ ])
+ 
+-# GObject Introspection
+-GIR_REQ=1.0.0
+-AC_ARG_ENABLE(introspection,
+-          AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+-                         [Enable introspection for this build]),, 
+-                         [enable_introspection=no])
+-
+-AC_MSG_CHECKING([for gobject-introspection])
+-
+-dnl presence/version checking
+-AS_CASE([$enable_introspection],
+-[no], [
+-    found_introspection="no (disabled, use --enable-introspection to enable)"
+-],
+-[yes],[
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+-                     AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ],
+-                     found_introspection=yes,
+-                     AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+-],
+-[auto],[
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no)
+-dnl Canonicalize enable_introspection
+-enable_introspection=$found_introspection
+-],
+-[	
+-    AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+-])
++GOBJECT_INTROSPECTION_CHECK([1.46.0])
+ 
+-AC_MSG_RESULT([$found_introspection])
+-
+-INTROSPECTION_SCANNER=
+-INTROSPECTION_COMPILER=
+-INTROSPECTION_GENERATE=
+-INTROSPECTION_GIRDIR=
+-INTROSPECTION_TYPELIBDIR=
+-if test "x$found_introspection" = "xyes"; then
+-   INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+-   INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+-   INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-   INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-   INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-   INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+-   INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+-   INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+-fi
+-AC_SUBST(INTROSPECTION_SCANNER)
+-AC_SUBST(INTROSPECTION_COMPILER)
+-AC_SUBST(INTROSPECTION_GENERATE)
+-AC_SUBST(INTROSPECTION_GIRDIR)
+-AC_SUBST(INTROSPECTION_TYPELIBDIR)
+-AC_SUBST(INTROSPECTION_CFLAGS)
+-AC_SUBST(INTROSPECTION_LIBS)
+-AC_SUBST(INTROSPECTION_MAKEFILE)
+-
+-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+ dnl we need to change the install directories for distcheck
+ AC_ARG_WITH([gir-dir],
+ 	AS_HELP_STRING(
+-- 
+2.7.0
+
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
index 71f99ca..9eeb93f 100644
--- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
@@ -7,9 +7,10 @@ SUMMARY = "Gnumeric spreadsheet for GNOME"
 
 GNOME_COMPRESS_TYPE = "xz"
 
-inherit gnome
+inherit gnome pythonnative
 
-SRC_URI += "file://do-not-use-srcdir.patch"
+SRC_URI += "file://do-not-use-srcdir.patch \
+            file://0001-configure.in-drop-introspection-macros-replace-them-.patch"
 
 SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27"
 SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"
-- 
2.7.0

[PATCH 06/34] libgdata: update to 0.16.1

[Alexander Kanavin]

This fixes gobject introspection support.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../{libgdata_0.7.1.bb => libgdata_0.16.1.bb}       | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
 rename meta-gnome/recipes-gnome/libgdata/{libgdata_0.7.1.bb => libgdata_0.16.1.bb} (43%)

diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb
similarity index 43%
rename from meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
rename to meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb
index a641270..c1f1238 100644
--- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
+++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb
@@ -7,10 +7,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
                     file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \
                     file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef"
 
-DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native"
+DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib"
 
-inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc
+inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala
 
-SRC_URI[archive.md5sum] = "ec5262cbcb07b63b58d45aa3ac636096"
-SRC_URI[archive.sha256sum] = "fb244138276a5ce98510b0e2408bbf6f9ce0fd8cdcf86f07cd4be38afbb7c2bc"
-GNOME_COMPRESS_TYPE="bz2"
+do_configure_prepend_class-target () {
+    # introspection.m4 pre-packaged with upstream tarballs does not yet
+    # have our fixes
+    rm -f ${S}/introspection.m4
+}
+
+do_compile_prepend() {
+        export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs"
+}
+
+EXTRA_OECONF += "--disable-goa --disable-tests"
+
+SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d"
+SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827"
-- 
2.7.0

[PATCH 07/34] libgsf: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...c-drop-a-copy-paste-of-introspection.m4-m.patch | 103 +++++++++++++++++++++
 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb  |   2 +
 2 files changed, 105 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch

diff --git a/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch b/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch
new file mode 100644
index 0000000..bc0090e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch
@@ -0,0 +1,103 @@
+From 16d2c2e74350fda5505982fb150e72af7aee7454 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 19 Feb 2016 16:23:56 +0200
+Subject: [PATCH] configure.ac: drop a copy-paste of introspection.m4 macros
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.ac | 78 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 77 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 54f7663..3038535 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,83 +77,7 @@ libgsf_reqs="
+ "
+ 
+ PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs)
+-# GObject Introspection
+-GIR_REQ=1.0.0
+-AC_ARG_ENABLE(introspection,
+-          AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+-                         [Enable introspection for this build]),, 
+-                         [enable_introspection=no])
+-
+-AC_MSG_CHECKING([for gobject-introspection])
+-
+-dnl presence/version checking
+-AS_CASE([$enable_introspection],
+-[no], [
+-    found_introspection="no (disabled, use --enable-introspection to enable)"
+-],
+-[yes],[
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+-                     AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ],
+-                     found_introspection=yes,
+-                     AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+-],
+-[auto],[
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no)
+-dnl Canonicalize enable_introspection
+-enable_introspection=$found_introspection
+-],
+-[	
+-    AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+-])
+-
+-AC_MSG_RESULT([$found_introspection])
+-
+-if test "x$found_introspection" = "xyes"; then
+-   dnl You can override INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR
+-   dnl if you wish.  If you override the latter, you might want to set
+-   dnl GI_TYPELIB_PATH to include the same directory.  For example
+-   dnl
+-   dnl GI_TYPELIB_PATH=$PREFIX/lib64/girepository-1.0
+-   dnl INTROSPECTION_TYPELIBDIR=$GI_TYPELIB_PATH
+-   dnl INTROSPECTION_GIRDIR=$PREFIX/share/gir-1.0
+-   dnl
+-   dnl Note, that unlike binaries produced with libgsf, nothing tells
+-   dnl python where to find libgsf, so you might also need to set
+-   dnl LD_LIBRARY_PATH.
+-
+-   INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+-   INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+-   INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-   if test "x$INTROSPECTION_GIRDIR" = x; then
+-     INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-   fi
+-   if test "x$INTROSPECTION_TYPELIBDIR" = x; then
+-     INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-   fi
+-   INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+-   INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+-   INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+-else
+-   INTROSPECTION_SCANNER=
+-   INTROSPECTION_COMPILER=
+-   INTROSPECTION_GENERATE=
+-   INTROSPECTION_GIRDIR=
+-   INTROSPECTION_TYPELIBDIR=
+-   INTROSPECTION_CFLAGS=
+-   INTROSPECTION_LIBS=
+-   INTROSPECTION_MAKEFILE=
+-fi
+-AC_SUBST(INTROSPECTION_SCANNER)
+-AC_SUBST(INTROSPECTION_COMPILER)
+-AC_SUBST(INTROSPECTION_GENERATE)
+-AC_SUBST(INTROSPECTION_GIRDIR)
+-AC_SUBST(INTROSPECTION_TYPELIBDIR)
+-AC_SUBST(INTROSPECTION_CFLAGS)
+-AC_SUBST(INTROSPECTION_LIBS)
+-AC_SUBST(INTROSPECTION_MAKEFILE)
+-
+-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++GOBJECT_INTROSPECTION_CHECK([1.46.0])
+ dnl we need to change the install directories for distcheck
+ AC_ARG_WITH([gir-dir],
+ 	AS_HELP_STRING(
+-- 
+2.7.0
+
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
index d7bbd3b..eacbd37 100644
--- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
@@ -9,6 +9,8 @@ DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
 
 inherit autotools pkgconfig gnome gconf
 
+SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
+
 SRC_URI[archive.md5sum] = "3056b94bb3281dbc8311371bfc23cf72"
 SRC_URI[archive.sha256sum] = "4d8bca33424eb711acdb6a060cb488b132063d699c4fa201db24c2c89c62529c"
 
-- 
2.7.0

[PATCH 08/34] libwnck: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
index 3e5370d..f9e9615 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
 SECTION = "x11/libs"
-DEPENDS = "gobject-introspection-stub gtk+ gdk-pixbuf-native libxres"
+DEPENDS = "gtk+ gdk-pixbuf-native libxres"
 
 PACKAGECONFIG ??= "startup-notification"
 PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
-- 
2.7.0

[PATCH 09/34] libxklavier: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
index 5e1d125..e93c378 100644
--- a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
+++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb
@@ -11,8 +11,6 @@ SRC_URI[archive.md5sum] = "290ea2a8abc40f78a3a16bdae6f02808"
 SRC_URI[archive.sha256sum] = "ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404"
 
 EXTRA_OECONF = "--with-xkb-bin-base=${bindir}"
-PACKAGECONFIG ??=""
-PACKAGECONFIG[introspection] = "--enable-introspection=yes, --enable-introspection=no, libgirepository"
 
 do_configure_append() {
     find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-- 
2.7.0

[PATCH 10/34] goffice: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...igure.ac-fix-paths-to-introspection-tools.patch | 41 ++++++++++++++++++++++
 .../recipes-support/goffice/goffice_0.10.1.bb      |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch

diff --git a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch
new file mode 100644
index 0000000..a645978
--- /dev/null
+++ b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch
@@ -0,0 +1,41 @@
+From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 19 Feb 2016 16:04:24 +0200
+Subject: [PATCH] configure.ac: fix paths to introspection tools
+
+They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR
+
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6d2b747..3b28463 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then
+    dnl python where to find libgoffice, so you might also need to set
+    dnl LD_LIBRARY_PATH.
+ 
+-   INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+-   INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+-   INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++   INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++   INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++   INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+    if test "x$INTROSPECTION_GIRDIR" = x; then
+      INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+    fi
+@@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then
+    fi
+    INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+    INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+-   INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++   INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+ else
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+-- 
+2.7.0
+
diff --git a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
index 1e9ec4c..7408aff 100644
--- a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
+++ b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb
@@ -9,6 +9,8 @@ inherit gnomebase pkgconfig perlnative
 
 GNOME_COMPRESS_TYPE = "xz"
 
+SRC_URI += "file://0001-configure.ac-fix-paths-to-introspection-tools.patch"
+
 SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727"
 SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0"
 
-- 
2.7.0

[PATCH 11/34] tracker: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-gnome/recipes-support/tracker/tracker_0.14.2.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
index d84978d..840db4e 100644
--- a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
+++ b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
@@ -12,7 +12,6 @@ inherit autotools pkgconfig gnomebase gettext gsettings systemd
 
 VER_DIR = "${@gnome_verdir("${PV}")}"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \
-           file://0005-Fix-missing-gobject-introspection-checks.patch \
            file://enable-sqlite-crosscompile.patch \
 	   file://fix-removable-media-detection.patch \
            file://90tracker \
@@ -35,6 +34,10 @@ EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \
 
 LEAD_SONAME = "libtrackerclient.so.0"
 
+do_compile_prepend() {
+        export GIR_EXTRA_LIBS_PATH="${B}/src/libtracker-sparql-backend/.libs:${B}/src/libtracker-data/.libs:${B}/src/libtracker-common/.libs"
+}
+
 do_install_append() {
     cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true
 #   install -d ${D}/${sysconfdir}/X11/Xsession.d/
@@ -54,6 +57,7 @@ PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"
 FILES_${PN} += "${datadir}/dbus-1/ \
                 ${libdir}/tracker-${VER_DIR}/*.so.* \
                 ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \
+                ${libdir}/tracker-${VER_DIR}/writeback-modules/*.so \
                 ${datadir}/icons/hicolor/*/apps/tracker.* \
                 ${libdir}/nautilus/extensions-2.0/*.la \
                 ${datadir}/glib-2.0/schemas/* \
@@ -64,7 +68,6 @@ FILES_${PN} += "${datadir}/dbus-1/ \
 
 FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \
                     ${libdir}/tracker-${VER_DIR}/*.so \
-                    ${libdir}/tracker-${VER_DIR}/*/*.so \
                     ${libdir}/tracker-${VER_DIR}/*/*.la \
                     ${libdir}/tracker-${VER_DIR}/extract-modules/*.la"
 
-- 
2.7.0

[PATCH 12/34] gupnp: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-multimedia/recipes-connectivity/gupnp/gssdp.inc         | 12 +++++++-----
 meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc      |  9 +++++++--
 .../recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb           |  4 +---
 .../recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb            |  6 +++---
 meta-multimedia/recipes-connectivity/gupnp/gupnp.inc         | 12 +++++++-----
 meta-multimedia/recipes-connectivity/gupnp/no-vala.inc       |  5 -----
 6 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/no-vala.inc

diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
index ae965b9..5a4939c 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
+++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
@@ -2,13 +2,15 @@ SUMMARY = "Resource discovery and announcement over SSDP"
 DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)."
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-DEPENDS = "glib-2.0 libsoup-2.4 gobject-introspection-stub"
+DEPENDS = "glib-2.0 libsoup-2.4"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gobject-introspection vala
 
-require no-vala.inc
-
-EXTRA_OECONF = "--disable-introspection"
+# Copy vapigen.m4 so that it doesn't get removed by vala class
+# (normally this would be the right thing to do, but in gssdp the vapigen.m4 has only a custom macro)
+do_configure_prepend() {
+        cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true
+}
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}"
 PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+"
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc
index b076155..0544501 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc
@@ -3,6 +3,11 @@ DESCRIPTION = "GUPnP-AV is a collection of helpers for building AV (audio/video)
 LICENSE = "LGPLv2"
 DEPENDS = "gupnp"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gobject-introspection vala
+
+# Copy vapigen.m4 so that it doesn't get removed by vala class
+# (normally this would be the right thing to do, but in gupnp-av the vapigen.m4 has only a custom macro)
+do_configure_prepend() {
+        cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true
+}
 
-require no-vala.inc
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb
index 17ec52f..053604e 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb
@@ -9,9 +9,7 @@ SRC_URI = "http://download.gnome.org/sources/${BPN}/0.9/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "f93665e535a512e4d515a86311435cb6"
 SRC_URI[sha256sum] = "69969713f36c0e815fbbbcfdfb3ad9bd447cfd10d0fd86227d82dfd8edb6c807"
 
-inherit autotools pkgconfig
-
-require no-vala.inc
+inherit autotools pkgconfig gobject-introspection vala
 
 PACKAGECONFIG ?= "gstreamer"
 PACKAGECONFIG[gstreamer] = "--enable-gstreamer-metadata-backend,--disable-gstreamer-metadata-backend,gstreamer1.0 gstreamer1.0-plugins-base"
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb
index 667f7ef..0cc4a3a 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb
@@ -3,12 +3,12 @@ LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80"
 
-DEPENDS = "glib-2.0 gupnp gobject-introspection-stub-native sqlite3"
+DEPENDS = "glib-2.0 gupnp sqlite3"
 
 SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "f881323304185c02634034e3bda714ba"
 SRC_URI[sha256sum] = "73b6a98a0f13b29b34c3bfc07f99f78b1319211cb95a8585752873af2b9067d3"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-doc gobject-introspection
 
-EXTRA_OECONF = "--disable-introspection --disable-python"
+EXTRA_OECONF = "--disable-python"
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
index 28e9b35..6ce9631 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
@@ -2,13 +2,15 @@ SUMMARY = "UPnP framework"
 DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for creating UPnP  devices and control points, written in C using GObject and libsoup. The GUPnP API is intended to be easy to use, efficient and flexible. It provides the same set of features as libupnp, but shields the developer from most of UPnP's internals."
 LICENSE = "LGPLv2+"
 
-DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gobject-introspection-stub"
+DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2"
 
-require no-vala.inc
+inherit autotools pkgconfig vala gobject-introspection
 
-EXTRA_OECONF = "--disable-introspection"
-
-inherit autotools pkgconfig
+# Copy vapigen.m4 so that it doesn't get removed by vala class
+# (normally this would be the right thing to do, but in gupnp the vapigen.m4 has only a custom macro)
+do_configure_prepend() {
+        cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true
+}
 
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
diff --git a/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc b/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
deleted file mode 100644
index 5a45cd1..0000000
--- a/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-do_configure_prepend () {
-    # Vala needs gobject-introspection so won't work. Instead of depending
-    # on vala-native just to run configure, comment out the Vala macro.
-    sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac
-}
-- 
2.7.0

[PATCH 13/34] rygel: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb
index 663f55e..733b51e 100644
--- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb
+++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb
@@ -19,7 +19,7 @@ SRC_URI[archive.sha256sum] = "9ea23df7186caac5f1aad3137edf6d507d339b9a469fc3133d
 
 inherit gnomebase vala
 
-EXTRA_OECONF = "--disable-introspection --disable-tracker-plugin --with-media-engine=gstreamer"
+EXTRA_OECONF = "--disable-tracker-plugin --with-media-engine=gstreamer"
 
 PACKAGECONFIG ?= "external mpris mediathek ruih media-export gst-launch gtk+3"
 PACKAGECONFIG[external] = "--enable-external-plugin,--disable-external-plugin"
-- 
2.7.0

[PATCH 14/34] media-service-demo: remove the recipe

[Alexander Kanavin]

It hasn't been updated in years, and depends on pygtk,
which is obsolete and incompatible with pygobject 3.x
(and so is no longer provided).

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../dleyna/media-service-demo_git.bb                   | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb

diff --git a/meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb b/meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb
deleted file mode 100644
index f7457fd..0000000
--- a/meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "demonstration UI for dleyna"
-HOMEPAGE = "https://01.org/dleyna/"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
-                    file://src/media-service-demo.py;beginline=3;endline=21;md5=2faa3862e32422b3c38a1501539aa8b4"
-
-SRCREV = "f4440e104f0d13e454234184c2c6eba982725baf"
-PV = "0.0+git${SRCPV}"
-
-SRC_URI = "git://github.com/01org/media-service-demo.git"
-
-S = "${WORKDIR}/git"
-
-inherit distutils
-
-RDEPENDS_${PN} = "media-service-upnp python-dbus python-gst python-pygtk \
-                  python-crypt python-netclient python-dateutil"
-- 
2.7.0

[PATCH 15/34] python-gst: remove the 0.10 recipe

[Alexander Kanavin]

It depends on pygobject 2.x which has been update to 3.x in oe-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../gstreamer-0.10/python-gst/python-path.patch    | 28 ---------------------
 .../gstreamer-0.10/python-gst_0.10.22.bb           | 29 ----------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch
 delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb

diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch
deleted file mode 100644
index 21b5bbf..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status:Pending
-
-Index: gst-python-0.10.19/acinclude.m4
-===================================================================
---- gst-python-0.10.19.orig/acinclude.m4	2010-04-21 15:23:44.000000000 -0700
-+++ gst-python-0.10.19/acinclude.m4	2010-11-15 14:43:00.642994001 -0800
-@@ -43,6 +43,13 @@
- [AC_REQUIRE([AM_PATH_PYTHON])
- AC_MSG_CHECKING(for headers required to compile python extensions)
- dnl deduce PYTHON_INCLUDES
-+
-+AC_ARG_WITH(python-includes,
-+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
-+if test x$py_exec_prefix != x; then
-+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+py_prefix="${py_exec_prefix}"
-+else
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- if $PYTHON-config --help 2>/dev/null; then
-@@ -53,6 +60,7 @@
-     PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-   fi
- fi
-+fi
- AC_SUBST(PYTHON_INCLUDES)
- dnl check if the headers exist:
- save_CPPFLAGS="$CPPFLAGS"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb
deleted file mode 100644
index 2a5f2b3..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Python bindings for the GStreamer multimedia framework"
-SECTION = "devel/python"
-LICENSE = "LGPLv2.1"
-DEPENDS = "gstreamer gst-plugins-base python-pygobject"
-RDEPENDS_${PN} += "python-pygtk"
-PR = "r2"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
-           file://python-path.patch"
-
-SRC_URI[md5sum] = "937152fe896241f827689f4b53e79b22"
-SRC_URI[sha256sum] = "8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178"
-S = "${WORKDIR}/gst-python-${PV}"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=39ff67e932b7bdfa9b78bad67151690b"
-
-inherit autotools distutils-base pkgconfig
-
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
-FILES_${PN} += "${datadir}/gst-python"
-FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
-FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/ ${libdir}/gstreamer-0.10/.debug/"
-
-do_configure_prepend() {
-	if [ `find ${STAGING_LIBDIR} -name libpython*.so` ]; then
-		ln -sf ${STAGING_LIBDIR}/libpython*.so `find ${STAGING_LIBDIR} -name libpython*.a -exec dirname {} \;`
-	fi
-}
-- 
2.7.0

[PATCH 16/34] gstreamer-0.10: disable gobject introspection

[Alexander Kanavin]

Making it work would require significant patching - if you need it,
update your stack to gstreamer 1.x

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc      | 2 +-
 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb   | 2 ++
 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
index 123df42..dec6920 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
+++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
@@ -9,7 +9,7 @@ inherit autotools pkgconfig
 SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
 
 GSTREAMER_DEBUG ?= "--disable-debug"
-EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples "
+EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples --disable-introspection"
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
index 9318656..b78bcaf 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
@@ -9,6 +9,8 @@ SRC_URI[sha256sum] = "9915887cf8515bda87462c69738646afb715b597613edc7340477ccab6
 
 DEPENDS = "gst-plugins-base gstreamer"
 
+EXTRA_OECONF = "--disable-introspection"
+
 # Configure always checks for Python so inherit pythonnative. Better solution
 # would be to disable the checks entirely.
 inherit autotools pythonnative gettext
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
index 5b30603..3444511 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
@@ -28,6 +28,7 @@ EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \
             --disable-dependency-tracking --disable-check \
             --disable-examples --disable-tests \
             --disable-valgrind ${GSTREAMER_DEBUG} \
+            --disable-introspection \
             "
 
 CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no"
-- 
2.7.0

[PATCH 17/34] libmediaart: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-multimedia/recipes-support/libmediaart/libmediaart.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
index a117e9b..80c590c 100644
--- a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
+++ b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
@@ -11,4 +11,4 @@ GNOME_COMPRESS_TYPE = "xz"
 
 inherit gnomebase gtk-doc
 
-EXTRA_OECONF = "--disable-introspection --disable-qt --enable-gdkpixbuf"
+EXTRA_OECONF = "--disable-qt --enable-gdkpixbuf"
-- 
2.7.0

[PATCH 18/34] bluez4: use real introspection instead of legacy pygobject

[Alexander Kanavin]

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>
---
 ...pygobject-instead-ofgobject-introspection.patch | 27 ----------------------
 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch

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 37037f5..0000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate
-
-use legacy pygobject instead of gobject-introspection
-
-Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
----
-diff -Nurd bluez-4.101.orig/test/simple-agent bluez-4.101/test/simple-agent
---- bluez-4.101.orig/test/simple-agent	2013-11-13 17:14:08.138118159 +0800
-+++ bluez-4.101/test/simple-agent	2013-11-13 17:14:29.034118107 +0800
-@@ -2,7 +2,7 @@
- 
- from __future__ import absolute_import, print_function, unicode_literals
- 
--from gi.repository import GObject
-+import gobject
- 
- import sys
- import dbus
-@@ -122,7 +122,7 @@
- 	path = "/test/agent"
- 	agent = Agent(bus, path)
- 
--	mainloop = GObject.MainLoop()
-+	mainloop = gobject.MainLoop()
- 
- 	if len(args) > 1:
- 		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 7719d05..d6d16c0 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 \
             file://obsolete_automake_macros.patch \
             file://network-fix-network-Connect-method-parameters.patch \
             file://install-test-script.patch \
-            file://use-legacy-pygobject-instead-ofgobject-introspection.patch \
             file://fix_encrypt_collision.patch \
 "
 
-- 
2.7.0

[PATCH 19/34] modemmanager: fix vala support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb
index f251270..b855b44 100644
--- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb
+++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit gnomebase gettext systemd
+inherit gnomebase gettext systemd vala
 
 DEPENDS = "glib-2.0 libgudev dbus-glib"
 
-- 
2.7.0

[PATCH 20/34] networkmanager: fix introspection and vala support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../recipes-connectivity/networkmanager/networkmanager_1.0.10.bb  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
index 34e13cc..34548a0 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \
 "
 
-DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt"
+DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt polkit"
 
-inherit gnomebase gettext systemd bluetooth bash-completion
+inherit gnomebase gettext systemd bluetooth bash-completion vala
 
 SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
@@ -35,6 +35,10 @@ EXTRA_OECONF = " \
     --with-nmtui=yes \
 "
 
+do_compile_prepend() {
+        export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs"
+}
+
 PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \
-- 
2.7.0

[PATCH 21/34] telepathy-glib: fix gobject introspection support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb
index e6938f1..01c6e37 100644
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb
+++ b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa02
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext gobject-introspection
 
 FILES_${PN} += "${datadir}/telepathy \
                 ${datadir}/dbus-1"
-- 
2.7.0

[PATCH 22/34] libgee: fix gobject introspection support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb b/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb
index 0a2a052..bf9705c 100644
--- a/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb
+++ b/meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libgee is a collection library providing GObject-based interfaces
 and classes for commonly used data structures."
 HOMEPAGE = "http://live.gnome.org/Libgee"
 SECTION = "libs"
-DEPENDS = "glib-2.0 gobject-introspection-stub"
+DEPENDS = "glib-2.0"
 
 BBCLASSEXTEND = "native"
 LICENSE = "LGPLv2.1"
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 PE = "1"
 
-inherit autotools vala pkgconfig
+inherit autotools vala pkgconfig gobject-introspection
 do_configure_prepend() {
     MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
     for i in ${MACROS}; do
-- 
2.7.0

[PATCH 23/34] polkit: fix gobject introspection support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-extended/polkit/polkit_0.113.bb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb
index 8a613ef..aab4f54 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.113.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
                     file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4"
 
-DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub mozjs"
+DEPENDS = "expat glib-2.0 intltool-native mozjs"
 
-inherit autotools gtk-doc pkgconfig useradd systemd
+inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection
 
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
                  ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
@@ -25,18 +25,20 @@ SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.
 SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf"
 SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81"
 
-EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection"
+EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages"
+
+do_compile_prepend () {
+	export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs"
+}
 
 PACKAGES =+ "${PN}-examples"
 
-FILES_${PN} += " \
+FILES_${PN}_append = " \
     ${libdir}/${BPN}-1 \
     ${nonarch_libdir}/${BPN}-1 \
     ${datadir}/dbus-1 \
     ${datadir}/${BPN}-1 \
 "
-FILES_${PN}-dbg += "${libdir}/${BPN}-1/.debug \
-                    ${nonarch_libdir}/${BPN}-1/.debug"
 
 FILES_${PN}-examples = "${bindir}/*example*"
 
-- 
2.7.0

[PATCH 24/34] gtkextra: fix gobject introspection support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb b/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb
index 8ce6e94..926eff7 100644
--- a/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb
+++ b/meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb
@@ -11,9 +11,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gtkextra/${BP}.tar.gz \
 SRC_URI[md5sum] = "486cea93666020f85f101ed8341baf41"
 SRC_URI[sha256sum] = "9cab6c5d6b792eb828d17cec2b9c1baba2ef57f789a290464afab80b53969e65"
 
-DEPENDS = "gtk+ gobject-introspection-stub"
+DEPENDS = "gtk+"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gobject-introspection
 
 # | ./.libs/libgtkextra-x11-3.0.so: error: undefined reference to 'roundint'
 PNBLACKLIST[gtkextra] ?= "BROKEN: Fails to build with gcc-5"
-- 
2.7.0

[PATCH 25/34] libunique: fix gobject introspection support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...-use-LIBTOOL-instead-of-hardcoded-libtool.patch | 27 ++++++++++++++++++++++
 meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch

diff --git a/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch
new file mode 100644
index 0000000..2b5eda0
--- /dev/null
+++ b/meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch
@@ -0,0 +1,27 @@
+From f39bcd5af79aa3efe2cecb2212793c5b596890a8 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 18 Feb 2016 17:40:45 +0200
+Subject: [PATCH] Makefile.am: use $(LIBTOOL) instead of hardcoded libtool name
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ unique/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unique/Makefile.am b/unique/Makefile.am
+index 6475a87..734f431 100644
+--- a/unique/Makefile.am
++++ b/unique/Makefile.am
+@@ -114,7 +114,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la
+ 		--include=GObject-2.0 \
+ 		--include=Gtk-2.0 \
+ 		--library=libunique-1.0.la \
+-		--libtool="$(top_builddir)/libtool" \
++		--libtool="$(LIBTOOL)" \
+ 		--pkg gobject-2.0 \
+ 		--pkg gtk+-2.0 \
+ 		--output $@ \
+-- 
+2.7.0
+
diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb
index d97d1d6..3d13e5a 100644
--- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb
+++ b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb
@@ -6,7 +6,9 @@ BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique"
 SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \
 	file://fix_for_compile_with_gcc-4.6.0.patch \
 	file://noconst.patch \
-        file://build.patch"
+        file://build.patch \
+        file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \
+        "
 
 SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d"
 SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
@@ -22,4 +24,4 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gobject-introspection
-- 
2.7.0

[PATCH 26/34] babl: update to 0.1.16

[Alexander Kanavin]

This fixes gobject introspection support.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-graphics/babl/{babl_0.1.10.bb => babl_0.1.16.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/babl/{babl_0.1.10.bb => babl_0.1.16.bb} (72%)

diff --git a/meta-oe/recipes-graphics/babl/babl_0.1.10.bb b/meta-oe/recipes-graphics/babl/babl_0.1.16.bb
similarity index 72%
rename from meta-oe/recipes-graphics/babl/babl_0.1.10.bb
rename to meta-oe/recipes-graphics/babl/babl_0.1.16.bb
index 4892021..daea052 100644
--- a/meta-oe/recipes-graphics/babl/babl_0.1.10.bb
+++ b/meta-oe/recipes-graphics/babl/babl_0.1.16.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 inherit gnomebase
 
 SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.1/${BP}.tar.bz2"
-SRC_URI[md5sum] = "9e1542ab5c0b12ea3af076a9a2f02d79"
-SRC_URI[sha256sum] = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"
+SRC_URI[md5sum] = "a1c72e5f5d55a8b736ef2fa67ddb86ec"
+SRC_URI[sha256sum] = "7d6ba55ec53ee6f6bf6945beec28839d09ff72376f4d83035eb379cd4f3e980e"
 
 FILES_${PN} += "${libdir}/babl-*/*.so"
 FILES_${PN}-dev += "${libdir}/babl-*/*.la"
-- 
2.7.0

[PATCH 27/34] gegl: update to 0.3.4

[Alexander Kanavin]

This fixes gobject introspection support.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb}          | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-graphics/gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb} (46%)

diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb b/meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb
similarity index 46%
rename from meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
rename to meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb
index bd2e5d4..64599d3 100644
--- a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
+++ b/meta-oe/recipes-graphics/gegl/gegl_0.3.4.bb
@@ -1,24 +1,28 @@
 SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework"
 LICENSE = "LGPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl"
+DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl json-glib"
 
-inherit gnome
+EXTRA_OECONF = "--disable-docs"
 
-EXTRA_OECONF = "--disable-docs "
+inherit gnomebase vala
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper"
 PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav"
+PACKAGECONFIG[lcms] = "--with-lcms,--without-lcms,lcms"
+PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff"
+PACKAGECONFIG[webp] = "--with-webp,--without-webp,webp"
 
-SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.2/${BP}.tar.bz2 \
+SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.3/${BP}.tar.bz2 \
            file://pkgconfig.patch "
-SRC_URI[md5sum] = "32b00002f1f1e316115c4ed922e1dec8"
-SRC_URI[sha256sum] = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"
+SRC_URI[md5sum] = "c19478321594d715a4cb324a0decda6f"
+SRC_URI[sha256sum] = "846290a790854d1e6b7c17a2d6f82ad7cb14c72e240bd3b81b98cc0ceddbc3ec"
 
-FILES_${PN} += "${libdir}/gegl-*/*.so"
-FILES_${PN}-dev += "${libdir}/gegl-*/*.la"
-FILES_${PN}-dbg += "${libdir}/gegl-*/.debug"
+# There are a couple of non-symlink .so files installed into libdir, which need to go into main package
+FILES_${PN}_append = " ${libdir}/gegl-0.3/*.so ${libdir}/gegl-0.3/*.json ${libdir}/libgegl-npd-0.3.so ${libdir}/libgegl-sc-0.3.so"
+FILES_${PN}-dev_append = " ${libdir}/gegl-0.3/*.la ${libdir}/libgegl-0.3.so"
+FILES_${PN}-dev_remove = "${libdir}/lib*.so"
 
 # Fails to build with thumb-1 (qemuarm)
 # gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process':
-- 
2.7.0

[PATCH 28/34] gimp: accept newer versins of babl and gegl

[Alexander Kanavin]

Add a patch that makes gimp accept new versions of babl and gegl,
taken from Debian.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 .../gimp/gimp/bump_Babl-GEGL_versions.patch        | 53 ++++++++++++++++++++++
 meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb       |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch

diff --git a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
new file mode 100644
index 0000000..b71bf32
--- /dev/null
+++ b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
@@ -0,0 +1,53 @@
+Bump acceptable versions of babl and gegl.
+
+Patch is taken from debian:
+https://packages.debian.org/stretch/gimp
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+diff --git a/app/sanity.c b/app/sanity.c
+index febddfb..85fea55 100644
+--- a/app/sanity.c
++++ b/app/sanity.c
+@@ -351,7 +351,7 @@ sanity_check_babl (void)
+ 
+ #define BABL_REQUIRED_MAJOR 0
+ #define BABL_REQUIRED_MINOR 1
+-#define BABL_REQUIRED_MICRO 10
++#define BABL_REQUIRED_MICRO 12
+ 
+   babl_get_version (&babl_major_version,
+                     &babl_minor_version,
+@@ -388,7 +388,7 @@ sanity_check_gegl (void)
+   gint gegl_micro_version;
+ 
+ #define GEGL_REQUIRED_MAJOR 0
+-#define GEGL_REQUIRED_MINOR 2
++#define GEGL_REQUIRED_MINOR 3
+ #define GEGL_REQUIRED_MICRO 0
+ 
+   gegl_get_version (&gegl_major_version,
+diff --git a/configure.ac b/configure.ac
+index 26812b6..4252fe9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,8 +40,8 @@ m4_define([gimp_stable],
+ m4_define([gimp_full_name], [GNU Image Manipulation Program])
+ 
+ # required versions of other packages
+-m4_define([babl_required_version], [0.1.10])
+-m4_define([gegl_required_version], [0.2.0])
++m4_define([babl_required_version], [0.1.12])
++m4_define([gegl_required_version], [0.3.0])
+ m4_define([glib_required_version], [2.30.2])
+ m4_define([atk_required_version], [2.2.0])
+ m4_define([gtk_required_version], [2.24.10])
+@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
+ ###############################
+ 
+ PKG_CHECK_MODULES(BABL, babl >= babl_required_version)
+-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version)
++PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
+ PKG_CHECK_MODULES(ATK, atk >= atk_required_version)
+ 
+ AM_PATH_GLIB_2_0(glib_required_version, :,
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
index 1522fd6..a647911 100644
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
+++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
@@ -12,6 +12,7 @@ inherit gnome gtk-doc
 SRC_URI = " \
     http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \
     file://0001-configure-ac-do-not-check-for-freetype-config.patch \
+    file://bump_Babl-GEGL_versions.patch \
 "
 SRC_URI[md5sum] = "233c948203383fa078434cc3f8f925cb"
 SRC_URI[sha256sum] = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d"
-- 
2.7.0

[PATCH 29/34] omgps: remove the recipe

[Alexander Kanavin]

The project is dead upstream, and relies on pygobject 2.x which has been replaced
by 3.x in oe.core.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...g_type_init-is-deprecated-for-glib-2.35.0.patch |  33 ------
 .../omgps/omgps/fix.build.with.gcc.4.9.patch       |  22 ----
 .../omgps/omgps/fix.build.with.glib.2.34.patch     | 125 ---------------------
 .../omgps/omgps/fix.capability.patch               |  62 ----------
 .../recipes-navigation/omgps/omgps/gcc-4.4.patch   |  71 ------------
 .../omgps/omgps/gdk-pixbuf-2.26.5.patch            |  15 ---
 .../omgps/omgps/sysfs.node.2.6.32.patch            |  14 ---
 .../omgps/omgps/use.unused.variable.patch          |  15 ---
 meta-oe/recipes-navigation/omgps/omgps_svn.bb      |  29 -----
 9 files changed, 386 deletions(-)
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
 delete mode 100644 meta-oe/recipes-navigation/omgps/omgps_svn.bb

diff --git a/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch b/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
deleted file mode 100644
index 6b9f465..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 22bcf06637d64e40af6c152e28b31eef41e3f583 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 13 Jun 2013 02:35:22 -0700
-Subject: [PATCH] g_type_init() is deprecated for glib >= 2.35.0
-
-Call it for old versions.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- src/main.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index e984da4..a63ddf3 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -486,9 +486,9 @@ int main(int argc, char **argv)
- 		if (strcmp(argv[1], "-log2file") == 0)
- 			log2console = FALSE;
- 	}
--
-+#if !GLIB_CHECK_VERSION(2,35,0)
- 	g_type_init();
--
-+#endif
- 	gdk_threads_init();
- 
- 	gdk_threads_enter();
--- 
-1.7.9.5
-
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch
deleted file mode 100644
index 1680bc0..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-omgps: omgps fails compilation due to uninitialized variables
-
-omgps does not compile with gcc 4.9 due to uninitialized variables 
-with the option -Werror=maybe-uninitialized
-To solve the problem, just initiated the variable and checked for side
-effects.
-Upstream-Status: Submitted
-+https://code.google.com/p/omgps/issues/detail?id=16
-
-Signed-off-by: Raphael Silva <rapphil@gmail.com>
-diff -urpN omgps.orig/src/sound.c omgps/src/sound.c
---- omgps.orig/src/sound.c	2014-12-14 15:13:29.609243994 -0200
-+++ omgps/src/sound.c	2014-12-14 15:14:13.831116745 -0200
-@@ -44,7 +44,7 @@ static gboolean play_sound_files(char *f
- 		return FALSE;
- 
- 	char *bak = strdup(files);
--	char *saveptr;
-+	char *saveptr = NULL;
- 	char *p = strtok_r(bak, ";", &saveptr);
- 
- 	#define MAX_SOUND_FILES 14
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
deleted file mode 100644
index ec3bde0..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Upstream-Status: Submitted
-https://code.google.com/p/omgps/issues/detail?id=15
-
-diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c
---- omgps.orig/src/dbus_intf.c	2011-12-12 12:22:47.000000000 +0100
-+++ omgps/src/dbus_intf.c	2012-11-14 14:44:45.435381443 +0100
-@@ -171,7 +171,7 @@
- 	gpsdata->svinfo_valid = TRUE;
- 
- 	int i, j;
--	GValueArray *val;
-+	GArray *val;
- 	svinfo_channel_t *sv;
- 
- 	j = 0;
-@@ -179,16 +179,16 @@
- 		val = satellites->pdata[i];
- 
- 		sv = &gpsdata->sv_channels[j];
--		sv->sv_id = g_value_get_uint(g_value_array_get_nth(val, 0));
-+		sv->sv_id = g_array_index(val, guint, 0);
- 
--		if (g_value_get_boolean(g_value_array_get_nth(val, 1))) {
-+		if (g_array_index(val, gboolean, 1)) {
- 			++gpsdata->sv_in_use;
- 			sv->flags = 0x01;
- 		}
- 
--		sv->elevation = (int)g_value_get_uint(g_value_array_get_nth(val, 2));
--		sv->azimuth = (int)g_value_get_uint(g_value_array_get_nth(val, 3));
--		sv->cno = g_value_get_uint(g_value_array_get_nth(val, 4));
-+		sv->elevation = (int)g_array_index(val, guint, 2);
-+		sv->azimuth = (int)g_array_index(val, guint, 3);
-+		sv->cno = g_array_index(val, guint, 4);
- 		if (sv->cno > 0)
- 			++gpsdata->sv_get_signal;
- 
-diff -uNr omgps.orig/src/main.c omgps/src/main.c
---- omgps.orig/src/main.c	2011-12-12 12:22:47.000000000 +0100
-+++ omgps/src/main.c	2012-11-14 14:46:00.345402222 +0100
-@@ -489,9 +489,6 @@
- 
- 	g_type_init();
- 
--	if (! g_thread_supported ())
--		g_thread_init(NULL);
--
- 	gdk_threads_init();
- 
- 	gdk_threads_enter();
-diff -uNr omgps.orig/src/tab_gpscfg.c omgps/src/tab_gpscfg.c
---- omgps.orig/src/tab_gpscfg.c	2011-12-12 12:22:47.000000000 +0100
-+++ omgps/src/tab_gpscfg.c	2012-11-14 15:23:47.526925258 +0100
-@@ -222,7 +222,7 @@
- 
- static gboolean change_platform_model_cmd(void *model_id)
- {
--	U1 model = (U1)(int) model_id;
-+	U1 model = (U1)GPOINTER_TO_INT(model_id);
- 	int gps_dev_fd = 0;
- 
- 	/* non ubx means: we need open serial port
-@@ -269,7 +269,7 @@
- static void change_platmodel_button_clicked(GtkWidget *widget, gpointer data)
- {
- 	int idx = gtk_combo_box_get_active(GTK_COMBO_BOX(platmodel_list));
--	char *model_id = (void *)(int)platmodel_values[idx];
-+	void *model_id = (void *)GINT_TO_POINTER(platmodel_values[idx]);
- 
- 	if (POLL_ENGINE_TEST(UBX)) {
- 		gtk_widget_set_sensitive(change_platmodel_button, FALSE);
-diff -uNr omgps.orig/src/tab_menu.c omgps/src/tab_menu.c
---- omgps.orig/src/tab_menu.c	2011-12-12 12:22:47.000000000 +0100
-+++ omgps/src/tab_menu.c	2012-11-14 15:25:08.217941513 +0100
-@@ -65,7 +65,7 @@
- 
- static void poll_button_clicked(GtkWidget *widget, gpointer data)
- {
--	gboolean is_start_bt = (gboolean)data;
-+	gboolean is_start_bt = (gboolean) GPOINTER_TO_INT(data);
- 
- 	if (POLL_STATE_TEST(RUNNING) == is_start_bt)
- 		return;
-diff -uNr omgps.orig/src/tab_tile.c omgps/src/tab_tile.c
---- omgps.orig/src/tab_tile.c	2011-12-12 12:22:47.000000000 +0100
-+++ omgps/src/tab_tile.c	2012-11-14 15:25:30.392945800 +0100
-@@ -101,7 +101,7 @@
- static gboolean set_bg_map(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
- {
- 	map_repo_t *repo;
--	gboolean clear = (gboolean)data;
-+	gboolean clear = (gboolean)GPOINTER_TO_INT(data);
- 
- 	int type;
- 
-@@ -240,7 +240,7 @@
- 
- static void alpha_radio_toggled (GtkWidget *widget, gpointer user_data)
- {
--	int idx = (int)user_data;
-+	int idx = (int)GPOINTER_TO_INT(user_data);
- 
- 	if (g_view.bg_alpha_idx == idx)
- 		return;
-@@ -384,7 +384,7 @@
- 
- 	for (i=0; i<ALPHA_LEVELS; i++) {
- 		g_signal_connect (G_OBJECT (alpha_radios[i]), "toggled",
--			G_CALLBACK (alpha_radio_toggled), (gpointer)i);
-+			G_CALLBACK (alpha_radio_toggled), GINT_TO_POINTER(i));
- 		gtk_container_add(GTK_CONTAINER (alpha_hbox), alpha_radios[i]);
- 	}
- 
-diff -uNr omgps.orig/src/tab_view.c omgps/src/tab_view.c
---- omgps.orig/src/tab_view.c	2011-12-12 12:22:47.000000000 +0100
-+++ omgps/src/tab_view.c	2012-11-14 15:25:47.018949453 +0100
-@@ -534,7 +534,7 @@
- 
- static void* change_zoom_routine(void *args)
- {
--	gboolean is_zoom_in = (gboolean)args;
-+	gboolean is_zoom_in = (gboolean)GPOINTER_TO_INT(args);
- 	stop = FALSE;
- 
- 	int hi = (is_zoom_in)?
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
deleted file mode 100644
index 3ed86d8..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Upstream-Status: Submitted
-https://code.google.com/p/omgps/issues/detail?id=15
-
-we need to include config.h first to know if HAVE_SYS_CAPABILITY_H is enabled or no, otherwise
-sys/capability.h is not included and later used
-| src/network.c: In function 'can_ping':
-| src/network.c:198:2: error: 'cap_flag_value_t' undeclared (first use in this function)
-| src/network.c:198:2: note: each undeclared identifier is reported only once for each function it appears in
-| src/network.c:198:19: error: expected ';' before 'cap'
-| src/network.c:199:2: error: 'cap_t' undeclared (first use in this function)
-| src/network.c:199:8: error: expected ';' before 'caps'
-| src/network.c:200:6: error: 'caps' undeclared (first use in this function)
-| cc1: warnings being treated as errors
-| src/network.c:203:2: error: implicit declaration of function 'cap_get_flag'
-| src/network.c:203:21: error: 'CAP_SYS_NICE' undeclared (first use in this function)
-| src/network.c:203:35: error: 'CAP_EFFECTIVE' undeclared (first use in this function)
-| src/network.c:203:51: error: 'cap' undeclared (first use in this function)
-| src/network.c:204:17: error: 'CAP_CLEAR' undeclared (first use in this function)
-| src/network.c:210:1: error: control reaches end of non-void function
-| make[1]: *** [omgps-network.o] Error 1
-
-and -lcap is needed for 2 functions later (should be added only for HAVE_SYS_CAPABILITY_H enabled, but I don't care enough)
-| omgps-network.o: In function `can_ping':
-| /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/omgps-0.1+svnr109-r1/omgps/src/network.c:199: undefined reference to `cap_get_proc'
-| /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/omgps-0.1+svnr109-r1/omgps/src/network.c:203: undefined reference to `cap_get_flag'
-| collect2: ld returned 1 exit status
-
---- omgps.orig/src/network.c	2009-10-28 18:51:16.000000000 +0100
-+++ omgps/src/network.c	2011-05-09 09:59:11.637676772 +0200
-@@ -19,16 +19,16 @@
- #include <assert.h>
- #include <glib.h>
- 
--#if (HAVE_SYS_CAPABILITY_H)
--#undef _POSIX_SOURCE
--#include <sys/capability.h>
--#endif
--
- #include "config.h"
- #include "util.h"
- #include "network.h"
- #include "customized.h"
- 
-+#if (HAVE_SYS_CAPABILITY_H)
-+#undef _POSIX_SOURCE
-+#include <sys/capability.h>
-+#endif
-+
- /**
-  * Ping: reference <Unix network programming>, volume 1, third edition.
-  */
---- omgps.orig/Makefile.am	2009-10-28 18:51:17.000000000 +0100
-+++ omgps/Makefile.am	2011-05-09 10:04:58.578676679 +0200
-@@ -33,7 +33,7 @@
- 
- omgps_CFLAGS = $(common_CFLAGS) -O2
- omgps_LDFLAGS = 
--omgps_LDADD = @DEPENDENCIES_LIBS@ -lpython$(PY_VERSION)
-+omgps_LDADD = @DEPENDENCIES_LIBS@ -lcap -lpython$(PY_VERSION)
- 
- omgps_SOURCES =          \
-   src/ctx_agps_online.c  \
diff --git a/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch b/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
deleted file mode 100644
index 41f6471..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Upstream-Status: Submitted
-https://code.google.com/p/omgps/issues/detail?id=15
-
-diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
---- omgps.orig/src/include/map_repo.h	2009-07-20 19:54:08.000000000 +0200
-+++ omgps/src/include/map_repo.h	2010-01-17 14:55:24.000000000 +0100
-@@ -3,6 +3,9 @@
- 
- #include <glib.h>
- #include <gdk/gdk.h>
-+// workaround Python.h unconditionally (re)defines _XOPEN_SOURCE and _POSIX_C_SOURCE
-+#undef _XOPEN_SOURCE
-+#undef _POSIX_C_SOURCE
- #include <Python.h>
- 
- #define MAP_MAX_BG_COLORS	5
-diff -uNr omgps.orig/src/include/py_ext.h omgps/src/include/py_ext.h
---- omgps.orig/src/include/py_ext.h	2009-07-20 19:54:08.000000000 +0200
-+++ omgps/src/include/py_ext.h	2010-01-17 14:55:57.000000000 +0100
-@@ -4,8 +4,8 @@
- void py_ext_init();
- void py_ext_cleanup();
- 
--void inline py_ext_trylock();
--void inline py_ext_lock();
--void inline py_ext_unlock();
-+void py_ext_trylock();
-+void py_ext_lock();
-+void py_ext_unlock();
- 
- #endif /* PY_EXT_H_ */
-diff -uNr omgps.orig/src/include/uart.h omgps/src/include/uart.h
---- omgps.orig/src/include/uart.h	2009-07-20 19:54:08.000000000 +0200
-+++ omgps/src/include/uart.h	2010-01-17 14:33:00.000000000 +0100
-@@ -12,9 +12,9 @@
- extern void uart_cleanup();
- extern void uart_close();
- 
--extern inline int read_with_timeout(U1 *buf, int len);
--extern inline int write_with_timeout(U1 *buf, int len);
--extern inline gboolean read_fixed_len(U1 *buf, int expected_len);
-+extern int read_with_timeout(U1 *buf, int len);
-+extern int write_with_timeout(U1 *buf, int len);
-+extern gboolean read_fixed_len(U1 *buf, int expected_len);
- 
- extern int sysfs_get_gps_device_power();
- extern gboolean gps_device_power_on();
-diff -uNr omgps.orig/src/py_ext.c omgps/src/py_ext.c
---- omgps.orig/src/py_ext.c	2009-07-20 19:54:08.000000000 +0200
-+++ omgps/src/py_ext.c	2010-01-17 14:56:46.000000000 +0100
-@@ -26,17 +26,17 @@
- 		Py_Finalize();
- }
- 
--void inline py_ext_trylock()
-+void py_ext_trylock()
- {
- 	TRYLOCK_MUTEX(&lock);
- }
- 
--void inline py_ext_lock()
-+void py_ext_lock()
- {
- 	LOCK_MUTEX(&lock);
- }
- 
--void inline py_ext_unlock()
-+void py_ext_unlock()
- {
- 	UNLOCK_MUTEX(&lock);
- }
diff --git a/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch b/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
deleted file mode 100644
index 6880805..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted
-https://code.google.com/p/omgps/issues/detail?id=15
-
-diff -uNr omgps/src/tab_scratch.c omgps.new/src/tab_scratch.c
---- omgps/src/tab_scratch.c	2012-12-22 18:13:25.994788128 +0100
-+++ omgps.new/src/tab_scratch.c	2012-12-22 18:12:45.876790644 +0100
-@@ -51,7 +51,7 @@
- 	}
- 
- 	gboolean ret = gdk_pixbuf_save (pixbuf, buf, SCREENSHOT_FILE_TYPE, &err, "tEXt::Software", "omgps", NULL);
--	gdk_pixbuf_unref(pixbuf);
-+	g_object_unref(pixbuf);
- 
- 	if (ret) {
- 		char buf1[128];
diff --git a/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch b/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
deleted file mode 100644
index 290c5e6..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Submitted
-https://code.google.com/p/omgps/issues/detail?id=15
-
-diff -uNr omgps.orig//src/uart.c omgps/src/uart.c
---- omgps.orig//src/uart.c	2010-08-22 23:34:09.000000000 +0200
-+++ omgps/src/uart.c	2010-08-22 23:33:54.000000000 +0200
-@@ -30,6 +30,7 @@
-  * NOTE: these file paths are subject to change according to kernel and distribution.
-  */
- static const char *sysfs_gps_power[] = {
-+	"/sys/bus/platform/devices/gta02-pm-gps.0/power_on",
- 	"/sys/bus/platform/devices/neo1973-pm-gps.0/power_on",
- 	"/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
- };
diff --git a/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch b/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
deleted file mode 100644
index 3ccb14e..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted
-https://code.google.com/p/omgps/issues/detail?id=15
-
---- a/src/settings.c	2011-12-12 13:21:30.573400795 +0100
-+++ b/src/settings.c	2011-12-12 14:11:05.269606119 +0100
-@@ -278,6 +278,9 @@
- 	}
- 
- 	ret = check_settings(errbuf, ERRBUF_LEN);
-+	if (ret == FALSE) {
-+		snprintf(errbuf, ERRBUF_LEN, "Something wrong while loading settings file");
-+	}
- 
- 	if (fd > 0)
- 		close(fd);
diff --git a/meta-oe/recipes-navigation/omgps/omgps_svn.bb b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
deleted file mode 100644
index 696e863..0000000
--- a/meta-oe/recipes-navigation/omgps/omgps_svn.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "GPS application for openmoko freerunner"
-HOMEPAGE = "http://omgps.googlecode.com"
-SECTION = "openmoko/applications"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "gtk+ python-pygobject dbus-glib libcap"
-SRCREV = "109"
-PV = "0.1+svnr${SRCPV}"
-PR = "r2"
-S = "${WORKDIR}/${BPN}"
-
-do_configure_prepend() {
-    sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am
-    sed -i "s#PY_INC_DIR = \$(OPIEDIR)#PY_INC_DIR = ${STAGING_DIR_HOST}#g" ${S}/Makefile.am
-    sed -i "s#dist_conf_DATA = data/etc/\*\.\*#dist_conf_DATA = ${S}/data/etc/\*\.\*#g" ${S}/Makefile.am
-}
-
-SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
-           file://gcc-4.4.patch \
-           file://sysfs.node.2.6.32.patch \
-           file://fix.capability.patch \
-           file://use.unused.variable.patch \
-           file://fix.build.with.glib.2.34.patch \
-           file://gdk-pixbuf-2.26.5.patch \
-           file://0001-g_type_init-is-deprecated-for-glib-2.35.0.patch \
-           file://fix.build.with.gcc.4.9.patch \
-"
-
-inherit autotools pkgconfig
-- 
2.7.0

[PATCH 30/34] poppler-data: fix do_install()

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb
index 27c4110..5a7f72c 100644
--- a/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb
+++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb
@@ -28,7 +28,7 @@ do_compile() {
 }
 
 do_install() {
-    oe_runmake install DESTDIR=${D}
+    oe_runmake install prefix=/usr DESTDIR=${D}
     install -d ${D}${datadir}/poppler/cMap
     install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/
 }
-- 
2.7.0

[PATCH 31/34] poppler: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-support/poppler/poppler_0.37.0.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb b/meta-oe/recipes-support/poppler/poppler_0.37.0.bb
index 59c477d..2c6b1a9 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.37.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.37.0.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a
 
 DEPENDS = "fontconfig zlib cairo lcms"
 
-inherit autotools pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc gobject-introspection
 
 PACKAGECONFIG ??= "jpeg openjpeg png tiff ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
 PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg"
@@ -28,6 +28,10 @@ EXTRA_OECONF = "\
     --enable-zlib \
 "
 
+do_compile_prepend() {
+        export GIR_EXTRA_LIBS_PATH="${B}/poppler/.libs"
+}
+
 # Adjust library names when building for QT4e
 QT4E_PATCHES = "${@bb.utils.contains('PACKAGECONFIG', 'qt4e', 'file://fix-qt4e-library-dependencies.patch', '', d)}"
 SRC_URI_append = "${QT4E_PATCHES}"
-- 
2.7.0

[PATCH 32/34] udisks2: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-support/udisks/udisks2_2.1.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
index 031b0e8..d273948 100644
--- a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
+++ b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
@@ -11,11 +11,11 @@ SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2"
 SRC_URI[md5sum] = "73632501002e6de8244f831e38b2b98e"
 SRC_URI[sha256sum] = "2cfcf560447ea44cba2a683342c7062aaaf35e4eb554bed64ac2dd55a70a5fb6"
 
-inherit autotools systemd gtk-doc
+inherit autotools systemd gtk-doc gobject-introspection
 
 S = "${WORKDIR}/udisks-${PV}"
 
-EXTRA_OECONF = "--disable-introspection --disable-man"
+EXTRA_OECONF = "--disable-man"
 
 FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
                 ${datadir}/dbus-1/ \
-- 
2.7.0

[PATCH 33/34] upower: fix gobject introspection

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta-oe/recipes-support/upower/upower_0.9.14.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/upower/upower_0.9.14.bb b/meta-oe/recipes-support/upower/upower_0.9.14.bb
index 8cf8e43..dddaa9b 100644
--- a/meta-oe/recipes-support/upower/upower_0.9.14.bb
+++ b/meta-oe/recipes-support/upower/upower_0.9.14.bb
@@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08"
 
 PR = "r2"
 
-DEPENDS = "libusb1 libgudev glib-2.0 dbus-glib polkit gobject-introspection-stub"
+DEPENDS = "libusb1 libgudev glib-2.0 dbus-glib polkit"
 
 SRC_URI = "http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "18803f82102d56aac90949d1e4251645"
 SRC_URI[sha256sum] = "81eb44c0453b264a737d32f763a31d5b1776f050a47d5be85fc5e9caf874a4c5"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext gobject-introspection
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist"
-- 
2.7.0

[PATCH 34/34] python-dbusmock: use real introspection instead on legacy pygobject

[Alexander Kanavin]

The patch that switches to pygobject can be now dropped, because
real introspection is provided in oe-core.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...-t-use-gobject-introspection-for-bindings.patch | 29 ----------------------
 .../python/python-dbusmock_0.10.1.bb               |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch

diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch b/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch
deleted file mode 100644
index f3ab53c..0000000
--- a/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 29960f2fce7ab42ed0a1bf8ce96499fdb6eedf3c Mon Sep 17 00:00:00 2001
-From: Simon Busch <simon.busch@lge.com>
-Date: Tue, 25 Mar 2014 15:28:54 +0100
-Subject: [PATCH] Don't use gobject introspection for bindings
-
-In our environment we're not providing the glib python bindings through
-introspection but just pygobject so we need to use the right import.
-
-Signed-off-by: Simon Busch <simon.busch@lge.com>
----
- dbusmock/__main__.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dbusmock/__main__.py b/dbusmock/__main__.py
-index 44b63fb..bfd089c 100644
---- a/dbusmock/__main__.py
-+++ b/dbusmock/__main__.py
-@@ -51,7 +51,7 @@ def parse_args():
- 
- if __name__ == '__main__':
-     import dbus.mainloop.glib
--    from gi.repository import GLib
-+    import glib as GLib
- 
-     args = parse_args()
-     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
--- 
-1.7.9.5
-
diff --git a/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb b/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb
index b247943..2520bfc 100644
--- a/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb
+++ b/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb
@@ -14,7 +14,6 @@ SRC_URI[md5sum] = "7370d325c4a75494dd71885ca65b79e8"
 SRC_URI[sha256sum] = "03aadc93bdc26ea18d4d78fcff7b6cb34f4e18623bc5cc41cf9539d663cee11e"
 
 SRC_URI += " \
-    file://0001-Don-t-use-gobject-introspection-for-bindings.patch \
     file://0001-Add-functionality-to-add-own-objects-to-internal-obj.patch \
     file://0002-Add-possibility-to-import-templates-from-packages.patch \
 "
-- 
2.7.0

Re: [PATCH 30/34] poppler-data: fix do_install()

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

On Tue, Feb 23, 2016 at 04:20:09PM +0200, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb
> index 27c4110..5a7f72c 100644
> --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb
> +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.7.bb
> @@ -28,7 +28,7 @@ do_compile() {
>  }
>  
>  do_install() {
> -    oe_runmake install DESTDIR=${D}
> +    oe_runmake install prefix=/usr DESTDIR=${D}

NAK

There is better fix from RP which doesn't hardcode /usr:

oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir}


>      install -d ${D}${datadir}/poppler/cMap
>      install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/
>  }
> -- 
> 2.7.0
> 
> -- 
> _______________________________________________
> 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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 11/34] tracker: fix gobject introspection

[Martin Jansa]

[-- Attachment #1: Digital signature --]
[-- Type: application/pgp-signature, Size: 190 bytes --]

Re: [PATCH 00/34] Initial gobject introspection support for meta-openembedded

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 11111 bytes --]

On Tue, Feb 23, 2016 at 04:19:39PM +0200, Alexander Kanavin wrote:
> This patch adds gobject introspection support to recipes in meta-openembedded.
> To make it work, you need to fetch the following poky branch and build against it:
> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/gobject-introspection-experimental

Many people aren't using poky and don't want to play with combo-layer or
format-patch/am combo to reapply the patches from poky repo to oe-core
repo.

As you're definitely used to such strange environment, can you please
push corresponding branch for oe-core to openembedded-core-contrib repo
as well?

Thanks!

> For general information about gobject introspection support in openembedded, see here:
> http://lists.openembedded.org/pipermail/openembedded-core/2015-November/113390.html
> 
> NOTE to meta-oe maintainers: this patchset is meant for testing and review. It depends
> on changes to oe-core that are not yet available in master branch, and therefore
> it should not be merged yet.

I should start reading the cover letters :), will remove this from
master-next until openembedded-core-contrib branch is available.

> The following changes since commit dafd61fa87c31fab97e36f71974fc097a1841c91:
> 
>   net-snmp: fix cross-compile breakage, add libnl pkgconfig option (2016-02-22 15:51:20 -0500)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib akanavin/gobject-introspection-fixes
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=akanavin/gobject-introspection-fixes
> 
> Alexander Kanavin (34):
>   evolution-data-server: fix gobject introspection
>   evince: update to 3.18.2
>   gnome-bluetooth: update to 3.18.2
>   gnome-desktop: remove pygtk dependency
>   gnumeric: fix gobject introspection support
>   libgdata: update to 0.16.1
>   libgsf: fix gobject introspection
>   libwnck: fix gobject introspection
>   libxklavier: fix gobject introspection
>   goffice: fix gobject introspection
>   tracker: fix gobject introspection
>   gupnp: fix gobject introspection
>   rygel: fix gobject introspection
>   media-service-demo: remove the recipe
>   python-gst: remove the 0.10 recipe
>   gstreamer-0.10: disable gobject introspection
>   libmediaart: fix gobject introspection
>   bluez4: use real introspection instead of legacy pygobject
>   modemmanager: fix vala support
>   networkmanager: fix introspection and vala support
>   telepathy-glib: fix gobject introspection support
>   libgee: fix gobject introspection support
>   polkit: fix gobject introspection support
>   gtkextra: fix gobject introspection support
>   libunique: fix gobject introspection support
>   babl: update to 0.1.16
>   gegl: update to 0.3.4
>   gimp: accept newer versins of babl and gegl
>   omgps: remove the recipe
>   poppler-data: fix do_install()
>   poppler: fix gobject introspection
>   udisks2: fix gobject introspection
>   upower: fix gobject introspection
>   python-dbusmock: use real introspection instead on legacy pygobject
> 
>  .../recipes-gnome/eds/evolution-data-server_git.bb |   6 +-
>  .../evince/0001-help-remove-YELP-macro.patch       |  24 ++++
>  .../evince/0001-tiff-fix-compile-warning.patch     |  33 ------
>  ...ove-pkg-config-check-for-gnome-icon-theme.patch |  35 ------
>  .../evince/evince/cross-compile-fix.patch          |  25 -----
>  .../evince/{evince_2.32.0.bb => evince_3.18.2.bb}  |  29 ++---
>  .../0001-bluetooth-input-Fix-compile-errors.patch  |  37 ------
>  ...luetooth-client-use-valid-interface-names.patch | 122 --------------------
>  .../0003-Fix-build-with-libnotify-0.7.0.patch      |  47 --------
>  .../gnome-bluetooth/gnome-bluetooth_2.32.0.bb      |  38 -------
>  .../gnome-bluetooth/gnome-bluetooth_3.18.2.bb      |  20 ++++
>  .../gnome-desktop/gnome-desktop_2.32.1.bb          |   6 +-
>  ...n-drop-introspection-macros-replace-them-.patch |  84 ++++++++++++++
>  .../recipes-gnome/gnumeric/gnumeric_1.12.0.bb      |   5 +-
>  .../{libgdata_0.7.1.bb => libgdata_0.16.1.bb}      |  21 +++-
>  ...c-drop-a-copy-paste-of-introspection.m4-m.patch | 103 +++++++++++++++++
>  meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb  |   2 +
>  meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb |   2 +-
>  .../recipes-gnome/libxklavier/libxklavier_5.3.bb   |   2 -
>  ...igure.ac-fix-paths-to-introspection-tools.patch |  41 +++++++
>  .../recipes-support/goffice/goffice_0.10.1.bb      |   2 +
>  .../recipes-support/tracker/tracker_0.14.2.bb      |   7 +-
>  .../recipes-connectivity/gupnp/gssdp.inc           |  12 +-
>  .../recipes-connectivity/gupnp/gupnp-av.inc        |   9 +-
>  .../recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb |   4 +-
>  .../recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb  |   6 +-
>  .../recipes-connectivity/gupnp/gupnp.inc           |  12 +-
>  .../recipes-connectivity/gupnp/no-vala.inc         |   5 -
>  .../recipes-connectivity/rygel/rygel_0.28.2.bb     |   2 +-
>  .../dleyna/media-service-demo_git.bb               |  18 ---
>  .../gstreamer-0.10/gst-plugins.inc                 |   2 +-
>  .../gstreamer-0.10/gst-rtsp_0.10.8.bb              |   2 +
>  .../gstreamer-0.10/gstreamer_0.10.36.bb            |   1 +
>  .../gstreamer-0.10/python-gst/python-path.patch    |  28 -----
>  .../gstreamer-0.10/python-gst_0.10.22.bb           |  29 -----
>  .../recipes-support/libmediaart/libmediaart.inc    |   2 +-
>  ...pygobject-instead-ofgobject-introspection.patch |  27 -----
>  meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb |   1 -
>  .../modemmanager/modemmanager_1.4.12.bb            |   2 +-
>  .../networkmanager/networkmanager_1.0.10.bb        |   8 +-
>  .../telepathy/telepathy-glib_0.24.0.bb             |   2 +-
>  meta-oe/recipes-devtools/libgee/libgee_0.16.1.bb   |   4 +-
>  meta-oe/recipes-extended/polkit/polkit_0.113.bb    |  14 ++-
>  meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb   |   4 +-
>  ...-use-LIBTOOL-instead-of-hardcoded-libtool.patch |  27 +++++
>  meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb |   6 +-
>  .../babl/{babl_0.1.10.bb => babl_0.1.16.bb}        |   4 +-
>  .../gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb}          |  22 ++--
>  .../gimp/gimp/bump_Babl-GEGL_versions.patch        |  53 +++++++++
>  meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb       |   1 +
>  ...g_type_init-is-deprecated-for-glib-2.35.0.patch |  33 ------
>  .../omgps/omgps/fix.build.with.gcc.4.9.patch       |  22 ----
>  .../omgps/omgps/fix.build.with.glib.2.34.patch     | 125 ---------------------
>  .../omgps/omgps/fix.capability.patch               |  62 ----------
>  .../recipes-navigation/omgps/omgps/gcc-4.4.patch   |  71 ------------
>  .../omgps/omgps/gdk-pixbuf-2.26.5.patch            |  15 ---
>  .../omgps/omgps/sysfs.node.2.6.32.patch            |  14 ---
>  .../omgps/omgps/use.unused.variable.patch          |  15 ---
>  meta-oe/recipes-navigation/omgps/omgps_svn.bb      |  29 -----
>  .../recipes-support/poppler/poppler-data_0.4.7.bb  |   2 +-
>  meta-oe/recipes-support/poppler/poppler_0.37.0.bb  |   6 +-
>  meta-oe/recipes-support/udisks/udisks2_2.1.5.bb    |   4 +-
>  meta-oe/recipes-support/upower/upower_0.9.14.bb    |   4 +-
>  ...-t-use-gobject-introspection-for-bindings.patch |  29 -----
>  .../python/python-dbusmock_0.10.1.bb               |   1 -
>  65 files changed, 484 insertions(+), 946 deletions(-)
>  create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
>  delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-tiff-fix-compile-warning.patch
>  delete mode 100644 meta-gnome/recipes-gnome/evince/evince/Remove-pkg-config-check-for-gnome-icon-theme.patch
>  delete mode 100644 meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
>  rename meta-gnome/recipes-gnome/evince/{evince_2.32.0.bb => evince_3.18.2.bb} (60%)
>  delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-bluetooth-input-Fix-compile-errors.patch
>  delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0002-bluetooth-client-use-valid-interface-names.patch
>  delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0003-Fix-build-with-libnotify-0.7.0.patch
>  delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb
>  create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
>  create mode 100644 meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
>  rename meta-gnome/recipes-gnome/libgdata/{libgdata_0.7.1.bb => libgdata_0.16.1.bb} (43%)
>  create mode 100644 meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch
>  create mode 100644 meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch
>  delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
>  delete mode 100644 meta-multimedia/recipes-multimedia/dleyna/media-service-demo_git.bb
>  delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst/python-path.patch
>  delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/python-gst_0.10.22.bb
>  delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
>  create mode 100644 meta-oe/recipes-gnome/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch
>  rename meta-oe/recipes-graphics/babl/{babl_0.1.10.bb => babl_0.1.16.bb} (72%)
>  rename meta-oe/recipes-graphics/gegl/{gegl_0.2.0.bb => gegl_0.3.4.bb} (46%)
>  create mode 100644 meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
>  delete mode 100644 meta-oe/recipes-navigation/omgps/omgps_svn.bb
>  delete mode 100644 meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch
> 
> -- 
> 2.7.0
> 
> -- 
> _______________________________________________
> 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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 00/34] Initial gobject introspection support for meta-openembedded

[Alexander Kanavin]

On 02/24/2016 06:47 PM, Martin Jansa wrote:
>
> Many people aren't using poky and don't want to play with combo-layer or
> format-patch/am combo to reapply the patches from poky repo to oe-core
> repo.
>
> As you're definitely used to such strange environment, can you please
> push corresponding branch for oe-core to openembedded-core-contrib repo
> as well?
>
> Thanks!
 >
> I should start reading the cover letters :), will remove this from
> master-next until openembedded-core-contrib branch is available.

I think you misunderstood my intent somewhat. I don't want you to queue 
these patches anywhere, they are preliminary. Their purpose is twofold:

1) People interested in playing and testing that poky branch with 
introspection may want to use recipes or whole layers from meta-oe as 
well (gupnp for instance).

2) I'd like to demonstrate to you that meta-oe will be taken care of 
when introspection lands in oe-core, because historically there's been 
some bad blood regarding those disruptive oe-core changes :)

However, I'm reluctant to provide the patchset for oe-contrib. The 
reason is that I've been maintaining the poky patchset since November; 
it's more or less rebasing, merge conflicts fixing and world rebuilding 
once every one or two weeks. I wouldn't want to duplicate this ongoing 
work for oe-contrib as well, and keep the two branches in sync, because 
I don't actually know when these patches make it to master. So if you 
want to try them out against pure oe-core, you have to extract and apply 
them by hand, I'm afraid. As a one-off task, it should not be complicated.

Alex

Re: [PATCH 00/34] Initial gobject introspection support for meta-openembedded

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2094 bytes --]

On Thu, Feb 25, 2016 at 03:36:35PM +0200, Alexander Kanavin wrote:
> On 02/24/2016 06:47 PM, Martin Jansa wrote:
> >
> > Many people aren't using poky and don't want to play with combo-layer or
> > format-patch/am combo to reapply the patches from poky repo to oe-core
> > repo.
> >
> > As you're definitely used to such strange environment, can you please
> > push corresponding branch for oe-core to openembedded-core-contrib repo
> > as well?
> >
> > Thanks!
>  >
> > I should start reading the cover letters :), will remove this from
> > master-next until openembedded-core-contrib branch is available.
> 
> I think you misunderstood my intent somewhat. I don't want you to queue 
> these patches anywhere, they are preliminary. Their purpose is twofold:
> 
> 1) People interested in playing and testing that poky branch with 
> introspection may want to use recipes or whole layers from meta-oe as 
> well (gupnp for instance).
> 
> 2) I'd like to demonstrate to you that meta-oe will be taken care of 
> when introspection lands in oe-core, because historically there's been 
> some bad blood regarding those disruptive oe-core changes :)

Thanks I appreciate it.

> However, I'm reluctant to provide the patchset for oe-contrib. The 
> reason is that I've been maintaining the poky patchset since November; 
> it's more or less rebasing, merge conflicts fixing and world rebuilding 
> once every one or two weeks. I wouldn't want to duplicate this ongoing 
> work for oe-contrib as well, and keep the two branches in sync, because 
> I don't actually know when these patches make it to master. So if you 
> want to try them out against pure oe-core, you have to extract and apply 
> them by hand, I'm afraid. As a one-off task, it should not be complicated.

As you stated above it's not one-off task, because you're still updating
the branch. I'll just ignore both patchsets until both are ready and for
correct repositories, I'm not personally interested in introspection.

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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 20/34] networkmanager: fix introspection and vala support

[Adrian Freihofer]

Hi Alexander

Please consider the following lines before adding polkit to DEPENDS:
PACKAGECONFIG[systemd] = " \
    --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
    --without-systemdsystemunitdir, \
    polkit \
"

I think the final solution should be a flag on DISTRO_FEATURES level to enable/disable polkit for systemd, networkmanager, modemmanager and other packages.
As a first step you might split polkit PACKAGECONFIG from systemd PACKAGECONFIG. The (untested) patch allows to enable disable polkit independently from systemd without changing
the default settings.

> diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
> index b00c9bb..1e64c4b 100644
> --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
> +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
> @@ -35,15 +35,15 @@ EXTRA_OECONF = " \
>  "
>  
>  PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
> -    ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
> +    ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd polkit','consolekit',d)} \
>      ${@bb.utils.contains('DISTRO_FEATURES','bluetooth','${BLUEZ}','',d)} \
>      ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \
>  "
>  PACKAGECONFIG[systemd] = " \
> -    --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
> -    --without-systemdsystemunitdir, \
> -    polkit \
> +    --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
> +    --without-systemdsystemunitdir \
>  "
> +PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit"
>  PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
>  # consolekit is not picked by shlibs, so add it to RDEPENDS too
>  PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"

Regards,
Adrian