[PATCH 00/41] More GNOME & cleanups

[PATCH 00/41] More GNOME & cleanups

[Andreas Müller]

Have more patches for GNOM in my WIP but remaining patches need more love.
To avoid nasty rebasing I have cherry-picked this series - hope I did not 
overlook some missing dependency or...

Andreas Müller (41):
  libstemmer: initial add
  appstream: initial add 0.12.6
  appstream-glib: initial add 0.7.15
  yelp-xsl: initial add 3.32.1
  yelp-tools: initial add 3.32.0
  yelp: initial add 3.32.1
  gnome-help.bbclass: Handle gnome-help files with new distro feature
    'helpfiles'
  evolution-data-server: uprade 3.26.6 -> 3.32.2 and rework
  gnome-menus3: upgrade 3.10.1 -> 3.32.0
  gnome-bluetooth: upgrade 3.18.2 -> 3.32.1
  glade3: upgrade 3.8.5 -> 3.8.6
  gnome-bluetooth: add upstream-version-is-even to inherit
  gtksourceview4: upgrade 4.2.0 -> 4.3.1
  gtksourceview3: upgrade 3.24.10 -> 3.24.11
  mousepad: move to gtk3
  network-manager-applet: port to meson build
  network-manager-applet: cleanup
  abiword: remove
  evince: upgrade 3.28.2 -> 3.32.0
  exiv2: initial add 0.27.0
  gexiv2: initial add 0.12.0
  gnome-autoar: inital add 0.2.3
  tracker: initial add 2.2.2
  nautilus: upgrade 3.18.5 -> 3.32.1
  ibus: initial add 1.5.20
  gnome-desktop3: upgrade 3.32.0 -> 3.32.2
  libgusb: initial add 0.3.0+
  colord: initial add 1.4.4
  colord-gtk: initial add 0.1.26
  itstool: upgrade 2.0.5 -> 2.0.6
  libwacom: initial add 0.33
  geocode-glib: initial add 3.26.1
  libgweather: initial add 3.32.1
  pinpoint: remove dead project
  libgnomekbd: cleanup
  libwnck: GNOME_COMPRESS_TYPE = "xz"
  rygel: remove GNOME_COMPRESS_TYPE = "xz"
  libmediaart(-2.0): remove GNOME_COMPRESS_TYPE = "xz"
  gvfs: upgrade 1.40.0 -> 1.40.1
  upower: upgrade 0.99.7 -> 0.99.10
  xserver-xorg-cvt-native: initial add 1.20.4

 meta-gnome/classes/gnome-help.bbclass         |  71 +++++++
 meta-gnome/conf/layer.conf                    |   3 +
 .../recipes-apps/pinpoint/pinpoint_git.bb     |  24 ---
 .../network-manager-applet_1.8.20.bb          |  34 +---
 ...1-Bug-13770-Require-C-11-from-now-on.patch | 180 ------------------
 .../recipes-gnome/abiword/abiword_3.0.2.bb    | 142 --------------
 ...nded-way-to-handle-the-icu-namespace.patch |  46 -----
 ...-format-attribute-to-_synctex_malloc.patch |  12 +-
 .../evince/0001-help-remove-YELP-macro.patch  |  24 ---
 ...vDocumentModel-get-type-function-dec.patch |  33 ----
 ...02-add-a-formatting-attribute-check.patch} |   0
 .../{evince_3.28.2.bb => evince_3.32.0.bb}    |  60 +++---
 .../evolution-data-server-native.bb           |  23 +++
 .../evolution-data-server.bb}                 | 123 +++---------
 .../evolution-data-server.inc                 |  16 ++
 ...keLists.txt-Remove-TRY_RUN-for-iconv.patch |  24 ++-
 ...txt-remove-CHECK_C_SOURCE_RUNS-check.patch |   0
 ...the-Novell-sample-contact-with-somet.patch |   0
 ...abi-from-the-default-C-warning-flags.patch |  29 +++
 .../0005-call-native-helpers.patch            |  45 +++++
 .../evolution-data-server/iconv-detect.h      |   0
 .../geocode-glib/geocode-glib_3.26.1.bb       |  20 ++
 .../recipes-gnome/gexiv2/gexiv2_0.12.0.bb     |  21 ++
 .../gnome-autoar/gnome-autoar_0.2.3.bb        |  18 ++
 ...th_3.18.2.bb => gnome-bluetooth_3.32.1.bb} |  14 +-
 ...op3_3.32.0.bb => gnome-desktop3_3.32.2.bb} |  10 +-
 ...enus3_3.10.1.bb => gnome-menus3_3.32.0.bb} |  11 +-
 ...3_3.24.10.bb => gtksourceview3_3.24.11.bb} |   6 +-
 ...view4_4.2.0.bb => gtksourceview4_4.3.1.bb} |  13 +-
 .../gvfs/{gvfs_1.40.0.bb => gvfs_1.40.1.bb}   |  12 +-
 .../libgnomekbd_3.26.1.bb                     |   9 +-
 .../libgweather/libgweather_3.32.1.bb         |  24 +++
 .../recipes-gnome/libwnck/libwnck_2.31.0.bb   |   1 -
 ...ome-desktop-thumbnail-API-with-new-g.patch |  40 ----
 .../recipes-gnome/nautilus/nautilus_3.18.5.bb |  33 ----
 .../recipes-gnome/nautilus/nautilus_3.32.1.bb |  32 ++++
 .../recipes-gnome/tracker/tracker_2.2.2.bb    |  51 +++++
 .../recipes-gnome/yelp/yelp-tools_3.32.0.bb   |  21 ++
 .../recipes-gnome/yelp/yelp-xsl_3.32.1.bb     |  18 ++
 meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb  |  37 ++++
 .../appstream-glib/appstream-glib_0.7.15.bb   |  37 ++++
 .../colord-gtk/colord-gtk_0.1.26.bb           |  19 ++
 .../recipes-support/ibus/ibus-native.bb       |  28 +++
 meta-gnome/recipes-support/ibus/ibus.bb       |  28 +++
 meta-gnome/recipes-support/ibus/ibus.inc      |  33 ++++
 ...start-dbus-we-do-not-have-dbus-lauch.patch |  39 ++++
 .../libstemmer/0001-Build-so-lib.patch        |  63 ++++++
 .../libstemmer/libstemmer_0.0.0.bb            |  46 +++++
 .../recipes-support/libwacom/libwacom_0.33.bb |  14 ++
 .../rygel/rygel_0.37.0.bb                     |   1 -
 .../libmediaart/libmediaart.inc               |   2 -
 .../0001-Do-not-use-host-include-path.patch   |  51 +++--
 .../appstream/appstream_0.12.6.bb             |  41 ++++
 .../recipes-support/colord/colord-native.bb   |  64 +++++++
 ...n-cd_icc_create_from_edid-to-avoid-u.patch | 166 ++++++++++++++++
 .../colord/colord-native/Makefile             |  48 +++++
 meta-oe/recipes-support/colord/colord.bb      |  42 ++++
 meta-oe/recipes-support/colord/colord.inc     |  13 ++
 ...Run-native-cd_idt8-cd_create_profile.patch |  59 ++++++
 meta-oe/recipes-support/exiv2/exiv2.bb        |  26 +++
 ...es-only-installed-with-the-exiv2-app.patch |  41 ++++
 ...nings-about-missing-PDB-files-in-3rd.patch |  64 +++++++
 ...-to-exiv2-xmp-to-avoid-name-conflict.patch |  82 ++++++++
 ...nstall-header-files-without-globbing.patch | 111 +++++++++++
 ...t-installation-dir-for-generated-doc.patch |  28 +++
 ...t-installation-dir-for-cmake-config-.patch | 124 ++++++++++++
 ...psdk-Build-with-DBanAllEntityUsage-1.patch |  34 ++++
 ...compile-warnings-in-ExpatAdapter.cpp.patch |  31 +++
 ...e-for-being-compatible-with-more-dis.patch |  27 +++
 ...ate-install-exiv2ConfigVersion.cmake.patch |  50 +++++
 ...on-fault-bug-introduced-with-version.patch |  33 ++++
 .../{itstool_2.0.5.bb => itstool_2.0.6.bb}    |   9 +-
 .../recipes-support/libgusb/libgusb_git.bb    |  12 ++
 ...everity-of-unhandled-action-messages.patch |  31 ---
 .../{upower_0.99.7.bb => upower_0.99.10.bb}   |  16 +-
 .../xserver-xorg-cvt-native_1.20.4.bb         |  43 +++++
 .../recipes-apps/mousepad/mousepad_0.4.1.bb   |   5 +-
 .../{glade3_3.8.5.bb => glade3_3.8.6.bb}      |  21 +-
 78 files changed, 2038 insertions(+), 824 deletions(-)
 create mode 100644 meta-gnome/classes/gnome-help.bbclass
 delete mode 100644 meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
 delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch
 delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb
 delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
 rename meta-gnome/recipes-gnome/evince/evince/{0001-add-a-formatting-attribute-check.patch => 0002-add-a-formatting-attribute-check.patch} (100%)
 rename meta-gnome/recipes-gnome/evince/{evince_3.28.2.bb => evince_3.32.0.bb} (32%)
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
 rename meta-gnome/recipes-gnome/{eds/evolution-data-server_3.26.6.bb => evolution-data-server/evolution-data-server.bb} (15%)
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch (59%)
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch (100%)
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch (100%)
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/iconv-detect.h (100%)
 create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
 create mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
 create mode 100644 meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
 rename meta-gnome/recipes-gnome/gnome-bluetooth/{gnome-bluetooth_3.18.2.bb => gnome-bluetooth_3.32.1.bb} (48%)
 rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.32.0.bb => gnome-desktop3_3.32.2.bb} (69%)
 rename meta-gnome/recipes-gnome/gnome-menus/{gnome-menus3_3.10.1.bb => gnome-menus3_3.32.0.bb} (41%)
 rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview3_3.24.10.bb => gtksourceview3_3.24.11.bb} (75%)
 rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview4_4.2.0.bb => gtksourceview4_4.3.1.bb} (65%)
 rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.40.0.bb => gvfs_1.40.1.bb} (87%)
 rename meta-gnome/recipes-gnome/{libgnome => libgnomekbd}/libgnomekbd_3.26.1.bb (63%)
 create mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_3.32.1.bb
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
 create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.32.1.bb
 create mode 100644 meta-gnome/recipes-gnome/tracker/tracker_2.2.2.bb
 create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.0.bb
 create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-xsl_3.32.1.bb
 create mode 100644 meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb
 create mode 100644 meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.15.bb
 create mode 100644 meta-gnome/recipes-support/colord-gtk/colord-gtk_0.1.26.bb
 create mode 100644 meta-gnome/recipes-support/ibus/ibus-native.bb
 create mode 100644 meta-gnome/recipes-support/ibus/ibus.bb
 create mode 100644 meta-gnome/recipes-support/ibus/ibus.inc
 create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
 create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
 create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer_0.0.0.bb
 create mode 100644 meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
 rename meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch => meta-oe/recipes-support/appstream/appstream/0001-Do-not-use-host-include-path.patch (10%)
 create mode 100644 meta-oe/recipes-support/appstream/appstream_0.12.6.bb
 create mode 100644 meta-oe/recipes-support/colord/colord-native.bb
 create mode 100644 meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
 create mode 100644 meta-oe/recipes-support/colord/colord-native/Makefile
 create mode 100644 meta-oe/recipes-support/colord/colord.bb
 create mode 100644 meta-oe/recipes-support/colord/colord.inc
 create mode 100644 meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2.bb
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0001-cmake-man-pages-only-installed-with-the-exiv2-app.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0002-cmake-ignore-warnings-about-missing-PDB-files-in-3rd.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0003-cmake-Rename-xmp-to-exiv2-xmp-to-avoid-name-conflict.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0004-cmake-Install-header-files-without-globbing.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0005-cmake-Use-correct-installation-dir-for-generated-doc.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0006-cmake-Use-correct-installation-dir-for-cmake-config-.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0007-xmpsdk-Build-with-DBanAllEntityUsage-1.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0008-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0009-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0010-create-install-exiv2ConfigVersion.cmake.patch
 create mode 100644 meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
 rename meta-oe/recipes-support/itstool/{itstool_2.0.5.bb => itstool_2.0.6.bb} (70%)
 create mode 100644 meta-oe/recipes-support/libgusb/libgusb_git.bb
 delete mode 100644 meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch
 rename meta-oe/recipes-support/upower/{upower_0.99.7.bb => upower_0.99.10.bb} (73%)
 create mode 100644 meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.4.bb
 rename meta-xfce/recipes-devtools/glade/{glade3_3.8.5.bb => glade3_3.8.6.bb} (42%)

-- 
2.20.1

[PATCH 01/41] libstemmer: initial add

[Andreas Müller]

* it is a(n optional) dependency for gnome projects
* they don't care for version numbers (yet?) so set least possible

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../libstemmer/0001-Build-so-lib.patch        | 63 +++++++++++++++++++
 .../libstemmer/libstemmer_0.0.0.bb            | 46 ++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
 create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer_0.0.0.bb

diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
new file mode 100644
index 000000000..73ebeb484
--- /dev/null
+++ b/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
@@ -0,0 +1,63 @@
+From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 9 May 2019 22:06:48 +0200
+Subject: [PATCH] Build so-lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Stolen from [1]
+
+[1] https://aur.archlinux.org/cgit/aur.git/commit/dynamiclib.patch?h=snowball-git&id=a9cbf4f42f3661e4b8f791cd4374233821716ea1
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ GNUmakefile           | 7 +++++--
+ libstemmer/symbol.map | 6 ++++++
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+ create mode 100644 libstemmer/symbol.map
+
+diff --git a/GNUmakefile b/GNUmakefile
+index cbd6ff7..a85230b 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -142,10 +142,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o)
+ JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
+ JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
+ 
+-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
++CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=-Iinclude
+ 
+-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ clean:
+ 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
+@@ -192,6 +192,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS)
+ libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
+ 
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^
++
+ stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
+ 	$(CC) $(CFLAGS) -o $@ $^
+ 
+diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map
+new file mode 100644
+index 0000000..7a3d423
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
+-- 
+2.20.1
+
diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer_0.0.0.bb b/meta-gnome/recipes-support/libstemmer/libstemmer_0.0.0.bb
new file mode 100644
index 000000000..4040fcf66
--- /dev/null
+++ b/meta-gnome/recipes-support/libstemmer/libstemmer_0.0.0.bb
@@ -0,0 +1,46 @@
+SUMMARY = "Snowball compiler and stemming algorithms"
+HOMEPAGE = "https://snowballstem.org/"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/license.html;beginline=72;endline=86;md5=8b141c7b91ab2cdf59eeba3caa3a3f5d"
+
+DEPENDS_class-target = "${BPN}-native"
+
+# Source code
+SRC_URI = "\
+    git://github.com/snowballstem/snowball.git \
+    file://0001-Build-so-lib.patch \
+"
+SRCREV = "d29510ae32702a81cdc29177a133e894df854550"
+S = "${WORKDIR}/git"
+
+# There is no license within the code but [1] directs to hompage which contains
+# a link to license. We use that here.
+# [1] https://github.com/snowballstem/snowball 
+SRC_URI += "\
+    https://snowballstem.org/license.html \
+"
+SRC_URI[md5sum] = "d3082e4cf99fedf4321a50530def88cd"
+SRC_URI[sha256sum] = "aa4d29800bde619d9ade818f83f95feeb6268033e58cef688603ecb8dfbb01e2"
+
+BBCLASSEXTEND = "native"
+
+do_compile_prepend_class-target() {
+    # use native tools
+    sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile
+}
+
+do_install_class-native() {
+    install -d ${D}${bindir}
+    install -m 755 ${S}/snowball ${D}${bindir}
+    install -m 755 ${S}/stemwords ${D}${bindir}
+}
+
+do_install_class-target() {
+    install -d ${D}${libdir}
+    install -m 755 ${S}/libstemmer.so.${PV} ${D}${libdir}/
+    ln -s libstemmer.so.${PV} ${D}${libdir}/libstemmer.so.0
+    ln -s libstemmer.so.${PV} ${D}${libdir}/libstemmer.so
+
+    install -d ${D}${includedir}
+	install -m 644 ${S}/include/*.h ${D}${includedir}
+}
-- 
2.20.1

[PATCH 02/41] appstream: initial add 0.12.6

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../0001-Do-not-use-host-include-path.patch   | 32 +++++++++++++++
 .../appstream/appstream_0.12.6.bb             | 41 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 meta-oe/recipes-support/appstream/appstream/0001-Do-not-use-host-include-path.patch
 create mode 100644 meta-oe/recipes-support/appstream/appstream_0.12.6.bb

diff --git a/meta-oe/recipes-support/appstream/appstream/0001-Do-not-use-host-include-path.patch b/meta-oe/recipes-support/appstream/appstream/0001-Do-not-use-host-include-path.patch
new file mode 100644
index 000000000..47f4e7aed
--- /dev/null
+++ b/meta-oe/recipes-support/appstream/appstream/0001-Do-not-use-host-include-path.patch
@@ -0,0 +1,32 @@
+From 0cf0a05bf5e8c49debfccb5a8ac1ab5024478eeb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 6 May 2019 22:42:07 +0200
+Subject: [PATCH] Do not use host include path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 93896ae..40b92d7 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -140,8 +140,7 @@ appstream_lib = library ('appstream',
+     soversion: as_api_level,
+     version: as_version,
+     dependencies: [aslib_deps],
+-    include_directories: [stemmer_inc_dirs,
+-                          include_directories ('..')],
++    include_directories: [include_directories ('..')],
+     install: true
+ )
+ 
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-support/appstream/appstream_0.12.6.bb b/meta-oe/recipes-support/appstream/appstream_0.12.6.bb
new file mode 100644
index 000000000..8a0d18864
--- /dev/null
+++ b/meta-oe/recipes-support/appstream/appstream_0.12.6.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Utilities to generate, maintain and access the AppStream database"
+HOMEPAGE = "https://www.freedesktop.org/wiki/Distributions/AppStream/"
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPLv2;md5=4641e94ec96f98fabc56ff9cc48be14b \
+    file://LICENSE.LGPLv2.1;md5=435ed639f84d4585d93824e7da3d85da \
+"
+
+
+inherit meson gobject-introspection
+
+SRC_URI = " \
+    https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \
+    file://0001-Do-not-use-host-include-path.patch \
+"
+SRC_URI[md5sum] = "ffd1555953828656971424ca5329f352"
+SRC_URI[sha256sum] = "ab20067036207aa0708608f87d6e2043ec46fad0b55b411eb1f242b8b9ab0d14"
+S = "${WORKDIR}/AppStream-${PV}"
+
+DEPENDS += " \
+    xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native \
+    gperf-native \
+    libxslt-native \
+    glib-2.0 \
+    libyaml \
+    libxml2 \
+"
+
+GIR_MESON_OPTION = 'gir'
+EXTRA_OEMESON = " \
+    -Dstemming=false \
+    -Dapidocs=false \
+"
+
+FILES_${PN} += " \
+    ${datadir}/metainfo \
+    ${datadir}/gettext \
+"
+
+BBCLASSEXTEND = "native"
+
-- 
2.20.1

[PATCH 03/41] appstream-glib: initial add 0.7.15

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../appstream-glib/appstream-glib_0.7.15.bb   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.15.bb

diff --git a/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.15.bb b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.15.bb
new file mode 100644
index 000000000..a6529e609
--- /dev/null
+++ b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.15.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata"
+HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = " \
+    gperf-native \
+    glib-2.0 \
+    gtk+3 \
+    libyaml \
+    libarchive \
+    libsoup-2.4 \
+    json-glib \
+    gdk-pixbuf \
+    freetype \
+    fontconfig \
+    libstemmer \
+"
+
+inherit meson gobject-introspection gettext bash-completion
+
+SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz"
+SRC_URI[md5sum] = "51f15108d6b9224f2ce2cf9364403b10"
+SRC_URI[sha256sum] = "7e27947de3742fcc02a96a22fb91e137a49cd55234c407a246476f3624a92a9f"
+
+EXTRA_OEMESON = " \
+    -Drpm=false \
+"
+
+FILES_${PN} += "${libdir}/asb-plugins-5"
+
+FILES_${PN}-dev += " \
+    ${datadir}/installed-tests \
+    ${datadir}/gettext \
+"
+
+BBCLASSEXTEND = "native"
-- 
2.20.1

[PATCH 04/41] yelp-xsl: initial add 3.32.1

[Andreas Müller]

This is a dependecy for upcoming yelp-tools.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/yelp/yelp-xsl_3.32.1.bb      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-xsl_3.32.1.bb

diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.32.1.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.32.1.bb
new file mode 100644
index 000000000..8c60d6168
--- /dev/null
+++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.32.1.bb
@@ -0,0 +1,18 @@
+SUMMARY = "XSL stylesheets for the yelp help browser"
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \
+    file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
+    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+"
+
+inherit gnomebase
+
+DEPENDS += "libxml2 itstool-native intltool-native"
+
+SRC_URI[archive.md5sum] = "e5b800a872b50243570552402b56f0d6"
+SRC_URI[archive.sha256sum] = "cac31bc150545d6aa0de15dce04560cbf591008d17a783a1d1d9cdd47b147f04"
+
+RDEPENDS_${PN} += "libxml2 itstool intltool"
+
+BBCLASSEXTEND = "native"
-- 
2.20.1

[PATCH 05/41] yelp-tools: initial add 3.32.0

[Andreas Müller]

It is not yet used by any recipe but will be used for help file generation
on recipes for actual gnome.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/yelp/yelp-tools_3.32.0.bb   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.0.bb

diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.0.bb
new file mode 100644
index 000000000..8ddc00393
--- /dev/null
+++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.0.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Collection of scripts and build utilities for documentation"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \
+    file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
+"
+
+inherit gnomebase
+
+DEPENDS += " \
+    libxml2-native \
+    itstool-native \
+    yelp-xsl \
+"
+
+SRC_URI[archive.md5sum] = "f65cb652553600faa8d8bddf1b0221da"
+SRC_URI[archive.sha256sum] = "bfdd40d10d837d1a170c7fe70b3436d30e6698db809d5be459ea0f7fbb69ee0c"
+
+RDEPENDS_${PN} += "yelp-xsl"
+
+BBCLASSEXTEND = "native"
-- 
2.20.1

[PATCH 06/41] yelp: initial add 3.32.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb | 37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb

diff --git a/meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb b/meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb
new file mode 100644
index 000000000..910f1ab34
--- /dev/null
+++ b/meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Help browser for the GNOME desktop"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \
+"
+
+inherit gnomebase gsettings gettext gtk-doc
+
+SRC_URI[archive.md5sum] = "f8d3463f95b636651b1879cbb0955def"
+SRC_URI[archive.sha256sum] = "99589896b2d60f66e1219285e62736168402e1a5464b58de813e59aebdf32a95"
+
+B = "${S}"
+
+DEPENDS += " \
+    libxml2-native \
+    glib-2.0-native \
+    itstool-native \
+    gtk+3 \
+    appstream-glib \
+    libxslt \
+    sqlite3 \
+    webkitgtk \
+    yelp-xsl \
+"
+
+EXTRA_OECONF = "--disable-appstream-util"
+
+do_configure_prepend() {
+    export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool
+}
+
+FILES_${PN} += " \
+    ${datadir}/metainfo \
+    ${datadir}/yelp-xsl \
+"
+
+RDEPENDS_${PN} += "yelp-xsl"
-- 
2.20.1

[PATCH 07/41] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles'

[Andreas Müller]

Gnome help file generation cannot be configured so handle files properly

* Add a new distro feature 'helpfiles':
   If set: split help file into ${PN}-help-*
   If not set: delete help files on installation
* Append ${PN}-help-.* to PACKAGES_DYNAMIC

Once accepted / applied it takes a on-line patch to add help files based on
IMAGE_LINGUAS.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/classes/gnome-help.bbclass | 71 +++++++++++++++++++++++++++
 meta-gnome/conf/layer.conf            |  3 ++
 2 files changed, 74 insertions(+)
 create mode 100644 meta-gnome/classes/gnome-help.bbclass

diff --git a/meta-gnome/classes/gnome-help.bbclass b/meta-gnome/classes/gnome-help.bbclass
new file mode 100644
index 000000000..3d45465fc
--- /dev/null
+++ b/meta-gnome/classes/gnome-help.bbclass
@@ -0,0 +1,71 @@
+# Class to pack or delete gnome help files
+# For 'helpfiles' not in DISTRO_FEATURES: delete help files
+# else pack help files in ${PN}-help-<lingua>
+
+# default location
+GNOME_HELP_FILES ??= "${datadir}/help"
+
+FILES_${PN}-help = "${datadir}/*/translations"
+
+HELPBASEPN ??= "${PN}"
+
+# Dummy to get yelp build
+PACKAGES_append = " ${HELPBASEPN}-help"
+RRECOMMENDS_${HELPBASEPN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}"
+
+do_install_append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then
+        rm -rf ${D}${datadir}/help*
+    fi
+}
+
+python gnome_do_split_help() {
+    if bb.utils.contains('DISTRO_FEATURES', 'helpfiles', False, True, d):
+        return
+
+    if (d.getVar('PACKAGE_NO_LOCALE') == '1'):
+        bb.debug(1, "package requested not splitting locales")
+        return
+
+    packages = (d.getVar('PACKAGES') or "").split()
+
+    datadir = d.getVar('datadir')
+    if not datadir:
+        bb.note("datadir not defined")
+        return
+
+    dvar = d.getVar('PKGD')
+    pn = d.getVar('HELPBASEPN')
+
+    if pn + '-help' in packages:
+        packages.remove(pn + '-help')
+
+    helpdir = os.path.join(dvar + datadir, 'help')
+
+    if not cpath.isdir(helpdir):
+        bb.debug(1, "No help files in this package")
+        return
+
+    helps = os.listdir(helpdir)
+
+    summary = d.getVar('SUMMARY') or pn
+    description = d.getVar('DESCRIPTION') or ""
+    locale_section = d.getVar('LOCALE_SECTION')
+    mlprefix = d.getVar('MLPREFIX') or ""
+    for l in sorted(helps):
+        ln = legitimize_package_name(l)
+        pkg = pn + '-help-' + ln
+        packages.append(pkg)
+        d.setVar('FILES_' + pkg, os.path.join(datadir, 'help', l))
+        d.setVar('RRECOMMENDS_' + pkg, '%syelp' % mlprefix)
+        d.setVar('SUMMARY_' + pkg, '%s - %s help' % (summary, l))
+        d.setVar('DESCRIPTION_' + pkg, '%s  This package contains language help files for the %s locale.' % (description, l))
+        if locale_section:
+            d.setVar('SECTION_' + pkg, locale_section)
+
+    d.setVar('PACKAGES', ' '.join(packages))
+
+}
+
+PACKAGESPLITFUNCS_prepend = "gnome_do_split_help "
+
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index 0b68232de..75e8d3225 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -19,3 +19,6 @@ LAYERSERIES_COMPAT_gnome-layer = "thud warrior"
 # Sanity check for meta-gnome layer.
 # Setting SKIP_META_GNOME_SANITY_CHECK to "1" would skip the bbappend files check.
 INHERIT += "sanity-meta-gnome"
+
+# Help files
+PACKAGES_DYNAMIC_append = " ^${PN}-help-.*"
-- 
2.20.1

[PATCH 08/41] evolution-data-server: uprade 3.26.6 -> 3.32.2 and rework

[Andreas Müller]

* Unfortuantely they stopped maintaing Changelog and suggest to clone the repo.
* a native variant had to be introduced for code-generator tools
* gobject-introspection builds theoretically :) Unfortunataelly qemu runs
  with 100% CPU load and never returns -> disable introspection for now
* add PACKAGECONFIGs for new dependencies - disabled by default
* give up fine grained packaging: It was broken over the years completely
  and nobody seemed to take care.
* ICU-patch does not apply anymore and it seems upstream has fixed issues
  with ICU
* add upstream-version-is-even to inherit
* rename folder containing recipe
* get rid of gconf dependency

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...nded-way-to-handle-the-icu-namespace.patch |  46 -------
 .../evolution-data-server-native.bb           |  23 ++++
 .../evolution-data-server.bb}                 | 123 +++++-------------
 .../evolution-data-server.inc                 |  16 +++
 ...keLists.txt-Remove-TRY_RUN-for-iconv.patch |  24 ++--
 ...txt-remove-CHECK_C_SOURCE_RUNS-check.patch |   0
 ...the-Novell-sample-contact-with-somet.patch |   0
 ...abi-from-the-default-C-warning-flags.patch |  29 +++++
 .../0005-call-native-helpers.patch            |  45 +++++++
 .../evolution-data-server/iconv-detect.h      |   0
 10 files changed, 158 insertions(+), 148 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
 rename meta-gnome/recipes-gnome/{eds/evolution-data-server_3.26.6.bb => evolution-data-server/evolution-data-server.bb} (15%)
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch (59%)
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch (100%)
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch (100%)
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
 create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
 rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/iconv-detect.h (100%)

diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
deleted file mode 100644
index d3b0ac673..000000000
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 May 2018 17:46:52 -0700
-Subject: [PATCH] Use recommended way to handle the icu namespace
-
-Fixes build with icu >= 61
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libedataserver/e-alphabet-index-private.cpp | 2 ++
- src/libedataserver/e-transliterator-private.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
-index d3e44f4..ddffd99 100644
---- a/src/libedataserver/e-alphabet-index-private.cpp
-+++ b/src/libedataserver/e-alphabet-index-private.cpp
-@@ -33,9 +33,11 @@
- 
- /* ICU headers */
- #include <unicode/alphaindex.h>
-+#include <unicode/ustring.h>
- 
- using icu::AlphabeticIndex;
- using icu::Locale;
-+using U_ICU_NAMESPACE::UnicodeString;
- 
- struct _EAlphabetIndex {
- 	AlphabeticIndex *priv;
-diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
-index bb15593..573446f 100644
---- a/src/libedataserver/e-transliterator-private.cpp
-+++ b/src/libedataserver/e-transliterator-private.cpp
-@@ -33,8 +33,10 @@
- 
- /* ICU headers */
- #include <unicode/translit.h>
-+#include <unicode/ustring.h>
- 
- using icu::Transliterator;
-+using U_ICU_NAMESPACE::UnicodeString;
- 
- struct _ETransliterator {
- 	Transliterator *priv;
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
new file mode 100644
index 000000000..681a61c33
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
@@ -0,0 +1,23 @@
+require ${BPN}.inc
+
+inherit native
+
+DEPENDS = "glib-2.0-native"
+
+# build native helpers
+do_compile() {
+    cd ${S}/src/camel
+    sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c
+    ${CC} -o ${B}/camel-gen-tables camel-gen-tables.c ${CFLAGS} ${LDFLAGS}
+
+    LDFLAGS_glib=`pkg-config glib-2.0 --libs`
+    CFLAGS_glib=`pkg-config glib-2.0 --cflags`
+    cd ${S}/src/addressbook/libebook-contacts
+    sed -i 's:#include "evolution-data-server-config.h"::g' gen-western-table.c
+    ${CC} -o ${B}/gen-western-table gen-western-table.c ${CFLAGS} ${CFLAGS_glib} ${LDFLAGS} ${LDFLAGS_glib}
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${B}/* ${D}${bindir}
+}
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
similarity index 15%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 1949fc7fd..5f535c1b5 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -1,51 +1,48 @@
-SUMMARY = "Evolution database backend server"
-HOMEPAGE = "http://www.gnome.org/projects/evolution/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2 & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
-                    file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
-                    file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \
-                    file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196"
+require ${BPN}.inc
 
 DEPENDS = " \
-    intltool-native gperf-native \
-    glib-2.0 gtk+3 gconf libgnome-keyring libgdata \
+    ${BPN}-native intltool-native gperf-native \
+    glib-2.0 gtk+3 libgdata \
     dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
 "
 
-inherit distro_features_check gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative
+inherit distro_features_check cmake gtk-doc gettext gobject-introspection perlnative pythonnative
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
-           file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
-           file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
-           file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
-           file://iconv-detect.h \
-           file://0004-Use-recommended-way-to-handle-the-icu-namespace.patch \
-           "
-SRC_URI[archive.md5sum] = "ae7bbf543b2c3ff79af27e0edea5d472"
-SRC_URI[archive.sha256sum] = "e43aa1847ddc02965f560261ef88d18fb8704eddaa55555bf96b884a33e510ec"
+SRC_URI += " \
+    file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
+    file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
+    file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
+    file://0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch \
+    file://0005-call-native-helpers.patch \
+    file://iconv-detect.h \
+"
 
 LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
 LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
 
+# For arm qemu-arm runs at 100% CPU load and never returns - so disable introspection for now
+GI_DATA_ENABLED="False"
+
 EXTRA_OECMAKE = " \
+    -DSYSCONF_INSTALL_DIR=${sysconfdir} \
     -DWITH_KRB5=OFF \
     -DENABLE_GOA=OFF \
     -DENABLE_UOA=OFF \
     -DENABLE_GOOGLE_AUTH=OFF \
     -DENABLE_WEATHER=OFF \
+    -DENABLE_INTROSPECTION=${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'ON', 'OFF', d)} \
     -D${LKSTRFTIME} \
     -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
 "
 
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
+PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
+PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
 
-EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \
-                --disable-nntp --disable-gtk-doc"
+# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
+# searching for openldap-libs
+PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
 
 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
@@ -55,78 +52,20 @@ do_configure_append () {
 
     # fix native perl shebang
     sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard
+
+    # fix abs path for g-ir-scanner-wrapper
+    sed  -i ${B}/build.ninja \
+        -e 's: ${bindir}/g-ir-scanner-wrapper: ${STAGING_BINDIR}/g-ir-scanner-wrapper:g'
 }
 
 do_compile_prepend() {
     export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
 }
 
+FILES_${PN} =+ " \
+    ${datadir}/dbus-1 \
+    ${datadir}/evolution-data-server-*/ui/ \
+    ${systemd_user_unitdir} \
+"
 
-PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
-             libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
-             libedataserver libedataserver-dev \
-             libedataserverui libedataserverui-dev"
-
-FILES_${PN} =+ "${systemd_user_unitdir} \
-                ${datadir}/dbus-1 \
-                ${datadir}/evolution-data-server-*/ui/"
 RDEPENDS_${PN} += "perl"
-
-FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
-FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \
-                    ${libdir}/evolution-data-server*/calendar-backends/.debug \
-                    ${libdir}/evolution-data-server*/addressbook-backends/.debug \
-                    ${libdir}/evolution-data-server*/extensions/.debug/"
-
-RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
-
-FILES_libcamel = "${libdir}/libcamel-*.so.* \
-                  ${libdir}/libcamel-provider-*.so.* \
-                  ${libdir}/evolution-data-server*/camel-providers/*.so \
-                  ${libdir}/evolution-data-server*/camel-providers/*.urls"
-FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
-                      ${libdir}/pkgconfig/camel*pc \
-                      ${libdir}/evolution-data-server*/camel-providers/*.la \
-                      ${includedir}/evolution-data-server*/camel"
-
-FILES_libebook = "${libdir}/libebook-*.so.*"
-FILES_libebook-dev = "${libdir}/libebook-1.2.so \
-                      ${libdir}/pkgconfig/libebook-*.pc \
-                      ${includedir}/evolution-data-server*/libebook/*.h"
-RRECOMMENDS_libebook = "libedata-book"
-
-FILES_libecal = "${libdir}/libecal-*.so.* \
-                 ${datadir}/evolution-data-server-1.4/zoneinfo"
-FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
-                     ${includedir}/evolution-data-server*/libecal/*.h \
-                     ${includedir}/evolution-data-server*/libical/*.h"
-RRECOMMENDS_libecal = "libedata-cal tzdata"
-
-FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
-                       ${datadir}/dbus-1/services/*.AddressBook.service \
-                       ${libdir}/libedata-book-*.so.* \
-                       ${libdir}/evolution-data-server-*/extensions/libebook*.so \
-                       ${datadir}/evolution-data-server-1.4/weather/Locations.xml"
-FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
-                           ${libdir}/pkgconfig/libedata-book-*.pc \
-                           ${libdir}/evolution-data-server-*/extensions/libebook*.la \
-                           ${includedir}/evolution-data-server-*/libedata-book"
-
-FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
-                      ${datadir}/dbus-1/services/*.Calendar.service \
-                      ${libdir}/libedata-cal-*.so.* \
-                      ${libdir}/evolution-data-server-*/extensions/libecal*.so"
-FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
-                          ${libdir}/pkgconfig/libedata-cal-*.pc \
-                          ${includedir}/evolution-data-server-*/libedata-cal \
-                          ${libdir}/evolution-data-server-*/extensions/libecal*.la"
-
-FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
-FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
-                            ${libdir}/pkgconfig/libedataserver-*.pc \
-                            ${includedir}/evolution-data-server-*/libedataserver/*.h"
-
-FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
-FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
-                              ${libdir}/pkgconfig/libedataserverui-*.pc \
-                              ${includedir}/evolution-data-server-*/libedataserverui/*.h"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
new file mode 100644
index 000000000..2ea94920b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -0,0 +1,16 @@
+SUMMARY = "Evolution database backend server"
+HOMEPAGE = "http://www.gnome.org/projects/evolution/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2 & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
+                    file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
+                    file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \
+                    file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196"
+
+inherit gnomebase
+
+SRC_URI[archive.md5sum] = "965648316c7cee06f49878eceed5da01"
+SRC_URI[archive.sha256sum] = "7ea7491065fd0382f2268cf6bf95331a75dfda587d5940deb47f9e74be1ab3c9"
+PV = "3.32.2"
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
similarity index 59%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
index a821a14ab..e8c6d6a76 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
@@ -1,6 +1,6 @@
 From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 19 Dec 2017 16:37:20 +0100
+Date: Sun, 31 Mar 2019 18:11:55 +0200
 Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -13,20 +13,24 @@ Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
+ CMakeLists.txt | 11 -----------
+ 1 file changed, 11 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8d07772..a2396f2 100644
+index 1672daf..0b3e4e0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV)
+@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV)
+ 	message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
  endif(NOT HAVE_ICONV)
  
- set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
--CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
- unset(CMAKE_REQUIRED_LIBRARIES)
- 
+-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
+-file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
+-CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\"
+-		     #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
+-unset(_binary_dir_with_separator)
+-unset(CMAKE_REQUIRED_LIBRARIES)
+-
 -if(NOT _correct_iconv)
 -	message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
 -endif(NOT _correct_iconv)
@@ -35,5 +39,5 @@ index 8d07772..a2396f2 100644
  # Backtraces for debugging
  # ******************************
 -- 
-2.14.3
+2.20.1
 
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
new file mode 100644
index 000000000..8cfc1f8d6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
@@ -0,0 +1,29 @@
+From 3cfeb3c7f458c6fe40c67cea43987b45cf6cbeaf Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 14 Mar 2019 14:16:56 +0100
+Subject: [PATCH] I#94 - Remove -Wabi from the default C++ warning flags
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/94
+
+Upstream-Status: Applied [1]
+
+[1] https://gitlab.gnome.org/GNOME/evolution-data-server/commit/3cfeb3c7f458c6fe40c67cea43987b45cf6cbeaf
+---
+ cmake/modules/SetupBuildFlags.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cmake/modules/SetupBuildFlags.cmake b/cmake/modules/SetupBuildFlags.cmake
+index 4c6154129..284445455 100644
+--- a/cmake/modules/SetupBuildFlags.cmake
++++ b/cmake/modules/SetupBuildFlags.cmake
+@@ -56,7 +56,6 @@ macro(setup_build_flags _maintainer_mode)
+ 
+ 	list(APPEND proposed_cxx_flags
+ 		${proposed_flags}
+-		-Wabi
+ 		-Wnoexcept
+ 	)
+ 
+-- 
+2.20.1
+
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
new file mode 100644
index 000000000..e320f6342
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
@@ -0,0 +1,45 @@
+From 9c375e3fcf8ff778a5010a07a7da4b6a58adec7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 31 Mar 2019 19:11:31 +0200
+Subject: [PATCH] call native helpers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/addressbook/libebook-contacts/CMakeLists.txt | 2 +-
+ src/camel/CMakeLists.txt                         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt
+index e9e3259..e749d1b 100644
+--- a/src/addressbook/libebook-contacts/CMakeLists.txt
++++ b/src/addressbook/libebook-contacts/CMakeLists.txt
+@@ -25,7 +25,7 @@ target_link_libraries(gen-western-table
+ 
+ add_custom_command(
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
+-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
++	COMMAND gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
+ 	DEPENDS gen-western-table e-name-western-tables.h.in
+ )
+ 
+diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
+index be626a8..14ac8b8 100644
+--- a/src/camel/CMakeLists.txt
++++ b/src/camel/CMakeLists.txt
+@@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC
+ 
+ add_custom_command(
+ 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
+-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
++	COMMAND camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
+ 	DEPENDS camel-gen-tables
+ )
+ 
+-- 
+2.20.1
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
similarity index 100%
rename from meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
-- 
2.20.1

[PATCH 09/41] gnome-menus3: upgrade 3.10.1 -> 3.32.0

[Andreas Müller]

* No Changelog avalailable - they suggest to clone the repo :(
* they use gettext instead of intltool
* gconf is not required in DEPENDS - modern gnome does not use gconf anymore
* add upstream-version-is-even to inherit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...{gnome-menus3_3.10.1.bb => gnome-menus3_3.32.0.bb} | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-menus/{gnome-menus3_3.10.1.bb => gnome-menus3_3.32.0.bb} (41%)

diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb
similarity index 41%
rename from meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
rename to meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb
index 647ae914f..b6d212a27 100644
--- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb
@@ -4,18 +4,15 @@ LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
-DEPENDS = "python libxml2 gconf popt gtk+3 intltool-native gnome-common-native"
+DEPENDS = "python libxml2 popt gtk+3 gnome-common-native"
 
-inherit distro_features_check gnomebase pkgconfig python-dir pythonnative gobject-introspection
+inherit distro_features_check gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 BPN = "gnome-menus"
 
-SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081"
-SRC_URI[sha256sum] = "46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71"
+SRC_URI[archive.md5sum] = "4262208c13f266d9ada7d356aada9e1b"
+SRC_URI[archive.sha256sum] = "c850c64b2074265fe59e099a340b8689cf3dd4658dc9feddd2ab5e95f1a74b74"
 
 FILES_${PN} += "${datadir}/desktop-directories/"
-- 
2.20.1

[PATCH 10/41] gnome-bluetooth: upgrade 3.18.2 -> 3.32.1

[Andreas Müller]

* move to meson-build
* they do not maintain a changelog but suggest to clone the repo

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...uetooth_3.18.2.bb => gnome-bluetooth_3.32.1.bb} | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-bluetooth/{gnome-bluetooth_3.18.2.bb => gnome-bluetooth_3.32.1.bb} (48%)

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.32.1.bb
similarity index 48%
rename from meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb
index 8cfd65af3..181cb1f68 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb
@@ -6,14 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 SECTION = "x11/gnome"
 
-DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native gnome-common-native \
+DEPENDS = " \
+    udev gtk+3 libnotify libcanberra \
     ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)} \
 "
 
-inherit gnomebase gtk-icon-cache gobject-introspection distro_features_check
-REQUIRED_DISTRO_FEATURES = "x11"
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gtk-icon-cache gobject-introspection gettext distro_features_check
 
-SRC_URI[archive.md5sum] = "75d09c924468ec0c687f9ab3acf7f113"
-SRC_URI[archive.sha256sum] = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398"
+REQUIRED_DISTRO_FEATURES = "x11"
 
-FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/"
+SRC_URI[archive.md5sum] = "5b3d66f564a5067ea154750cdb6d850d"
+SRC_URI[archive.sha256sum] = "6441cafd313af94fba28b701698074f97d693b9023788a74e8e6f16f817ba1aa"
-- 
2.20.1

[PATCH 11/41] glade3: upgrade 3.8.5 -> 3.8.6

[Andreas Müller]

* online help support was added - ship it optionally
* prettify recipe a bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{glade3_3.8.5.bb => glade3_3.8.6.bb}      | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)
 rename meta-xfce/recipes-devtools/glade/{glade3_3.8.5.bb => glade3_3.8.6.bb} (42%)

diff --git a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb b/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
similarity index 42%
rename from meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
rename to meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
index c3da3e9b9..8ed30944b 100644
--- a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb
+++ b/meta-xfce/recipes-devtools/glade/glade3_3.8.6.bb
@@ -4,20 +4,15 @@ LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
                     file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
-DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native"
+DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native yelp-tools-native"
 
-inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache
+inherit gnomebase gnome-help distro_features_check pythonnative gtk-icon-cache
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
-           file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \
-           file://0002-fix-gcc-6-build.patch \
-           file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \
-           "
-SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f"
-SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735"
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-FILES_${PN} += "${datadir}/icons"
+SRC_URI += " \
+    file://0002-fix-gcc-6-build.patch \
+    file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \
+"
+SRC_URI[archive.md5sum] = "c16756952967f7316d64593124761027"
+SRC_URI[archive.sha256sum] = "aaeeebffaeb3068fb23757a2eede46adeb4c7cecc740feed7654e065491f5449"
-- 
2.20.1

[PATCH 12/41] gnome-bluetooth: add upstream-version-is-even to inherit

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb
index 181cb1f68..e6565ee09 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.32.1.bb
@@ -13,7 +13,7 @@ DEPENDS = " \
 
 GNOMEBASEBUILDCLASS = "meson"
 
-inherit gnomebase gtk-icon-cache gobject-introspection gettext distro_features_check
+inherit gnomebase gtk-icon-cache gobject-introspection gettext distro_features_check upstream-version-is-even
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-- 
2.20.1

[PATCH 13/41] gtksourceview4: upgrade 4.2.0 -> 4.3.1

[Andreas Müller]

This is an enhancement release [1].

* they moved to meson build
* translation is done by gettext only

[1] http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.3/gtksourceview-4.3.1.news

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...sourceview4_4.2.0.bb => gtksourceview4_4.3.1.bb} | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
 rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview4_4.2.0.bb => gtksourceview4_4.3.1.bb} (65%)

diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.3.1.bb
similarity index 65%
rename from meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb
rename to meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.3.1.bb
index 10deaffb8..a81bfeeef 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.2.0.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.3.1.bb
@@ -10,12 +10,17 @@ PNAME = "gtksourceview"
 
 S = "${WORKDIR}/${PNAME}-${PV}"
 
-inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection vala
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.2/${PNAME}-${PV}.tar.xz"
-SRC_URI[md5sum] = "c9e6913c2fd30ca2fcdd71482faf8b99"
-SRC_URI[sha256sum] = "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675"
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.3/${PNAME}-${PV}.tar.xz"
+SRC_URI[md5sum] = "53ecc9719807e5c95934e9a593565ef0"
+SRC_URI[sha256sum] = "b8ef118786f4e5c1ee20b986ac3914c60064a11acdee73645be3adb3543a2a5d"
+
+GIR_MESON_OPTION = 'gir'
+GTKDOC_MESON_OPTION = "gtk_doc"
 
 FILES_${PN} += "${datadir}/gtksourceview-4"
-- 
2.20.1

[PATCH 14/41] gtksourceview3: upgrade 3.24.10 -> 3.24.11

[Andreas Müller]

* this an improvement and bugfix release [1]
* add upstream-version-is-even

[1] http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/gtksourceview-3.24.11.news

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...{gtksourceview3_3.24.10.bb => gtksourceview3_3.24.11.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview3_3.24.10.bb => gtksourceview3_3.24.11.bb} (75%)

diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
similarity index 75%
rename from meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb
rename to meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
index d91e479d8..f7884930c 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.10.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
@@ -10,12 +10,12 @@ PNAME = "gtksourceview"
 
 S = "${WORKDIR}/${PNAME}-${PV}"
 
-inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection
+inherit gnomebase lib_package gettext distro_features_check gtk-doc gobject-introspection upstream-version-is-even
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz"
-SRC_URI[md5sum] = "e43337d17c40eae440a76630db76c54e"
-SRC_URI[sha256sum] = "ab5406cdd0bdcf66afcd52b1e048a2f43c0f3ab391644ee30d9ac419b93cd59b"
+SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67"
+SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd"
 
 FILES_${PN} += " ${datadir}/gtksourceview-3.0"
-- 
2.20.1

[PATCH 15/41] mousepad: move to gtk3

[Andreas Müller]

At the time of creation there was no gtksourceview3. That was a blocker
to use gtk3. gtksourceview3 was added long ago.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb
index d122bfe37..67c49930b 100644
--- a/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb
+++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb
@@ -6,14 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 # intltool to provide intltool.m4 with AC_PROG_INTLTOOL
 # xfce4-dev-tools-native for XDT_I18N macro and more importantly XDT_CHECK_OPTIONAL_PACKAGE
 # which fixes mousepad/Makefile.am:72: error: HAVE_DBUS does not appear in AM_CONDITIONAL
-DEPENDS = "gtk+ dbus dbus-glib gtksourceview2 intltool-native xfce4-dev-tools-native"
+DEPENDS = "gtk+3 dbus dbus-glib gtksourceview3 intltool-native xfce4-dev-tools-native"
 
 inherit xfce-app gsettings
 
 SRC_URI[md5sum] = "fb85c23bcb096a46aee9ec22b4e4fdf5"
 SRC_URI[sha256sum] = "39a7379b929d964665299c385b2cf705e32e8760698ccc34f91c990bb733518b"
 
-# we have no gtksourceview 3.x around
-EXTRA_OECONF = "--disable-gtk3"
-
 FILES_${PN} += "${datadir}/glib-2.0/schemas"
-- 
2.20.1

[PATCH 16/41] network-manager-applet: port to meson build

[Andreas Müller]

Thanks to meson being more precise / better readable we can get rid of old crap
e.g useless dependency on libgnome-keyring.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../network-manager-applet_1.8.20.bb          | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
index 7181f5ecf..45f552a88 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
@@ -3,32 +3,25 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \
-           gconf libgnome-keyring iso-codes nss \
+           gconf iso-codes nss \
            intltool-native \
 "
 
-GNOMEBASEBUILDCLASS = "autotools-brokensep"
-inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection
+GNOMEBASEBUILDCLASS = "meson"
+inherit distro_features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI[archive.md5sum] = "06aafa851762146034351aa72ebb23d4"
 SRC_URI[archive.sha256sum] = "050dbb155566c715239dc0378844d8beed10954e64e71014ecef8ca912df34ec"
 
-PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager"
-PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info"
 PACKAGECONFIG ??= ""
+PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr"
+PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager"
+PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info"
+PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux"
 
-EXTRA_OECONF = " \
-    --without-selinux \
-"
-
-do_configure_append() {
-    # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
-    for i in $(find ${B} -name "Makefile") ; do
-        sed -i -e s%-Werror[^[:space:]]*%%g $i
-    done
-}
+GTKDOC_MESON_OPTION = "gtk_doc"
 
 # gobject-introspection related
 GI_DATA_ENABLED_libc-musl = "False"
-- 
2.20.1

[PATCH 17/41] network-manager-applet: cleanup

[Andreas Müller]

* remove unnecessary dependencies gconf/intltool-native
* gobject-introspection builds fine for musl

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../network-manager-applet_1.8.20.bb                | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
index 45f552a88..d8246e96c 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb
@@ -2,10 +2,7 @@ SUMMARY = "GTK+ applet for NetworkManager"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \
-           gconf iso-codes nss \
-           intltool-native \
-"
+DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib iso-codes nss"
 
 GNOMEBASEBUILDCLASS = "meson"
 inherit distro_features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection
@@ -23,9 +20,6 @@ PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 
-# gobject-introspection related
-GI_DATA_ENABLED_libc-musl = "False"
-
 do_compile_prepend() {
     export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs"
 }
@@ -38,8 +32,3 @@ FILES_${PN} += " \
     ${datadir}/libnma/wifi.ui \
     ${datadir}/metainfo \
 "
-
-# musl builds generate gir files which otherwise go un-packaged
-FILES_${PN}-dev += " \
-    ${datadir}/gir-1.0 \
-"
-- 
2.20.1

[PATCH 18/41] abiword: remove

[Andreas Müller]

seems develompment has stopped - last release was 2016. I had good times
with it so I added it to meta office.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...1-Bug-13770-Require-C-11-from-now-on.patch | 180 ------------------
 ...s-Makefile.am-remove-uncomplete-opti.patch |  39 ----
 .../recipes-gnome/abiword/abiword_3.0.2.bb    | 142 --------------
 3 files changed, 361 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch
 delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
 delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb

diff --git a/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch b/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch
deleted file mode 100644
index 3731a23f1..000000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From f6d0dc338fe867c1b064682ae7f15bffe019b306 Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Tue, 12 Apr 2016 02:55:47 +0000
-Subject: [PATCH] Bug 13770 - Require C++11 from now on.
-
-git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35197 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
-
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- ax_cxx_compile_stdcxx_11.m4  | 133 +++++++++++++++++++++++++++++++++++
- configure.ac                 |   1 +
- src/wp/ap/gtk/ap_UnixApp.cpp |   2 +-
- 3 files changed, 135 insertions(+), 1 deletion(-)
- create mode 100644 ax_cxx_compile_stdcxx_11.m4
-
-diff --git a/ax_cxx_compile_stdcxx_11.m4 b/ax_cxx_compile_stdcxx_11.m4
-new file mode 100644
-index 0000000..af37acd
---- /dev/null
-+++ b/ax_cxx_compile_stdcxx_11.m4
-@@ -0,0 +1,133 @@
-+# ============================================================================
-+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-+# ============================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
-+#
-+# DESCRIPTION
-+#
-+#   Check for baseline language coverage in the compiler for the C++11
-+#   standard; if necessary, add switches to CXXFLAGS to enable support.
-+#
-+#   The first argument, if specified, indicates whether you insist on an
-+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-+#   -std=c++11).  If neither is specified, you get whatever works, with
-+#   preference for an extended mode.
-+#
-+#   The second argument, if specified 'mandatory' or if left unspecified,
-+#   indicates that baseline C++11 support is required and that the macro
-+#   should error out if no mode with that support is found.  If specified
-+#   'optional', then configuration proceeds regardless, after defining
-+#   HAVE_CXX11 if and only if a supporting mode is found.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved. This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 3
-+
-+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
-+  template <typename T>
-+    struct check
-+    {
-+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+    };
-+
-+    typedef check<check<bool>> right_angle_brackets;
-+
-+    int a;
-+    decltype(a) b;
-+
-+    typedef check<int> check_type;
-+    check_type c;
-+    check_type&& cr = static_cast<check_type&&>(c);
-+
-+    auto d = a;
-+])
-+
-+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
-+  m4_if([$1], [], [],
-+        [$1], [ext], [],
-+        [$1], [noext], [],
-+        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
-+  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
-+        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
-+        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
-+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
-+  AC_LANG_PUSH([C++])dnl
-+  ac_success=no
-+  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
-+  ax_cv_cxx_compile_cxx11,
-+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+    [ax_cv_cxx_compile_cxx11=yes],
-+    [ax_cv_cxx_compile_cxx11=no])])
-+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
-+    ac_success=yes
-+  fi
-+
-+  m4_if([$1], [noext], [], [dnl
-+  if test x$ac_success = xno; then
-+    for switch in -std=gnu++11 -std=gnu++0x; do
-+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-+                     $cachevar,
-+        [ac_save_CXXFLAGS="$CXXFLAGS"
-+         CXXFLAGS="$CXXFLAGS $switch"
-+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+          [eval $cachevar=yes],
-+          [eval $cachevar=no])
-+         CXXFLAGS="$ac_save_CXXFLAGS"])
-+      if eval test x\$$cachevar = xyes; then
-+        CXXFLAGS="$CXXFLAGS $switch"
-+        ac_success=yes
-+        break
-+      fi
-+    done
-+  fi])
-+
-+  m4_if([$1], [ext], [], [dnl
-+  if test x$ac_success = xno; then
-+    for switch in -std=c++11 -std=c++0x; do
-+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
-+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
-+                     $cachevar,
-+        [ac_save_CXXFLAGS="$CXXFLAGS"
-+         CXXFLAGS="$CXXFLAGS $switch"
-+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
-+          [eval $cachevar=yes],
-+          [eval $cachevar=no])
-+         CXXFLAGS="$ac_save_CXXFLAGS"])
-+      if eval test x\$$cachevar = xyes; then
-+        CXXFLAGS="$CXXFLAGS $switch"
-+        ac_success=yes
-+        break
-+      fi
-+    done
-+  fi])
-+  AC_LANG_POP([C++])
-+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
-+    if test x$ac_success = xno; then
-+      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
-+    fi
-+  else
-+    if test x$ac_success = xno; then
-+      HAVE_CXX11=0
-+      AC_MSG_NOTICE([No compiler with C++11 support was found])
-+    else
-+      HAVE_CXX11=1
-+      AC_DEFINE(HAVE_CXX11,1,
-+                [define if the compiler supports basic C++11 syntax])
-+    fi
-+
-+    AC_SUBST(HAVE_CXX11)
-+  fi
-+])
-diff --git a/configure.ac b/configure.ac
-index 48228be..f7be7de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -131,6 +131,7 @@ win_pkgs="$enchant_req"
- 
- AC_PROG_CC
- AC_PROG_CXX
-+AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
- #AC_PROG_OBJC
- AC_PROG_INSTALL
- # For libtool 1.5.x compatability (AC_PROG_LIBTOOL is deprecated version of LT_INIT)
-diff --git a/src/wp/ap/gtk/ap_UnixApp.cpp b/src/wp/ap/gtk/ap_UnixApp.cpp
-index 061a304..260f8e5 100644
---- a/src/wp/ap/gtk/ap_UnixApp.cpp
-+++ b/src/wp/ap/gtk/ap_UnixApp.cpp
-@@ -863,7 +863,7 @@ static bool is_so (const char *file) {
- 	if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename
- 		return false;
- 	const char *suffix = file+(len-3);
--	if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
-+	if(0 == strcmp (suffix, "." G_MODULE_SUFFIX))
- 		return true;
- 	return false;
- }
diff --git a/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch b/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
deleted file mode 100644
index 0dff1411d..000000000
--- a/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c646159ce817506131b58fdab1cdc1cd6364df7a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 7 Feb 2016 21:45:20 +0100
-Subject: [PATCH] plugins/aiksaurus/Makefile.am: remove uncomplete options
- WITH_BUILTIN_AIKSAURUS_GTK
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* with gtk2 we won't use it
-* it is missing in configure.ac causing
-
-| plugins/aiksaurus/Makefile.am:5: error: WITH_BUILTIN_AIKSAURUS_GTK does not appear in AM_CONDITIONAL
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- plugins/aiksaurus/Makefile.am | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am
-index d402c58..1034e2a 100644
---- a/plugins/aiksaurus/Makefile.am
-+++ b/plugins/aiksaurus/Makefile.am
-@@ -2,10 +2,6 @@ SUBDIRS =
- 
- if TOOLKIT_GTK
- 
--if WITH_BUILTIN_AIKSAURUS_GTK
--SUBDIRS += aiksaurusgtk3
--platform_lib = aiksaurusgtk3/libAiksaurusGtk3.la
--endif
- 
- endif
- 
--- 
-2.5.0
-
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb
deleted file mode 100644
index 36b056fdd..000000000
--- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb
+++ /dev/null
@@ -1,142 +0,0 @@
-SUMMARY = "AbiWord is free word processing program similar to Microsoft(r) Word"
-HOMEPAGE = "http://www.abiword.org"
-SECTION = "x11/office"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
-DEPENDS  = " \
-    perl-native \
-    gtk+ \
-    gtkmathview \
-    wv \
-    fribidi \
-    jpeg \
-    libpng \
-    librsvg \
-    libwmf-native \
-    asio \
-    evolution-data-server \
-    libxslt \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \
-"
-RDEPENDS_${PN}_append_libc-glibc = " \
-    glibc-gconv-ibm850 glibc-gconv-cp1252 \
-    glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \
-"
-RCONFLICTS_${PN} = "${PN}-embedded"
-
-SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
-           file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \
-           file://0001-Bug-13770-Require-C-11-from-now-on.patch \
-           "
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
-
-SRC_URI[md5sum] = "cda6dd58c747c133b421cc7eb18f5796"
-SRC_URI[sha256sum] = "afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522"
-
-#want 3.x from 3.x.y for the installation directory
-SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
-
-inherit distro_features_check autotools-brokensep pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-PACKAGECONFIG ??= " \
-    collab-backend-xmpp collab-backend-tcp \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \
-"
-PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
-PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
-PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth"
-PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"
-PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls"
-PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control"
-PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib"
-
-EXTRA_OECONF = " --disable-static  \
-                 --enable-plugins \
-                 --enable-clipart \
-                 --enable-templates \
-                 --without-gnomevfs \
-                 --with-gtk2 \
-                 --with-libwmf-config=${STAGING_DIR} \
-"
-
-LDFLAGS += "-lgmodule-2.0"
-
-do_compile() {
-    cd goffice-bits2
-    make goffice-paths.h
-    make libgoffice.la
-    cd ${B}
-    oe_runmake
-}
-
-PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
-
-FILES_${PN} += " \
-                ${libdir}/lib${PN}-*.so \
-                ${datadir}/mime-info \
-                ${datadir}/icons/* \
-                ${datadir}/${PN}-${SHRT_VER}/glade \
-                ${datadir}/${PN}-${SHRT_VER}/scripts \
-                ${datadir}/${PN}-${SHRT_VER}/system.profile-en \
-                ${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \
-                ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \
-                ${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \
-                ${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \
-                ${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \
-                ${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \
-                ${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \
-                ${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \
-                ${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \
-                ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \
-                ${datadir}/${PN}-${SHRT_VER}/certs \
-                ${datadir}/${PN}-${SHRT_VER}/ui \
-                ${datadir}/${PN}-${SHRT_VER}/xsl* \
-                ${datadir}/${PN}-${SHRT_VER}/mime-info \
-                ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \
-"
-
-# don't steal /usr/lib/libabiword-3.0.so from ${PN}
-# in this case it's needed in ${PN}
-FILES_${PN}-dev = " \
-                  ${includedir} \
-                  ${libdir}/pkgconfig \
-                  ${libdir}/${PN}*.la \
-                  ${libdir}/lib${PN}*.la \
-                  ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \
-"
-FILES_${PN}-dbg += "${libdir}/${PN}-${SHRT_VER}/plugins/.debug"
-FILES_${PN}-doc += "${datadir}/${PN}-*/readme*"
-
-FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/strings"
-FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*"
-FILES_${PN}-clipart        += "${datadir}/${PN}-${SHRT_VER}/clipart"
-FILES_${PN}-strings        += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
-FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
-FILES_${PN}-templates      += "${datadir}/${PN}-${SHRT_VER}/templates"
-
-PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*"
-
-python populate_packages_prepend () {
-    abiword_libdir    = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins')
-    do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
-
-    metapkg = "abiword-meta"
-    d.setVar('ALLOW_EMPTY_' + metapkg, "1")
-    d.setVar('FILES_' + metapkg, "")
-    blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
-    metapkg_rdepends = []
-    packages = d.getVar('PACKAGES').split()
-    for pkg in packages[1:]:
-        if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
-            print("Modifying %s" % pkg)
-            metapkg_rdepends.append(pkg)
-    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
-    d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package')
-    packages.append(metapkg)
-    d.setVar('PACKAGES', ' '.join(packages))
-}
-
-FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt"
-- 
2.20.1

[PATCH 19/41] evince: upgrade 3.28.2 -> 3.32.0

[Andreas Müller]

Add upstream-version-is-even to inherit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...-format-attribute-to-_synctex_malloc.patch | 12 ++--
 .../evince/0001-help-remove-YELP-macro.patch  | 24 --------
 ...vDocumentModel-get-type-function-dec.patch | 33 ----------
 ...02-add-a-formatting-attribute-check.patch} |  0
 .../{evince_3.28.2.bb => evince_3.32.0.bb}    | 60 ++++++++-----------
 5 files changed, 30 insertions(+), 99 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
 delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
 rename meta-gnome/recipes-gnome/evince/evince/{0001-add-a-formatting-attribute-check.patch => 0002-add-a-formatting-attribute-check.patch} (100%)
 rename meta-gnome/recipes-gnome/evince/{evince_3.28.2.bb => evince_3.32.0.bb} (32%)

diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch b/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
index de739c5b3..32ca073f9 100644
--- a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
+++ b/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
@@ -11,17 +11,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/cut-n-paste/synctex/synctex_parser_utils.c b/cut-n-paste/synctex/synctex_parser_utils.c
-index f8a9f6f..9459b2d 100644
+index 08053f0..0519b38 100644
 --- a/cut-n-paste/synctex/synctex_parser_utils.c
 +++ b/cut-n-paste/synctex/synctex_parser_utils.c
-@@ -78,6 +78,7 @@ void *_synctex_malloc(size_t size) {
- 	return (void *)ptr;
+@@ -136,6 +136,7 @@ int _synctex_log(int level, const char * prompt, const char * reason,va_list arg
+ 	return result;
  }
  
 +__attribute__((__format__ (__printf__, 1, 0)))
  int _synctex_error(const char * reason,...) {
- 	va_list arg;
- 	int result;
+     va_list arg;
+     int result;
 -- 
-2.12.2
+2.20.1
 
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
deleted file mode 100644
index 592f46606..000000000
--- a/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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-libview-Remove-EvDocumentModel-get-type-function-dec.patch b/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
deleted file mode 100644
index dcc4a4e9c..000000000
--- a/meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0cdce687d3edfa5ac0fd19539ba1815d039026d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
-Date: Fri, 7 Sep 2018 22:34:29 +0200
-Subject: [PATCH] libview: Remove EvDocumentModel get type function declaration
-
-The EvDocumentModel class declares the `ev_document_model_get_type`
-function as part of the `GObject` boilerplate code.
-
-However, this declaration is not necessary and also causes a warning
-when introspection data file, `EvinceView-3.0.gir`, is generated.
-
-Upstream-Status: Applied [1]
-
-
----
- libview/ev-document-model.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libview/ev-document-model.h b/libview/ev-document-model.h
-index 784e27d6..6a99e43a 100644
---- a/libview/ev-document-model.h
-+++ b/libview/ev-document-model.h
-@@ -54,7 +54,6 @@ typedef enum {
- 	EV_PAGE_LAYOUT_AUTOMATIC
- } EvPageLayout;
- 
--GType            ev_document_model_get_type          (void) G_GNUC_CONST;
- EvDocumentModel *ev_document_model_new               (void);
- EvDocumentModel *ev_document_model_new_with_document (EvDocument      *document);
- 
--- 
-2.20.1
-
diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch b/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/evince/evince/0001-add-a-formatting-attribute-check.patch
rename to meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch
diff --git a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb b/meta-gnome/recipes-gnome/evince/evince_3.32.0.bb
similarity index 32%
rename from meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
rename to meta-gnome/recipes-gnome/evince/evince_3.32.0.bb
index d2885906f..e4d0d69be 100644
--- a/meta-gnome/recipes-gnome/evince/evince_3.28.2.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_3.32.0.bb
@@ -2,48 +2,43 @@ 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 = "gtk+3 libsecret ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native"
+DEPENDS = " \
+    gnome-common-native \
+    itstool-native \
+    yelp-tools-native \
+    appstream-glib \
+    gtk+3 \
+    gspell \
+    libsecret \
+    poppler \
+    gstreamer1.0-plugins-base \
+    orc \
+    adwaita-icon-theme \
+    ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \
+"
 
-inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check systemd
+inherit gnomebase gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext distro_features_check
 
-SRC_URI = " \
-    ${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
-    file://0001-help-remove-YELP-macro.patch \
+SRC_URI[archive.md5sum] = "b7402d14e12ea09da1490f2e624eb6de"
+SRC_URI[archive.sha256sum] = "f0d977216466ed2f5a6de64476ef7113dc7c7c9832336f1ff07f3c03c5324c40"
+SRC_URI += " \
     file://0001-Add-format-attribute-to-_synctex_malloc.patch \
-    file://0001-add-a-formatting-attribute-check.patch \
-    file://0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch \
+    file://0002-add-a-formatting-attribute-check.patch \
 "
-SRC_URI[archive.md5sum] = "66aa1766eaaa37536e48def11a0e67a3"
-SRC_URI[archive.sha256sum] = "0955d22d85c9f6d322b6cbb464f1cc4c352db619017ec95dad4cc5c3440f73e1"
 
-EXTRA_OECONF = "--enable-thumbnailer"
+EXTRA_OECONF = " \
+    --enable-thumbnailer \
+    --without-systemduserunitdir \
+"
 
 do_compile_prepend() {
     export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs"
 }
 
-
-do_install_append() {
-    install -d ${D}${datadir}/pixmaps
-    install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/
-    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}
-    then
-        install -d ${D}${systemd_unitdir}/system
-        mv ${D}${systemd_user_unitdir}/evince.service ${D}${systemd_system_unitdir}/evince.service
-    else
-        rm -rf ${D}${libdir}/systemd/user/evince.service
-    fi
-    rmdir --ignore-fail-on-non-empty ${D}${systemd_user_unitdir}
-    rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd
-    rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}
-}
-
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
 PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin,"
 
-SYSTEMD_SERVICE_${PN} = "evince.service"
-
 RDEPENDS_${PN} += "glib-2.0-utils"
 RRECOMMMENDS_${PN} = "adwaita-icon-theme"
 
@@ -53,13 +48,6 @@ PACKAGES =+ "${PN}-browser-plugin"
 FILES_${PN} += "${datadir}/dbus-1 \
                 ${datadir}/metainfo \
                 ${datadir}/thumbnailers \
-                ${systemd_unitdir}/systemd/user/evince.service \
-               "
-FILES_${PN}-dbg += "${libdir}/*/*/.debug \
-                    ${libdir}/*/*/*/.debug"
-FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \
-                    ${libdir}/evince/*/backends/*.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.20.1

[PATCH 20/41] exiv2: initial add 0.27.0

[Andreas Müller]

* exiv2 0.27 lives in several layers currently:
  meta-webos-ports / meta-luneos / meta-qt5-extra
* Now meta-gnome will require it for nautilus -> gexiv2
  => move it up in layer hierarchy
* This recipe was taken from meta-qt5-extra
* Patches were taken from Fedora before they moved to 0.27.1 [1]
* From my experience as soon as upstream will create a successor of
  0.27.1 they move tarballs from builds [2] -> archive [3]
  To avoid missing sources let's stick on 0.27.0.

[1] https://src.fedoraproject.org/rpms/exiv2/tree/master
[2] https://exiv2.org/builds/
[3] https://www.exiv2.org/archive.html

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-support/exiv2/exiv2.bb        |  26 ++++
 ...es-only-installed-with-the-exiv2-app.patch |  41 ++++++
 ...nings-about-missing-PDB-files-in-3rd.patch |  64 +++++++++
 ...-to-exiv2-xmp-to-avoid-name-conflict.patch |  82 ++++++++++++
 ...nstall-header-files-without-globbing.patch | 111 ++++++++++++++++
 ...t-installation-dir-for-generated-doc.patch |  28 ++++
 ...t-installation-dir-for-cmake-config-.patch | 124 ++++++++++++++++++
 ...psdk-Build-with-DBanAllEntityUsage-1.patch |  34 +++++
 ...compile-warnings-in-ExpatAdapter.cpp.patch |  31 +++++
 ...e-for-being-compatible-with-more-dis.patch |  27 ++++
 ...ate-install-exiv2ConfigVersion.cmake.patch |  50 +++++++
 11 files changed, 618 insertions(+)
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2.bb
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0001-cmake-man-pages-only-installed-with-the-exiv2-app.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0002-cmake-ignore-warnings-about-missing-PDB-files-in-3rd.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0003-cmake-Rename-xmp-to-exiv2-xmp-to-avoid-name-conflict.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0004-cmake-Install-header-files-without-globbing.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0005-cmake-Use-correct-installation-dir-for-generated-doc.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0006-cmake-Use-correct-installation-dir-for-cmake-config-.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0007-xmpsdk-Build-with-DBanAllEntityUsage-1.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0008-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0009-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
 create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0010-create-install-exiv2ConfigVersion.cmake.patch

diff --git a/meta-oe/recipes-support/exiv2/exiv2.bb b/meta-oe/recipes-support/exiv2/exiv2.bb
new file mode 100644
index 000000000..26aef7163
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
+
+DEPENDS = "zlib expat"
+
+SRC_URI = " \
+    https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz \
+    file://0001-cmake-man-pages-only-installed-with-the-exiv2-app.patch \
+    file://0002-cmake-ignore-warnings-about-missing-PDB-files-in-3rd.patch \
+    file://0003-cmake-Rename-xmp-to-exiv2-xmp-to-avoid-name-conflict.patch \
+    file://0004-cmake-Install-header-files-without-globbing.patch \
+    file://0005-cmake-Use-correct-installation-dir-for-generated-doc.patch \
+    file://0006-cmake-Use-correct-installation-dir-for-cmake-config-.patch \
+    file://0007-xmpsdk-Build-with-DBanAllEntityUsage-1.patch \
+    file://0008-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch \
+    file://0009-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch \
+    file://0010-create-install-exiv2ConfigVersion.cmake.patch \
+"
+SRC_URI[md5sum] = "57d58c9cef127c5fa24bf0e1fbbd1f8c"
+SRC_URI[sha256sum] = "ee88bc81539b73c65010651785d094fad0b39760a424b3c16c17e1856cfef2d7"
+PV = "0.27.0"
+S = "${WORKDIR}/${BPN}-${PV}-Source"
+
+inherit cmake gettext
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0001-cmake-man-pages-only-installed-with-the-exiv2-app.patch b/meta-oe/recipes-support/exiv2/exiv2/0001-cmake-man-pages-only-installed-with-the-exiv2-app.patch
new file mode 100644
index 000000000..889e8f877
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0001-cmake-man-pages-only-installed-with-the-exiv2-app.patch
@@ -0,0 +1,41 @@
+From d1c609b320eadbe7089b0482353ffef576813ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
+Date: Tue, 18 Dec 2018 08:05:16 +0100
+Subject: [PATCH 22/70] cmake: man pages only installed with the exiv2 app
+
+---
+ CMakeLists.txt     | 3 ---
+ src/CMakeLists.txt | 7 +------
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8dfd9d97..e98cfac1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,6 +106,3 @@ configure_file(cmake/exiv2.pc.in exiv2.pc @ONLY)
+ install(FILES ${CMAKE_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ include(cmake/printSummary.cmake)
+-
+-# That's all Folks!
+-##
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ca24006e..0d093924 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -273,11 +273,6 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
+     endif()
+ 
+     install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++    install( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
+ endif()
+ 
+-# ******************************************************************************
+-# Man page
+-install( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
+-
+-# That's all Folks!
+-##
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0002-cmake-ignore-warnings-about-missing-PDB-files-in-3rd.patch b/meta-oe/recipes-support/exiv2/exiv2/0002-cmake-ignore-warnings-about-missing-PDB-files-in-3rd.patch
new file mode 100644
index 000000000..84c07222a
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0002-cmake-ignore-warnings-about-missing-PDB-files-in-3rd.patch
@@ -0,0 +1,64 @@
+From e57f311e629762fbf2b08d9a5b1e0cad1035b42f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
+Date: Tue, 18 Dec 2018 10:33:11 +0100
+Subject: [PATCH 35/70] cmake: ignore warnings about missing PDB files in 3rd
+ party libs
+
+---
+ samples/CMakeLists.txt | 11 +++++++++++
+ src/CMakeLists.txt     |  4 ++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
+index a3e491e0..4e8c14c6 100644
+--- a/samples/CMakeLists.txt
++++ b/samples/CMakeLists.txt
+@@ -43,6 +43,9 @@ foreach(entry ${SAMPLES})
+     add_test( ${target}_test ${target} )
+     target_include_directories(${target} PRIVATE ${CMAKE_SOURCE_DIR}/src) # To find unused.h
+     install( TARGETS ${target} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++    if (MSVC)
++        set_target_properties(${target} PROPERTIES LINK_FLAGS "/ignore:4099")
++    endif()
+ endforeach()
+ 
+ ###################################
+@@ -69,6 +72,11 @@ list(APPEND APPLICATIONS exiv2json)
+ 
+ install( TARGETS metacopy pathtest exiv2json RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
++if (MSVC)
++    set_target_properties(exiv2json PROPERTIES LINK_FLAGS "/ignore:4099")
++    set_target_properties(metacopy PROPERTIES LINK_FLAGS "/ignore:4099")
++endif()
++
+ if( EXPAT_FOUND )
+     add_executable(        geotag    geotag.cpp)
+     list(APPEND APPLICATIONS geotag)
+@@ -103,6 +111,9 @@ foreach(application ${APPLICATIONS})
+     if( EXIV2_ENABLE_PNG )
+         target_link_libraries( ${application} PRIVATE ${ZLIB_LIBRARIES} )
+     endif()
++    if (MSVC)
++        set_target_properties(${application} PROPERTIES LINK_FLAGS "/ignore:4099")
++    endif()
+ endforeach()
+ 
+ # ******************************************************************************
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0d093924..adb285b1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -274,5 +274,9 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
+ 
+     install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+     install( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
++
++    if (MSVC)
++        set_target_properties(exiv2 PROPERTIES LINK_FLAGS "/ignore:4099")
++    endif()
+ endif()
+ 
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0003-cmake-Rename-xmp-to-exiv2-xmp-to-avoid-name-conflict.patch b/meta-oe/recipes-support/exiv2/exiv2/0003-cmake-Rename-xmp-to-exiv2-xmp-to-avoid-name-conflict.patch
new file mode 100644
index 000000000..08a307341
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0003-cmake-Rename-xmp-to-exiv2-xmp-to-avoid-name-conflict.patch
@@ -0,0 +1,82 @@
+From 89509d7a3915ba474cbc3f8c85ab9bec4954ceda Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Wed, 2 Jan 2019 10:38:22 +0100
+Subject: [PATCH 64/70] cmake: Rename xmp to exiv2-xmp to avoid name conflicts
+
+There is already a libxmp file by the xmp project on https://xmp.sf.net.
+To avoid issues prefix with exiv2.
+
+Fixes #624
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ src/CMakeLists.txt    |  2 +-
+ xmpsdk/CMakeLists.txt | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index adb285b1..2aeae733 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -147,7 +147,7 @@ target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR})
+ target_include_directories(exiv2lib PRIVATE ${ZLIB_INCLUDE_DIR})
+ 
+ if (EXIV2_ENABLE_XMP)
+-    target_link_libraries(exiv2lib PUBLIC xmp)
++    target_link_libraries(exiv2lib PUBLIC exiv2-xmp)
+ elseif(EXIV2_ENABLE_EXTERNAL_XMP)
+     target_link_libraries(exiv2lib PUBLIC ${XMPSDK_LIBRARY})
+     target_include_directories(exiv2lib PUBLIC ${XMPSDK_INCLUDE_DIR})
+diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
+index a4c1fe6c..fa521043 100644
+--- a/xmpsdk/CMakeLists.txt
++++ b/xmpsdk/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(xmp STATIC
++add_library(exiv2-xmp STATIC
+     src/ExpatAdapter.cpp
+     src/MD5.cpp
+     src/ParseRDF.cpp
+@@ -26,12 +26,12 @@ add_library(xmp STATIC
+     include/XMP_Version.h
+ )
+ 
+-target_link_libraries(xmp 
++target_link_libraries(exiv2-xmp
+     PRIVATE 
+         ${EXPAT_LIBRARY}
+ )
+ 
+-target_include_directories(xmp
++target_include_directories(exiv2-xmp
+     PUBLIC 
+         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/xmpsdk/include>
+     PRIVATE 
+@@ -39,20 +39,20 @@ target_include_directories(xmp
+ )
+ 
+ if (MSVC)
+-    target_compile_definitions(xmp PRIVATE XML_STATIC)
++    target_compile_definitions(exiv2-xmp PRIVATE XML_STATIC)
+ endif()
+ 
+ check_include_file( "stdint.h"  EXV_HAVE_STDINT_H )
+ if (EXV_HAVE_STDINT_H)
+-    target_compile_definitions(xmp PRIVATE EXV_HAVE_STDINT_H)
++    target_compile_definitions(exiv2-xmp PRIVATE EXV_HAVE_STDINT_H)
+ endif()
+ 
+ if (BUILD_SHARED_LIBS)
+-    set_property(TARGET xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
++    set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
+ endif()
+ 
+ # 1119  Install libxmp.a for use by third party applications (Thanks, Emmanuel)
+-install(TARGETS xmp EXPORT exiv2Config
++install(TARGETS exiv2-xmp EXPORT exiv2Config
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0004-cmake-Install-header-files-without-globbing.patch b/meta-oe/recipes-support/exiv2/exiv2/0004-cmake-Install-header-files-without-globbing.patch
new file mode 100644
index 000000000..4503375f3
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0004-cmake-Install-header-files-without-globbing.patch
@@ -0,0 +1,111 @@
+From 0b34ccb9a3b26cd1c5267c6a5c15e9fa1a665adb Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Wed, 2 Jan 2019 10:59:30 +0100
+Subject: [PATCH 65/70] cmake: Install header files without globbing
+
+Fixes #627
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ CMakeLists.txt               |  1 +
+ include/CMakeLists.txt       |  1 +
+ include/exiv2/CMakeLists.txt | 51 ++++++++++++++++++++++++++++++++++++
+ src/CMakeLists.txt           |  4 ---
+ 4 files changed, 53 insertions(+), 4 deletions(-)
+ create mode 100644 include/CMakeLists.txt
+ create mode 100644 include/exiv2/CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 183cdd2e..ce4d2202 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,6 +76,7 @@ endif()
+ 
+ include(cmake/compilerFlagsExiv2.cmake REQUIRED)
+ 
++add_subdirectory( include )
+ add_subdirectory( src )
+ 
+ if( EXIV2_BUILD_UNIT_TESTS )
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+new file mode 100644
+index 00000000..01b43a6c
+--- /dev/null
++++ b/include/CMakeLists.txt
+@@ -0,0 +1 @@
++add_subdirectory(exiv2)
+diff --git a/include/exiv2/CMakeLists.txt b/include/exiv2/CMakeLists.txt
+new file mode 100644
+index 00000000..60080f1c
+--- /dev/null
++++ b/include/exiv2/CMakeLists.txt
+@@ -0,0 +1,51 @@
++install(FILES
++            asfvideo.hpp
++            basicio.hpp
++            bigtiffimage.hpp
++            bmpimage.hpp
++            config.h
++            convert.hpp
++            cr2image.hpp
++            crwimage.hpp
++            datasets.hpp
++            easyaccess.hpp
++            epsimage.hpp
++            error.hpp
++            exif.hpp
++            exiv2.hpp
++            futils.hpp
++            gifimage.hpp
++            http.hpp
++            image.hpp
++            ini.hpp
++            iptc.hpp
++            jp2image.hpp
++            jpgimage.hpp
++            matroskavideo.hpp
++            metadatum.hpp
++            mrwimage.hpp
++            orfimage.hpp
++            pgfimage.hpp
++            pngimage.hpp
++            preview.hpp
++            properties.hpp
++            psdimage.hpp
++            quicktimevideo.hpp
++            rafimage.hpp
++            riffvideo.hpp
++            rw2image.hpp
++            rwlock.hpp
++            slice.hpp
++            ssh.hpp
++            tags.hpp
++            tgaimage.hpp
++            tiffimage.hpp
++            types.hpp
++            utilsvideo.hpp
++            value.hpp
++            version.hpp
++            webpimage.hpp
++            xmp_exiv2.hpp
++            xmpsidecar.hpp
++        DESTINATION
++            ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index adb285b1..04d8a2a0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -225,10 +225,6 @@ install(TARGETS exiv2lib EXPORT exiv2Config
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+ 
+-install(DIRECTORY ../include/exiv2
+-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+-    FILES_MATCHING PATTERN "*.h*")
+-
+ install(FILES
+     ${CMAKE_BINARY_DIR}/exv_conf.h
+     ${CMAKE_BINARY_DIR}/exiv2lib_export.h
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0005-cmake-Use-correct-installation-dir-for-generated-doc.patch b/meta-oe/recipes-support/exiv2/exiv2/0005-cmake-Use-correct-installation-dir-for-generated-doc.patch
new file mode 100644
index 000000000..5a53c955f
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0005-cmake-Use-correct-installation-dir-for-generated-doc.patch
@@ -0,0 +1,28 @@
+From f8f63a8b4033549d47384c6e2b1972ae1a2775fc Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Wed, 2 Jan 2019 10:28:57 +0100
+Subject: [PATCH 66/70] cmake: Use correct installation dir for generated docs
+
+Fixes #623
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ cmake/generateDoc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/generateDoc.cmake b/cmake/generateDoc.cmake
+index a3aea727..16823946 100644
+--- a/cmake/generateDoc.cmake
++++ b/cmake/generateDoc.cmake
+@@ -21,7 +21,7 @@ macro(generate_documentation DOX_CONFIG_FILE)
+     set(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doxy.config")
+     add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG})
+ 
+-    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION "share/doc/lib${PROJECT_NAME}")
++    install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ 
+     set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
+ endmacro()
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0006-cmake-Use-correct-installation-dir-for-cmake-config-.patch b/meta-oe/recipes-support/exiv2/exiv2/0006-cmake-Use-correct-installation-dir-for-cmake-config-.patch
new file mode 100644
index 000000000..0bba2af49
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0006-cmake-Use-correct-installation-dir-for-cmake-config-.patch
@@ -0,0 +1,124 @@
+From 420e4631da1372da1be06af8f6032429c1f14d02 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Thu, 3 Jan 2019 10:18:27 +0100
+Subject: [PATCH 67/70] cmake: Use correct installation dir for cmake config
+ files
+
+This is the path cmake will look for those files by default. At least on
+UNIX systems.
+
+Fixes #623
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ releasenotes/CYGWIN/ReadMe.txt | 2 +-
+ releasenotes/Darwin/ReadMe.txt | 2 +-
+ releasenotes/Linux/ReadMe.txt  | 1 +
+ releasenotes/MinGW/ReadMe.txt  | 2 +-
+ releasenotes/msvc/ReadMe.txt   | 2 +-
+ releasenotes/releasenotes.txt  | 5 +++++
+ src/CMakeLists.txt             | 2 +-
+ 7 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/releasenotes/CYGWIN/ReadMe.txt b/releasenotes/CYGWIN/ReadMe.txt
+index 9161ca34..bba70fe6 100644
+--- a/releasenotes/CYGWIN/ReadMe.txt
++++ b/releasenotes/CYGWIN/ReadMe.txt
+@@ -7,9 +7,9 @@ Structure of the bundle:
+ bin/exiv2.exe                             exiv2 and sample applications
+ bin/cygexiv2-27.dll                       DLL
+ lib/libexiv2.dll.a & libxmp.a             link libraries
++lib/cmake/exiv2                           consume CMake files
+ lib/pkgconfig/exiv2.pc                    pkg-config file
+ share/man                                 man pages
+-share/exiv2/cmake                         consume CMake files
+ samples/exifprint.cpp                     sample code
+ logs                                      build and test logs
+ 
+diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt
+index d3e61177..57910713 100644
+--- a/releasenotes/Darwin/ReadMe.txt
++++ b/releasenotes/Darwin/ReadMe.txt
+@@ -6,10 +6,10 @@ Structure of the bundle
+ 
+ bin/exiv2                                 exiv2 and sample applications
+ lib/libexiv2.0.27.0.0.dylib & libxmp.a    libraries
++lib/cmake/exiv2                           consume CMake files
+ lib/pkgconfig/exiv2.pc                    pkg-config file
+ include/exiv2/                            include files
+ share/man                                 man pages
+-share/exiv2/cmake                         consume CMake files
+ samples/exifprint.cpp                     sample code
+ logs                                      build and test logs
+ 
+diff --git a/releasenotes/Linux/ReadMe.txt b/releasenotes/Linux/ReadMe.txt
+index 03348302..0737b3a4 100644
+--- a/releasenotes/Linux/ReadMe.txt
++++ b/releasenotes/Linux/ReadMe.txt
+@@ -7,6 +7,7 @@ Structure of the bundle:
+ bin/exiv2                                 exiv2 and sample applications
+ lib/libexiv2.so.0.27.0.0 & libxmp.a       libraries
+ lib/pkgconfig/exiv2.pc                    pkg-config file
++lib/cmake/exiv2                           consume CMake files
+ include/exiv2/                            include files
+ share/                                    man pages
+ samples/exifprint.cpp                     sample code
+diff --git a/releasenotes/MinGW/ReadMe.txt b/releasenotes/MinGW/ReadMe.txt
+index 884d7502..98cd7770 100644
+--- a/releasenotes/MinGW/ReadMe.txt
++++ b/releasenotes/MinGW/ReadMe.txt
+@@ -7,10 +7,10 @@ Structure of the bundle:
+ bin/exiv2.exe                             exiv2 and sample applications
+ bin/msys-exiv2-27.dll                     exiv2 dll
+ lib/libexiv2.dll.a & libxmp.a             link libraries
++lib/cmake/exiv2                           consume CMake files
+ lib/pkgconfig/exiv2.pc                    pkg-config file
+ include/exiv2/                            include files
+ share/man                                 man pages
+-share/exiv2/cmake                         consume CMake files
+ samples/exifprint.cpp                     sample code
+ logs                                      build and test logs
+ 
+diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt
+index de1dcbfe..e625ab49 100644
+--- a/releasenotes/msvc/ReadMe.txt
++++ b/releasenotes/msvc/ReadMe.txt
+@@ -7,8 +7,8 @@ Structure of the bundle:
+ bin/exiv2.exe                             exiv2 and sample applications
+ bin/exiv2.dll                             dll
+ lib/exiv2.lib & xmp.lib                   link libraries
++lib/cmake/exiv2                           consume CMake files
+ include/exiv2/                            include files
+-share/exiv2/cmake                         consume CMake files
+ samples/exifprint.cpp                     sample code
+ logs                                      build and test logs
+ 
+diff --git a/releasenotes/releasenotes.txt b/releasenotes/releasenotes.txt
+index b71b4519..226c078b 100644
+--- a/releasenotes/releasenotes.txt
++++ b/releasenotes/releasenotes.txt
+@@ -1,3 +1,8 @@
++Exiv2 v0.27.1
++-------------
++
++#623 Use correct installation path for generated docs and cmake config files
++
+ Exiv2 v0.27.0
+ -------------
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index adb285b1..4a05ee4f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -234,7 +234,7 @@ install(FILES
+     ${CMAKE_BINARY_DIR}/exiv2lib_export.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
+ 
+-install(EXPORT exiv2Config DESTINATION "share/exiv2/cmake")
++install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
+ # ******************************************************************************
+ # exiv2 application
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0007-xmpsdk-Build-with-DBanAllEntityUsage-1.patch b/meta-oe/recipes-support/exiv2/exiv2/0007-xmpsdk-Build-with-DBanAllEntityUsage-1.patch
new file mode 100644
index 000000000..0983447dd
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0007-xmpsdk-Build-with-DBanAllEntityUsage-1.patch
@@ -0,0 +1,34 @@
+From e44d1dbe769f3b60a3d671be310f4af4f9490e6b Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Thu, 3 Jan 2019 10:31:25 +0100
+Subject: [PATCH 68/70] xmpsdk: Build with -DBanAllEntityUsage=1
+
+Prevent a denial-service-attack related to XML entity expansion
+("billion laughs attack").
+See https://bugzilla.redhat.com/show_bug.cgi?id=888769
+
+Search for BanAllEntityUsage in xmpsdk/src/ExpatAdapter.cpp
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ xmpsdk/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
+index fa521043..ae011dc3 100644
+--- a/xmpsdk/CMakeLists.txt
++++ b/xmpsdk/CMakeLists.txt
+@@ -38,6 +38,10 @@ target_include_directories(exiv2-xmp
+         ${EXPAT_INCLUDE_DIR}
+ )
+ 
++# Prevent a denial-service-attack related to XML entity expansion
++# ("billion laughs attack").
++# See https://bugzilla.redhat.com/show_bug.cgi?id=888769
++target_compile_definitions(exiv2-xmp PRIVATE BanAllEntityUsage=1)
+ if (MSVC)
+     target_compile_definitions(exiv2-xmp PRIVATE XML_STATIC)
+ endif()
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0008-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch b/meta-oe/recipes-support/exiv2/exiv2/0008-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch
new file mode 100644
index 000000000..7f351249b
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0008-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch
@@ -0,0 +1,31 @@
+From dac6bb6043fc046f7cbad73c281eb258a981267f Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Thu, 3 Jan 2019 10:41:40 +0100
+Subject: [PATCH 69/70] xmpsdk: Fix compile warnings in ExpatAdapter.cpp
+
+The code has been enabled with -DBanAllEntityUsage=1
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ xmpsdk/src/ExpatAdapter.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xmpsdk/src/ExpatAdapter.cpp b/xmpsdk/src/ExpatAdapter.cpp
+index 79669f52..09117c75 100644
+--- a/xmpsdk/src/ExpatAdapter.cpp
++++ b/xmpsdk/src/ExpatAdapter.cpp
+@@ -484,7 +484,10 @@ static void CommentHandler ( void * userData, XMP_StringPtr comment )
+ static void StartDoctypeDeclHandler ( void * userData, XMP_StringPtr doctypeName,
+ 									  XMP_StringPtr sysid, XMP_StringPtr pubid, int has_internal_subset )
+ {
+-	IgnoreParam(userData);
++	IgnoreParam(doctypeName);
++	IgnoreParam(sysid);
++	IgnoreParam(pubid);
++	IgnoreParam(has_internal_subset);
+ 
+ 	ExpatAdapter * thiz = (ExpatAdapter*)userData;
+ 
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0009-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch b/meta-oe/recipes-support/exiv2/exiv2/0009-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
new file mode 100644
index 000000000..c65f13bc3
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0009-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
@@ -0,0 +1,27 @@
+From ae9eb90108c0f6a3f2030cf4e4ae907a8b203b6a Mon Sep 17 00:00:00 2001
+From: Luis Diaz Mas <piponazo@gmail.com>
+Date: Sat, 12 Jan 2019 13:39:12 +0100
+Subject: [PATCH 79/98] Fixes in .pc file for being compatible with more
+ distributions
+
+---
+ cmake/exiv2.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/exiv2.pc.in b/cmake/exiv2.pc.in
+index e477696d..9018472b 100644
+--- a/cmake/exiv2.pc.in
++++ b/cmake/exiv2.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
+-includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: exiv2
+ Description: @PROJECT_DESCRIPTION@
+-- 
+2.17.2
+
diff --git a/meta-oe/recipes-support/exiv2/exiv2/0010-create-install-exiv2ConfigVersion.cmake.patch b/meta-oe/recipes-support/exiv2/exiv2/0010-create-install-exiv2ConfigVersion.cmake.patch
new file mode 100644
index 000000000..0aacb70da
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2/0010-create-install-exiv2ConfigVersion.cmake.patch
@@ -0,0 +1,50 @@
+From 487567b209ca40e56f9357b89c907253a7be8bf0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 24 Apr 2019 18:59:13 +0200
+Subject: [PATCH] create & install exiv2ConfigVersion.cmake
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://github.com/Exiv2/exiv2/commit/ce0284bc1f5cef635583130a7e807f70f034bc01
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6418bbd..f0b663a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,6 +7,7 @@ if( EXIV2_BUILD_UNIT_TESTS )
+ endif()
+ 
+ 
++include(CMakePackageConfigHelpers)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ 
+@@ -218,6 +219,7 @@ if( ICONV_FOUND )
+     target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
+ endif()
+ 
++write_basic_package_version_file(exiv2ConfigVersion.cmake COMPATIBILITY ExactVersion)
+ 
+ install(TARGETS exiv2lib EXPORT exiv2Config
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -232,6 +234,9 @@ install(FILES
+ 
+ install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
+ 
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
++
++
+ # ******************************************************************************
+ # exiv2 application
+ 
+-- 
+2.20.1
+
-- 
2.20.1

[PATCH 21/41] gexiv2: initial add 0.12.0

[Andreas Müller]

This is an optional dependecy for upcoming nautils 3.22.1

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/gexiv2/gexiv2_0.12.0.bb     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb

diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
new file mode 100644
index 000000000..65a9257f2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
@@ -0,0 +1,21 @@
+SUMMARY = "A GObject-based Exiv2 wrapper"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
+
+DEPENDS = " \
+   exiv2 \
+"
+
+GNOMEBASEBUILDCLASS = "meson"
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+inherit gnomebase gobject-introspection gtk-doc
+
+SRC_URI[archive.md5sum] = "0a618c5b053106d1801d89cc77385419"
+SRC_URI[archive.sha256sum] = "58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a"
+
+EXTRA_OEMESON = " \
+    -Dvapi=false \
+    -Dpython2_girdir=no \
+    -Dpython3_girdir=no \
+"
-- 
2.20.1

[PATCH 22/41] gnome-autoar: inital add 0.2.3

[Andreas Müller]

This is a dependency for upcoming nautilus 3.32.1

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../gnome-autoar/gnome-autoar_0.2.3.bb         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb

diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
new file mode 100644
index 000000000..16a9213cb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
@@ -0,0 +1,18 @@
+SUMMARY = "GNOME archive library"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = " \
+    gnome-common-native \
+    gtk+3 \
+    libarchive \
+"
+
+inherit gnomebase gobject-introspection gtk-doc vala
+
+SRC_URI[archive.md5sum] = "39b13fb2fc7752fa3b80616244dc4ef8"
+SRC_URI[archive.sha256sum] = "5de9db0db028cd6cab7c2fec46ba90965474ecf9cd68cfd681a6488cf1fb240a"
+
+do_compile_prepend() {
+    export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs"
+}
-- 
2.20.1

[PATCH 23/41] tracker: initial add 2.2.2

[Andreas Müller]

This is a dependenccy for upcoming nautilus 3.32

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/tracker/tracker_2.2.2.bb    | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/tracker/tracker_2.2.2.bb

diff --git a/meta-gnome/recipes-gnome/tracker/tracker_2.2.2.bb b/meta-gnome/recipes-gnome/tracker/tracker_2.2.2.bb
new file mode 100644
index 000000000..4c9083fd5
--- /dev/null
+++ b/meta-gnome/recipes-gnome/tracker/tracker_2.2.2.bb
@@ -0,0 +1,51 @@
+SUMMARY = "Tracker is a file search engine"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \
+    file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+DEPENDS = " \
+    libxml2-native \
+    glib-2.0 \
+    sqlite3 \
+    libarchive \
+    dbus \
+    icu \
+    json-glib \
+    libsoup-2.4 \
+    libstemmer \
+"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gobject-introspection vala gtk-doc manpages bash-completion distro_features_check
+
+SRC_URI[archive.md5sum] = "2ec18c6f9e877abdfe1f50bac0e9eade"
+SRC_URI[archive.sha256sum] = "c6a73462f9aa9c32efa139003d2abd2ac5f70f8af6ce744729954975a661e2e6"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+CFLAGS += "-lstemmer"
+
+PACKAGECONFIG ??= "fts"
+PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger"
+# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set
+PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false"
+
+# set required cross property sqlite3_has_fts5
+do_write_config[vardeps] += "PACKAGECONFIG"
+do_write_config_append() {
+    echo "[properties]" > ${WORKDIR}/meson-tracker.cross
+    echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross
+}
+
+EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${libdir}/tracker-2.0 \
+    ${systemd_user_unitdir} \
+"
-- 
2.20.1

[PATCH 24/41] nautilus: upgrade 3.18.5 -> 3.32.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...ome-desktop-thumbnail-API-with-new-g.patch | 40 -------------------
 .../recipes-gnome/nautilus/nautilus_3.18.5.bb | 33 ---------------
 .../recipes-gnome/nautilus/nautilus_3.32.1.bb | 32 +++++++++++++++
 3 files changed, 32 insertions(+), 73 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
 delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
 create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.32.1.bb

diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
deleted file mode 100644
index f19eb4979..000000000
--- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a4ed38e95cbe07f02028249b8b315565a5ac1e43 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 5 May 2018 22:32:45 -0700
-Subject: [PATCH] nautilus: drop gnome-desktop thumbnail API with new
- gdk-pixbuf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If gdk-pixbuf >= 2.36.5 is available, its scaling API can do what we
-want, so we don’t need to use the deprecated gnome-desktop one.
-
-Also fixes compile errors seen on master
-nautilus-properties-window.c:5101: undefined reference to `gnome_desktop_thumbnail_scale_down_pixbuf'
-
-Upstream-Status: Backport
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/nautilus-properties-window.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
-index dea8b0f..fad9bd1 100644
---- a/src/nautilus-properties-window.c
-+++ b/src/nautilus-properties-window.c
-@@ -5098,10 +5098,11 @@ update_preview_callback (GtkFileChooser *icon_chooser,
- 			scale = (double)gdk_pixbuf_get_height (pixbuf) /
- 				gdk_pixbuf_get_width (pixbuf);
- 
--			scaled_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf
-+			scaled_pixbuf = gdk_pixbuf_scale_simple
- 				(pixbuf,
- 				 PREVIEW_IMAGE_WIDTH,
--				 scale * PREVIEW_IMAGE_WIDTH);
-+				 scale * PREVIEW_IMAGE_WIDTH,
-+				 GDK_INTERP_HYPER);
- 			g_object_unref (pixbuf);
- 			pixbuf = scaled_pixbuf;
- 		}
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
deleted file mode 100644
index bdb2f3c88..000000000
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "File manager for GNOME"
-SECTION = "x11/gnome"
-
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=36cf660aea2b8beffba7945f44a7e748 \
-                    file://COPYING.EXTENSIONS;md5=7579d6678402a1868631bf82c93ff0d4 \
-                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
-
-inherit distro_features_check autotools pkgconfig gobject-introspection
-
-MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/nautilus/${MAJ_VER}/nautilus-${PV}.tar.xz \
-           file://0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch \
-           "
-
-SRC_URI[md5sum] = "0f578bda5655c0ce204befafca5803d7"
-SRC_URI[sha256sum] = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15"
-
-DEPENDS = "gtk+3 gnome-desktop3 gsettings-desktop-schemas glib-2.0-native intltool-native pango"
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_OECONF = " \
-    --disable-gtk-doc \
-    --disable-update-mimedb \
-    --disable-nst-extension \
-    --enable-tracker=no \
-    --disable-schemas-compile \
-    --enable-xmp=no \
-    --enable-libexif=no \
-"
-
-FILES_${PN} += "${datadir}/*"
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.32.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.32.1.bb
new file mode 100644
index 000000000..8f7f2f2e7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.32.1.bb
@@ -0,0 +1,32 @@
+SUMMARY = "File manager for GNOME"
+SECTION = "x11/gnome"
+
+LICENSE="GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+DEPENDS = " \
+    fontconfig \
+    gtk+3 \
+    gnome-desktop3 \
+    gsettings-desktop-schemas \
+    gnome-autoar \
+    tracker \
+"
+
+inherit gnomebase gobject-introspection gtk-doc gettext distro_features_check
+
+SRC_URI[archive.md5sum] = "e1bd5e67979b2082166a41319d5df079"
+SRC_URI[archive.sha256sum] = "fa54038f9d09e3c989ba82f501df99dfe5c4448e604f22e3a00305b26bdcb96e"
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+PACKAGECONFIG = "extensions"
+PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/metainfo \
+    ${datadir}/gnome-shell \
+"
-- 
2.20.1

[PATCH 25/41] ibus: initial add 1.5.20

[Andreas Müller]

It is a depency for gnome-shell

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-support/ibus/ibus-native.bb       | 28 +++++++++++++
 meta-gnome/recipes-support/ibus/ibus.bb       | 28 +++++++++++++
 meta-gnome/recipes-support/ibus/ibus.inc      | 33 ++++++++++++++++
 ...start-dbus-we-do-not-have-dbus-lauch.patch | 39 +++++++++++++++++++
 4 files changed, 128 insertions(+)
 create mode 100644 meta-gnome/recipes-support/ibus/ibus-native.bb
 create mode 100644 meta-gnome/recipes-support/ibus/ibus.bb
 create mode 100644 meta-gnome/recipes-support/ibus/ibus.inc
 create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch

diff --git a/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-gnome/recipes-support/ibus/ibus-native.bb
new file mode 100644
index 000000000..0c095f15e
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus-native.bb
@@ -0,0 +1,28 @@
+require ${BPN}.inc
+
+inherit native
+
+DEPENDS = " \
+    glib-2.0-native \
+    dbus-native \
+    iso-codes \
+"
+
+PACKAGECONFIG = ""
+
+# for allarch iso-codes
+EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig"
+
+do_compile() {
+    cd src
+    oe_runmake ibusenumtypes.h ibusenumtypes.c
+    oe_runmake unicode-parser
+}
+
+do_install() {
+    install -d ${D}/${libdir}
+    install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir}
+
+    install -d ${D}/${bindir}
+    install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir}
+}
diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb
new file mode 100644
index 000000000..abcc13af2
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus.bb
@@ -0,0 +1,28 @@
+require ${BPN}.inc
+
+DEPENDS = " \
+    ${BPN}-native \
+    glib-2.0-native \
+    glib-2.0 \
+    dbus \
+    iso-codes \
+"
+
+inherit gtk-icon-cache bash-completion
+
+PACKAGECONFIG ??= " \
+    dconf gtk3 vala \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
+"
+
+do_configure_prepend() {
+    # run native unicode-parser
+    sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am
+}
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/GConf \
+    ${datadir}/glib-2.0 \
+    ${libdir}/gtk-3.0 \
+"
diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
new file mode 100644
index 000000000..3bc38a58b
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -0,0 +1,33 @@
+SUMMARY = "Intelligent Input Bus for Linux/Unix"
+HOMEPAGE = "https://github.com/ibus/ibus/wiki"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala
+
+PV = "1.5.20"
+SRC_URI = " \
+    git://github.com/ibus/ibus.git \
+    file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
+"
+SRCREV = "407756521617f8514b65ddfa35512183fd22d38d"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
+PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
+PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+"
+PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
+PACKAGECONFIG[wayland]  = "--enable-wayland,--disable-wayland,wayland"
+PACKAGECONFIG[vala]  = "--enable-vala,--disable-vala"
+PACKAGECONFIG[x11]  = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11"
+
+EXTRA_OECONF = " \
+    --disable-tests \
+    --disable-emoji-dict \
+    --disable-python2 \
+"
+
+do_configure_prepend() {
+    touch ${S}/ChangeLog
+    touch ${S}/ABOUT-NLS
+}
diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
new file mode 100644
index 000000000..3701d19f5
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
@@ -0,0 +1,39 @@
+From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 10 May 2019 14:30:08 +0200
+Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ data/dconf/make-dconf-override-db.sh | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
+index 9c650e97..02fbf059 100755
+--- a/data/dconf/make-dconf-override-db.sh
++++ b/data/dconf/make-dconf-override-db.sh
+@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
+ export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
+ mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR
+ 
+-eval `dbus-launch --sh-syntax`
+-
+-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
+-
+ # in case that schema is not installed on the system
+ glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
+ 
+@@ -46,5 +42,3 @@ for schema in $schemas; do
+ done
+ 
+ rm -rf $TMPDIR
+-
+-kill $DBUS_SESSION_BUS_PID
+-- 
+2.20.1
+
-- 
2.20.1

[PATCH 26/41] gnome-desktop3: upgrade 3.32.0 -> 3.32.2

[Andreas Müller]

While at it:

* inherit gnomebase instead of gnome because gnome adds unnecessary inherits
* remove itstool-native from DEPENDS
* make REQUIRED_DISTRO_FEATURES "x11" work

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...ome-desktop3_3.32.0.bb => gnome-desktop3_3.32.2.bb} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.32.0.bb => gnome-desktop3_3.32.2.bb} (69%)

diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.2.bb
similarity index 69%
rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.2.bb
index 0acbb2117..03b415547 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.32.2.bb
@@ -8,24 +8,24 @@ BPN = "gnome-desktop"
 
 GNOMEBASEBUILDCLASS = "meson"
 
-inherit gnome pkgconfig upstream-version-is-even gobject-introspection distro_features_check
+inherit gnomebase pkgconfig upstream-version-is-even gobject-introspection distro_features_check
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
 
-SRC_URI[archive.md5sum] = "e423ed6d648c6c4f9798fa9cd9ea8d99"
-SRC_URI[archive.sha256sum] = "a6393dc5fc29fc0652ac84c73b3da205d0b0168128c4cf6d27797a08f3d07b54"
+SRC_URI[archive.md5sum] = "e9a32b755c20f1462f7c4321e32b30cb"
+SRC_URI[archive.sha256sum] = "099f71b29310c999c28f2bf272c846bbd7efc8c6c438b37d15f374230ce92d2e"
 
 SRC_URI += " \
     file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
     file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \
 "
 
-DEPENDS += "itstool-native gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev"
+DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev"
 
 inherit distro_features_check gtk-doc
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES += "x11"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
 EXTRA_OEMESON = "-Ddesktop_docs=false"
-- 
2.20.1

[PATCH 27/41] libgusb: initial add 0.3.0+

[Andreas Müller]

* It is a dependency for upcoming colord. That is used by GNOME and KDE [1] so
  move it to meta-oe
* 0.3.0 failed build and gobject-introspection was not configurable -> use
  latest master sources

[1] https://www.freedesktop.org/software/colord/intro.html

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-support/libgusb/libgusb_git.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 meta-oe/recipes-support/libgusb/libgusb_git.bb

diff --git a/meta-oe/recipes-support/libgusb/libgusb_git.bb b/meta-oe/recipes-support/libgusb/libgusb_git.bb
new file mode 100644
index 000000000..fb5b6a31e
--- /dev/null
+++ b/meta-oe/recipes-support/libgusb/libgusb_git.bb
@@ -0,0 +1,12 @@
+SUMMARY = "GUsb is a GObject wrapper for libusb1"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+DEPENDS = "glib-2.0 libusb"
+
+inherit meson gobject-introspection gtk-doc gettext vala
+
+SRC_URI = "git://github.com/hughsie/libgusb.git"
+SRCREV = "f33be86e563217d525e31b501c9eaa52f9db1cc4"
+PV = "0.3.0+git${SRCPV}"
+S = "${WORKDIR}/git"
-- 
2.20.1

[PATCH 28/41] colord: initial add 1.4.4

[Andreas Müller]

* It is a dependency for upcoming gnome-settings-daemon
* It is used by GNOME and KDE [1] so  move it to meta-oe
* Getting it to build was a bit tricky. Udev (systemd) is a mandatory
  dependency and for native we do not support build. To get around native build
  was stripped down to what's necessary only. Native build is done with the
  help of configuration in recipe and (old-school) Makefile. This solution was
  chosen to avoid massive patching of meson build which tends to be a
  maintenance burden (as experienced at KDE recipes in meta-qt5-extra).

[1] https://www.freedesktop.org/software/colord/intro.html

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-support/colord/colord-native.bb   |  64 +++++++
 ...n-cd_icc_create_from_edid-to-avoid-u.patch | 166 ++++++++++++++++++
 .../colord/colord-native/Makefile             |  48 +++++
 meta-oe/recipes-support/colord/colord.bb      |  42 +++++
 meta-oe/recipes-support/colord/colord.inc     |  13 ++
 ...Run-native-cd_idt8-cd_create_profile.patch |  59 +++++++
 6 files changed, 392 insertions(+)
 create mode 100644 meta-oe/recipes-support/colord/colord-native.bb
 create mode 100644 meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
 create mode 100644 meta-oe/recipes-support/colord/colord-native/Makefile
 create mode 100644 meta-oe/recipes-support/colord/colord.bb
 create mode 100644 meta-oe/recipes-support/colord/colord.inc
 create mode 100644 meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch

diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
new file mode 100644
index 000000000..845041cc4
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native.bb
@@ -0,0 +1,64 @@
+require ${BPN}.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:"
+
+inherit meson native
+
+DEPENDS += " \
+    meson-native \
+    glib-2.0-native \
+    lcms-native \
+"
+
+SRC_URI += " \
+    file://0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch \
+    file://Makefile;subdir=${BPN}-${PV} \
+"
+
+do_configure() {
+    # we expect meson to fail - but before it extracts project's version in log file
+    meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON} > /dev/null 2>&1 || true
+
+    # extract and split version
+    version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
+    major=`echo $version | cut -d. -f1`
+    minor=`echo $version | cut -d. -f2`
+    micro=`echo $version | cut -d. -f3`
+    echo "Project version: $major.$minor.$micro"
+
+    # extract project name
+    proj_name=`grep 'Project name:' ${B}/meson-logs/meson-log.txt | sed 's|Project name: ||'`
+
+    # create cd-version.h
+    mkdir -p ${B}/colord
+	sed ${S}/lib/colord/cd-version.h.in \
+		-e 's:@CD_MAJOR_VERSION_PRIVATE@:1:g' \
+		-e 's:@CD_MINOR_VERSION_PRIVATE@:4:g' \
+		-e 's:@CD_MICRO_VERSION_PRIVATE@:4:g' \
+		> ${B}/colord/cd-version.h
+
+    # create config.h based on target build and add what's necessary only
+    localedir=`echo ${datadir}/locale | sed 's:${prefix}/::g'`
+    echo "#define LOCALEDIR \"$localedir\"" >> ${B}/config.h
+    echo "#define GETTEXT_PACKAGE \"colord\"" >> ${B}/config.h
+    echo "#define PACKAGE_NAME \"$proj_name\"" >> ${B}/config.h
+    echo "#define PACKAGE_VERSION \"$version\"" >> ${B}/config.h
+}
+
+do_compile() {
+    oe_runmake -C${S} DESTDIR=${B}
+}
+
+do_install() {
+    version=`grep 'Project version:' ${B}/meson-logs/meson-log.txt | sed 's|Project version: ||'`
+    major=`echo $version | cut -d. -f1`
+
+    install -d ${D}${libdir}
+    install -m 755 ${B}/libcolord.so ${D}${libdir}/libcolord.so.$version
+    ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so"
+    ln -s libcolord.so.$version "${D}/${libdir}/libcolord.so.$major"
+
+    install -d ${D}${bindir}
+    install -m 755 ${B}/cd_create_profile ${D}${bindir}/
+    install -m 755 ${B}/cd_idt8 ${D}${bindir}/
+}
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
new file mode 100644
index 000000000..278b90e07
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
@@ -0,0 +1,166 @@
+From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 12 May 2019 21:58:02 +0200
+Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev
+ dependeny
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We do not have udev-native so it is a dependeny we cannot satisfy
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ lib/colord/cd-edid.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
+ lib/colord/cd-icc.c  | 62 -------------------------------------------
+ 2 files changed, 63 insertions(+), 62 deletions(-)
+
+diff --git a/lib/colord/cd-edid.c b/lib/colord/cd-edid.c
+index a5e2328..dec509a 100644
+--- a/lib/colord/cd-edid.c
++++ b/lib/colord/cd-edid.c
+@@ -687,3 +687,66 @@ cd_edid_new (void)
+ 	edid = g_object_new (CD_TYPE_EDID, NULL);
+ 	return CD_EDID (edid);
+ }
++
++/**
++ * cd_icc_create_from_edid_data:
++ * @icc: A valid #CdIcc
++ * @edid: EDID data
++ * @error: A #GError, or %NULL
++ *
++ * Creates an ICC profile from EDID data.
++ *
++ * Return value: %TRUE for success
++ *
++ * Since: 1.1.2
++ **/
++gboolean
++cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
++{
++	CdIccPrivate *priv = GET_PRIVATE (icc);
++	const gchar *data;
++
++	/* not loaded */
++	if (priv->lcms_profile != NULL) {
++		g_set_error_literal (error,
++				     CD_ICC_ERROR,
++				     CD_ICC_ERROR_FAILED_TO_CREATE,
++				     "already loaded or generated");
++		return FALSE;
++	}
++
++	/* create from parsed object */
++	if (!cd_icc_create_from_edid (icc,
++				      cd_edid_get_gamma (edid),
++				      cd_edid_get_red (edid),
++				      cd_edid_get_green (edid),
++				      cd_edid_get_blue (edid),
++				      cd_edid_get_white (edid),
++				      error)) {
++		return FALSE;
++	}
++
++	/* set copyright */
++	cd_icc_set_copyright (icc, NULL,
++			      /* deliberately not translated */
++			      "This profile is free of known copyright restrictions.");
++
++	/* set 'ICC meta Tag for Monitor Profiles' data */
++	data = cd_edid_get_checksum (edid);
++	if (data != NULL)
++		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
++	data = cd_edid_get_monitor_name (edid);
++	if (data != NULL)
++		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
++	data = cd_edid_get_serial_number (edid);
++	if (data != NULL)
++		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
++	data = cd_edid_get_pnp_id (edid);
++	if (data != NULL)
++		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
++	data = cd_edid_get_vendor_name (edid);
++	if (data != NULL)
++		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
++	return TRUE;
++}
++
+diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c
+index f231814..2c8fe77 100644
+--- a/lib/colord/cd-icc.c
++++ b/lib/colord/cd-icc.c
+@@ -3094,68 +3094,6 @@ out:
+ 	return ret;
+ }
+ 
+-/**
+- * cd_icc_create_from_edid_data:
+- * @icc: A valid #CdIcc
+- * @edid: EDID data
+- * @error: A #GError, or %NULL
+- *
+- * Creates an ICC profile from EDID data.
+- *
+- * Return value: %TRUE for success
+- *
+- * Since: 1.1.2
+- **/
+-gboolean
+-cd_icc_create_from_edid_data (CdIcc *icc, CdEdid *edid, GError **error)
+-{
+-	CdIccPrivate *priv = GET_PRIVATE (icc);
+-	const gchar *data;
+-
+-	/* not loaded */
+-	if (priv->lcms_profile != NULL) {
+-		g_set_error_literal (error,
+-				     CD_ICC_ERROR,
+-				     CD_ICC_ERROR_FAILED_TO_CREATE,
+-				     "already loaded or generated");
+-		return FALSE;
+-	}
+-
+-	/* create from parsed object */
+-	if (!cd_icc_create_from_edid (icc,
+-				      cd_edid_get_gamma (edid),
+-				      cd_edid_get_red (edid),
+-				      cd_edid_get_green (edid),
+-				      cd_edid_get_blue (edid),
+-				      cd_edid_get_white (edid),
+-				      error)) {
+-		return FALSE;
+-	}
+-
+-	/* set copyright */
+-	cd_icc_set_copyright (icc, NULL,
+-			      /* deliberately not translated */
+-			      "This profile is free of known copyright restrictions.");
+-
+-	/* set 'ICC meta Tag for Monitor Profiles' data */
+-	data = cd_edid_get_checksum (edid);
+-	if (data != NULL)
+-		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MD5, data);
+-	data = cd_edid_get_monitor_name (edid);
+-	if (data != NULL)
+-		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MODEL, data);
+-	data = cd_edid_get_serial_number (edid);
+-	if (data != NULL)
+-		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_SERIAL, data);
+-	data = cd_edid_get_pnp_id (edid);
+-	if (data != NULL)
+-		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_MNFT, data);
+-	data = cd_edid_get_vendor_name (edid);
+-	if (data != NULL)
+-		cd_icc_add_metadata (icc, CD_PROFILE_METADATA_EDID_VENDOR, data);
+-	return TRUE;
+-}
+-
+ /**
+  * cd_icc_create_from_edid:
+  * @icc: A valid #CdIcc
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord-native/Makefile
new file mode 100644
index 000000000..ca265ca6f
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord-native/Makefile
@@ -0,0 +1,48 @@
+# For native build cd_idt8, cd_create_profile and a tiny version of libcolord.so
+# only. By reducing the library to what's necessary, we avoid dependencies on
+# naitve udev and libgudev
+
+CFLAGS+=$(shell pkg-config --cflags gio-2.0)
+CFLAGS+=$(shell pkg-config --cflags lcms2)
+CFLAGS+=-I./lib -I./lib/colord -I$(DESTDIR) -DCD_COMPILATION
+
+LDFLAGS+=$(shell pkg-config --libs gio-2.0)
+LDFLAGS+=$(shell pkg-config --libs lcms2)
+LDFLAGS+=-lm
+
+all: cd_idt8 cd_create_profile
+
+LIBSOURCES = \
+	lib/colord/cd-it8.c \
+	lib/colord/cd-color.c \
+	lib/colord/cd-spectrum.c \
+	lib/colord/cd-math.c \
+	lib/colord/cd-interp-akima.c \
+	lib/colord/cd-context-lcms.c \
+	lib/colord/cd-interp.c \
+	lib/colord/cd-interp-linear.c \
+	lib/colord/cd-it8-utils.c \
+	lib/colord/cd-enum.c \
+    lib/colord/cd-icc.c \
+    lib/colord/cd-icc-utils.c \
+    lib/colord/cd-dom.c
+
+libcolord.so: $(LIBSOURCES)
+	$(CC) $(CFLAGS) -fPIC -shared -Wl,-soname,$@ $^ -o $(DESTDIR)/$@
+
+cd_idt8.o: client/cd-it8.c
+	$(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
+
+cd_idt8: libcolord.so cd_idt8.o
+	$(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_idt8.o -o $(DESTDIR)/$@
+
+cd_create_profile.o: client/cd-create-profile.c
+	$(CC) $(CFLAGS) -c $^ -o $(DESTDIR)/$@
+
+cd_create_profile: libcolord.so cd_create_profile.o
+	$(CC) $(LDFLAGS) -L$(DESTDIR) -lcolord $(DESTDIR)/cd_create_profile.o -o $(DESTDIR)/$@
+
+.PHONY: clean
+
+clean:
+	rm -f $(DESTDIR)/libcolord.so $(DESTDIR)/*.o $(DESTDIR)/cd_idt8 $(DESTDIR)/cd_create_profile
diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb
new file mode 100644
index 000000000..8eee9dad1
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord.bb
@@ -0,0 +1,42 @@
+require ${BPN}.inc
+
+inherit meson gobject-introspection gsettings gettext bash-completion systemd distro_features_check
+
+# polkit and gobject-introspection are mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+DEPENDS += " \
+    ${BPN}-native \
+    glib-2.0 \
+    lcms \
+    sqlite3 \
+    libgusb \
+    libgudev \
+    polkit \
+"
+
+SRC_URI += " \
+    file://0001-Run-native-cd_idt8-cd_create_profile.patch \
+"
+
+EXTRA_OEMESON = " \
+    -Dman=false \
+    -Ddocs=false \
+"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=true, systemd"
+
+SYSTEMD_SERVICE_${PN} = "colord.service"
+
+FILES_${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/polkit-1 \
+    ${datadir}/glib-2.0 \
+    ${datadir}/color \
+    ${systemd_user_unitdir} \
+    ${libdir}/tmpfiles.d \
+    ${libdir}/colord-plugins \
+    ${libdir}/colord-sensors \
+"
diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc
new file mode 100644
index 000000000..7497fed51
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord.inc
@@ -0,0 +1,13 @@
+SUMMARY = "Making color management just work"
+HOMEPAGE = "https://www.freedesktop.org/software/colord/"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \
+"
+
+PV = "1.4.4"
+SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8"
+SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5"
+
diff --git a/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
new file mode 100644
index 000000000..4b52aa337
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
@@ -0,0 +1,59 @@
+From 5aad8831c0fb71940d6c4f982b0b30ffb6ae33b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 12 May 2019 22:47:05 +0200
+Subject: [PATCH] Run native cd_idt8/cd_create_profile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ data/cmf/meson.build        | 2 +-
+ data/illuminant/meson.build | 2 +-
+ data/profiles/meson.build   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/cmf/meson.build b/data/cmf/meson.build
+index a693cd7..1ae3613 100644
+--- a/data/cmf/meson.build
++++ b/data/cmf/meson.build
+@@ -2,7 +2,7 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ]
+   custom_target(arg,
+     input: arg + '.csv',
+     output: arg + '.cmf',
+-    command: [ cd_idt8, 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
++    command: [ 'cd_idt8', 'create-cmf', '@OUTPUT@', '@INPUT@', '1.0' ],
+     install: true,
+     install_dir: join_paths(datadir, 'colord', 'cmf')
+   )
+diff --git a/data/illuminant/meson.build b/data/illuminant/meson.build
+index f8dfa07..ad7dced 100644
+--- a/data/illuminant/meson.build
++++ b/data/illuminant/meson.build
+@@ -24,7 +24,7 @@ foreach arg: generated_spectra
+   custom_target(arg,
+     input: arg + '.csv',
+     output: arg + '.sp',
+-    command: [ cd_idt8, 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
++    command: [ 'cd_idt8', 'create-sp', '@OUTPUT@', '@INPUT@', '100.0' ],
+     install: true,
+     install_dir: join_paths(datadir, 'colord', 'illuminant')
+   )
+diff --git a/data/profiles/meson.build b/data/profiles/meson.build
+index 591b97d..2cef011 100644
+--- a/data/profiles/meson.build
++++ b/data/profiles/meson.build
+@@ -59,7 +59,7 @@ foreach arg: icc_profiles
+   generated_icc = custom_target(arg + '.icc',
+     input: xml_i18n,
+     output: arg + '.icc',
+-    command: [ cd_create_profile, '--output=@OUTPUT@', '@INPUT@' ],
++    command: [ 'cd_create_profile', '--output=@OUTPUT@', '@INPUT@' ],
+     install: true,
+     install_dir: join_paths(datadir, 'color', 'icc', 'colord'),
+   )
+-- 
+2.20.1
+
-- 
2.20.1

[PATCH 29/41] colord-gtk: initial add 0.1.26

[Andreas Müller]

it is a dependency for upcoming gnome-control-center

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../colord-gtk/colord-gtk_0.1.26.bb           | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta-gnome/recipes-support/colord-gtk/colord-gtk_0.1.26.bb

diff --git a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.1.26.bb b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.1.26.bb
new file mode 100644
index 000000000..ce0c539a0
--- /dev/null
+++ b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.1.26.bb
@@ -0,0 +1,19 @@
+SUMMARY = "GTK support library for colord"
+HOMEPAGE = "https://www.freedesktop.org/software/colord/"
+LICENSE = "LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+inherit autotools gettext gobject-introspection
+
+DEPENDS = " \
+    intltool-native \
+    libxslt-native \
+    glib-2.0-native \
+    gtk+3 \
+    colord \
+"
+
+SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "bb9d6f3c037152ad791003375aa6c16c"
+SRC_URI[sha256sum] = "28d00b7f157ea3e2ea5315387b2660fde82faba16674861c50465e55d61a3e45"
+
-- 
2.20.1

[PATCH 30/41] itstool: upgrade 2.0.5 -> 2.0.6

[Andreas Müller]

* move to github sources: at the time of writing download server had
  certificate issues
* add patch to fix possible segfault

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...on-fault-bug-introduced-with-version.patch | 33 +++++++++++++++++++
 .../{itstool_2.0.5.bb => itstool_2.0.6.bb}    |  9 +++--
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
 rename meta-oe/recipes-support/itstool/{itstool_2.0.5.bb => itstool_2.0.6.bb} (70%)

diff --git a/meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch b/meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
new file mode 100644
index 000000000..9783faee6
--- /dev/null
+++ b/meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
@@ -0,0 +1,33 @@
+From 6dbc1d78e83144c425df1f4ec9e293dba64afcb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 14 May 2019 11:21:03 +0200
+Subject: [PATCH] Fix a segmentation fault bug introduced with version 2.0.4.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://github.com/itstool/itstool/pull/18
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ itstool.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/itstool.in b/itstool.in
+index e64cd34..d79fb7f 100755
+--- a/itstool.in
++++ b/itstool.in
+@@ -1053,7 +1053,7 @@ class Document (object):
+         else:
+             ctxt.replaceEntities(1)
+         ctxt.parseDocument()
+-        trnode = ctxt.doc().getRootElement()
++        trnode = ctxt.doc().getRootElement().copyNode(1)
+         try:
+             self._check_errors()
+         except libxml2.parserError:
+-- 
+2.20.1
+
diff --git a/meta-oe/recipes-support/itstool/itstool_2.0.5.bb b/meta-oe/recipes-support/itstool/itstool_2.0.6.bb
similarity index 70%
rename from meta-oe/recipes-support/itstool/itstool_2.0.5.bb
rename to meta-oe/recipes-support/itstool/itstool_2.0.6.bb
index 166e95b3a..2caa64604 100644
--- a/meta-oe/recipes-support/itstool/itstool_2.0.5.bb
+++ b/meta-oe/recipes-support/itstool/itstool_2.0.6.bb
@@ -7,9 +7,12 @@ inherit autotools python3native
 
 DEPENDS = "python3-lxml-native"
 
-SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "655c6f78fc64faee45adcc45ccc5a57e"
-SRC_URI[sha256sum] = "100506f8df62cca6225ec3e631a8237e9c04650c77495af4919ac6a100d4b308"
+SRC_URI = " \
+    git://github.com/itstool/itstool.git \
+    file://0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch \
+"
+SRCREV = "60f3a955ca047b1d62a1d952beec74afaff7cbbf"
+S = "${WORKDIR}/git"
 
 do_install_append() {
     # fix shebang of main script
-- 
2.20.1

[PATCH 31/41] libwacom: initial add 0.33

[Andreas Müller]

It is a dependency for upcoming gnome-settings-daemon

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-support/libwacom/libwacom_0.33.bb      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 meta-gnome/recipes-support/libwacom/libwacom_0.33.bb

diff --git a/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb b/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
new file mode 100644
index 000000000..6fb3b82ef
--- /dev/null
+++ b/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
@@ -0,0 +1,14 @@
+SUMMARY = "A tablet description library"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
+
+DEPENDS = " \
+    libxml2-native \
+    libgudev \
+"
+
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/linuxwacom/libwacom.git"
+SRCREV = "87cc710e21a6220e267dd08936bbec2932aa3658"
+S = "${WORKDIR}/git"
-- 
2.20.1

[PATCH 32/41] geocode-glib: initial add 3.26.1

[Andreas Müller]

It is a dependency for upcoming gnome-settings-daemon

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../geocode-glib/geocode-glib_3.26.1.bb       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb

diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
new file mode 100644
index 000000000..dc218f3a3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
@@ -0,0 +1,20 @@
+SUMMARY = "A convenience library for the geocoding"
+
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+GNOMEBASEBUILDCLASS = "meson"
+GIR_MESON_OPTION = "enable-introspection"
+GTKDOC_MESON_OPTION = "enable-gtk-doc"
+
+inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even
+
+DEPENDS = " \
+    json-glib \
+    libsoup-2.4 \
+"
+
+SRC_URI[archive.md5sum] = "21094494e66c86368add6a55bf480049"
+SRC_URI[archive.sha256sum] = "5baa6ab76a76c9fc567e4c32c3af2cd1d1784934c255bc5a62c512e6af6bde1c"
+
+EXTRA_OEMESON = "-Denable-installed-tests=false"
-- 
2.20.1

[PATCH 33/41] libgweather: initial add 3.32.1

[Andreas Müller]

It is a dependency for upcoming gnome-settings-daemon

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../libgweather/libgweather_3.32.1.bb         | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_3.32.1.bb

diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.1.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.1.bb
new file mode 100644
index 000000000..b9aa4ef7e
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather_3.32.1.bb
@@ -0,0 +1,24 @@
+SUMMARY = "A library to access weather information from online services"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gobject-introspection gettext gtk-doc vala distro_features_check
+
+SRC_URI[archive.md5sum] = "048de183cbeaf7353a875cb5ebd9b4f9"
+SRC_URI[archive.sha256sum] = "1c2218ed71230dd2c550ca4fd3dab53e2f2831d38982c213575f34e48d68e980"
+
+# gobject-introspection is mandatory and cannot be configured
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+UNKNOWN_CONFIGURE_WHITELIST_append = " introspection"
+
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+DEPENDS = " \
+    gtk+3 \
+    json-glib \
+    libsoup-2.4 \
+    geocode-glib \
+"
-- 
2.20.1

[PATCH 34/41] pinpoint: remove dead project

[Andreas Müller]

* it is an app so nothing depends on it
* last commit was 2016
* last release was 2015

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-apps/pinpoint/pinpoint_git.bb     | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb

diff --git a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
deleted file mode 100644
index bf5178cf8..000000000
--- a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "A simple presentation tool for hackers"
-DESCRIPTION = "Pinpoint is a simple presentation tool that hopes to avoid audience death \
-               by bullet point and instead encourage presentations containing beautiful \
-               images and small amounts of concise text in slides."
-SECTION = "x11/multimedia"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
-                    file://pinpoint.c;beginline=6;endline=17;md5=201d438283607da393fae6aca085454c"
-
-DEPENDS = "glib-2.0 gdk-pixbuf cogl-1.0 clutter-1.0 clutter-gst-3.0 librsvg"
-
-inherit autotools gettext pkgconfig distro_features_check
-
-# cogl requires opengl
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-SRC_URI = "git://git.gnome.org/pinpoint"
-
-SRCREV = "80a056c57e819d0b75035424638813b0670830e1"
-PV = "0.1.4+gitr${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-RRECOMMENDS_${PN} = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
-- 
2.20.1

[PATCH 35/41] libgnomekbd: cleanup

[Andreas Müller]

* cleanup inherit -> EXTRA_OECONF_remove can go
* remove unnecessary DEPENDS
* remove GNOME_COMPRESS_TYPE = "xz"
* rename folder libgnome -> libgnomekbd

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{libgnome => libgnomekbd}/libgnomekbd_3.26.1.bb      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
 rename meta-gnome/recipes-gnome/{libgnome => libgnomekbd}/libgnomekbd_3.26.1.bb (63%)

diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb b/meta-gnome/recipes-gnome/libgnomekbd/libgnomekbd_3.26.1.bb
similarity index 63%
rename from meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb
rename to meta-gnome/recipes-gnome/libgnomekbd/libgnomekbd_3.26.1.bb
index 3a7379f9e..8d84b79cc 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb
+++ b/meta-gnome/recipes-gnome/libgnomekbd/libgnomekbd_3.26.1.bb
@@ -4,16 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
 
 SECTION = "x11/gnome/libs"
 
-DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native"
+DEPENDS = "gtk+3 libxklavier"
 
-inherit distro_features_check gnome gobject-introspection gettext
+inherit gnomebase gobject-introspection gettext distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-GNOME_COMPRESS_TYPE = "xz"
-
 SRC_URI[archive.md5sum] = "98040022484406e7ebe25f82cef93344"
 SRC_URI[archive.sha256sum] = "f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679"
-
-EXTRA_OECONF_remove = "--disable-schemas-install"
-
-- 
2.20.1

[PATCH 36/41] libwnck: GNOME_COMPRESS_TYPE = "xz"

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb | 1 -
 1 file changed, 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 ea4c8df53..f50b9ceb9 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
@@ -11,7 +11,6 @@ PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-s
 inherit gnomebase gobject-introspection distro_features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
-GNOME_COMPRESS_TYPE = "xz"
 SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32"
 SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e"
 
-- 
2.20.1

[PATCH 37/41] rygel: remove GNOME_COMPRESS_TYPE = "xz"

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb
index 4869d866f..0adc721d8 100644
--- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb
+++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb
@@ -12,7 +12,6 @@ DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstream
 RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info"
 RRECOMMENDS_${PN} = "rygel-plugin-media-export"
 
-GNOME_COMPRESS_TYPE = "xz"
 SRC_URI[archive.md5sum] = "f897167ad82e2e741582f2c393a76843"
 SRC_URI[archive.sha256sum] = "dfd3d885da3ac383ba0cfbf119995f4a0c2bca2cc8f8cfcd3df10cfec8f35cd7"
 
-- 
2.20.1

[PATCH 38/41] libmediaart(-2.0): remove GNOME_COMPRESS_TYPE = "xz"

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-multimedia/recipes-support/libmediaart/libmediaart.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
index 57dca9c17..c7b368de3 100644
--- a/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
+++ b/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
@@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
 
 DEPENDS = "glib-2.0 gdk-pixbuf"
 
-GNOME_COMPRESS_TYPE = "xz"
-
 inherit gnomebase gtk-doc gobject-introspection
 
 EXTRA_OECONF = "--disable-qt --enable-gdkpixbuf"
-- 
2.20.1

[PATCH 39/41] gvfs: upgrade 1.40.0 -> 1.40.1

[Andreas Müller]

* gnome-online-accounts will be added soon so add PACKAGECONFIG 'goa' disabled
  by default for people not building gnome-desktop.
* gconf dependency is not necessary these days

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../gvfs/{gvfs_1.40.0.bb => gvfs_1.40.1.bb}          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
 rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.40.0.bb => gvfs_1.40.1.bb} (87%)

diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.1.bb
similarity index 87%
rename from meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
rename to meta-gnome/recipes-gnome/gvfs/gvfs_1.40.1.bb
index 7caee2771..6e6358865 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.0.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.1.bb
@@ -5,17 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
 GNOMEBASEBUILDCLASS = "meson"
 inherit gnome bash-completion gettext upstream-version-is-even
 
-DEPENDS += "libsecret glib-2.0 gconf libgudev udisks2 polkit shadow-native"
+DEPENDS += "libsecret glib-2.0 libgudev udisks2 polkit shadow-native"
 
 SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
-
-SRC_URI[archive.md5sum] = "96ef53ed613e4d223e0db3a7acea44f0"
-SRC_URI[archive.sha256sum] = "3739d64b79c95a9f0f9faf2c5f9e5298b4b2ebdd6431435ce656ecd19b31e2f2"
-
+SRC_URI[archive.md5sum] = "78496947d11a330d5435d669eade70ad"
+SRC_URI[archive.sha256sum] = "927af496efee4767f1ba12694190f9c93bc512a44854e88dbb6f5792abfad6b1"
 
 EXTRA_OEMESON = " \
     -Dbluray=false \
-    -Dgoa=false \
     -Dgoogle=false \
     -Dnfs=false \
     -Dudisks2=true \
@@ -42,12 +39,13 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun
 
 RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh"
 
-PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG ??= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 
 PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist"
 PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive"
 PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi"
 PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr"
+PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts"
 PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4"
 PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp"
 PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd"
-- 
2.20.1

[PATCH 40/41] upower: upgrade 0.99.7 -> 0.99.10

[Andreas Müller]

* backported patch can go
* unfortunately they stopped maintaining [1] without note and moved to gitlab
* since they hint with a checksum and we have not heard that gitlab rebuilds
  tarballs, let's try tarball download because it's cheaper

[1] https://upower.freedesktop.org/releases/

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...everity-of-unhandled-action-messages.patch | 31 -------------------
 .../{upower_0.99.7.bb => upower_0.99.10.bb}   | 16 +++++-----
 2 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch
 rename meta-oe/recipes-support/upower/{upower_0.99.7.bb => upower_0.99.10.bb} (73%)

diff --git a/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch b/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch
deleted file mode 100644
index de89dc01c..000000000
--- a/meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f64b6ce8054b47e5bdcc8c4c7965534b388e6151 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Fri, 6 Apr 2018 11:26:54 -0700
-Subject: [PATCH] linux: lower severity of "unhandled action" messages
-
-Newer kernels emit bind/unbind uevents that are not of interest to
-powerd. To avoid littering logs with scary messages, let's lower their
-severity to "debug".
-
-https://bugs.freedesktop.org/show_bug.cgi?id=106019
-
-Upstream-Status: Backport
----
- src/linux/up-backend.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
-index e668dc8..b8021e7 100644
---- a/src/linux/up-backend.c
-+++ b/src/linux/up-backend.c
-@@ -273,7 +273,7 @@ up_backend_uevent_signal_handler_cb (GUdevClient *client, const gchar *action,
- 		g_debug ("SYSFS change %s", g_udev_device_get_sysfs_path (device));
- 		up_backend_device_changed (backend, device);
- 	} else {
--		g_warning ("unhandled action '%s' on %s", action, g_udev_device_get_sysfs_path (device));
-+		g_debug ("unhandled action '%s' on %s", action, g_udev_device_get_sysfs_path (device));
- 	}
- }
- 
--- 
-2.17.0.484.g0c8726318c-goog
diff --git a/meta-oe/recipes-support/upower/upower_0.99.7.bb b/meta-oe/recipes-support/upower/upower_0.99.10.bb
similarity index 73%
rename from meta-oe/recipes-support/upower/upower_0.99.7.bb
rename to meta-oe/recipes-support/upower/upower_0.99.10.bb
index 3fd91e958..8d5b2a4de 100644
--- a/meta-oe/recipes-support/upower/upower_0.99.7.bb
+++ b/meta-oe/recipes-support/upower/upower_0.99.10.bb
@@ -4,12 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08"
 
 DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib polkit"
 
-SRC_URI = " \
-    http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
-    file://0001-linux-lower-severity-of-unhandled-action-messages.patch \
-"
-SRC_URI[md5sum] = "236bb439d9ff1151450b3d8582399532"
-SRC_URI[sha256sum] = "24bcc2f6ab25a2533bac70b587bcb019e591293076920f5b5e04bdedc140a401"
+SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/uploads/c438511024b9bc5a904f8775cfc8e4c4/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "ac6b6bee31110fd8478a8e881c40fba6"
+SRC_URI[sha256sum] = "642251b97080ede8be6dbfeaf8f30ff6eadd6eb27aa137bc50f5b9b2295ba29d"
 
 inherit autotools pkgconfig gettext gobject-introspection systemd distro_features_check
 
@@ -33,7 +30,8 @@ do_configure_prepend() {
 
 RDEPENDS_${PN} += "dbus"
 RRECOMMENDS_${PN} += "pm-utils"
-FILES_${PN} += "${datadir}/dbus-1/ \
-                ${datadir}/polkit-1/ \
-                ${base_libdir}/udev/* \
+FILES_${PN} += " \
+    ${datadir}/dbus-1/ \
+    ${datadir}/polkit-1/ \
+    ${base_libdir}/udev/* \
 "
-- 
2.20.1

[PATCH 41/41] xserver-xorg-cvt-native: initial add 1.20.4

[Andreas Müller]

upcoming mutter requires cvt to calculate source code tables of default video
modes - wow

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../xserver-xorg-cvt-native_1.20.4.bb         | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.4.bb

diff --git a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.4.bb b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.4.bb
new file mode 100644
index 000000000..c80a295a5
--- /dev/null
+++ b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.4.bb
@@ -0,0 +1,43 @@
+# Copy & paste from oe-core/xserver-xorg
+
+SUMMARY = "X.Org X cvt"
+HOMEPAGE = "https://linux.die.net/man/1/cvt"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
+
+DEPENDS += "pixman-native"
+
+XORG_PN = "xorg-server"
+
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650"
+SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+B = "${WORKDIR}/build"
+
+inherit native pkgconfig
+
+do_configure[noexec] = "1"
+
+do_compile() {
+    cd ${S}
+    for header in `find -name '*.h'`; do
+        path=`dirname $header`
+        if ! echo "$incpaths" | grep -q "$path" ; then
+            incpaths="$incpaths -I$path"
+        fi
+    done
+    CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`"
+    LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`"
+    ${CC} $CFLAGS -o ${B}/cvt \
+        ${S}/hw/xfree86/utils/cvt/cvt.c \
+        ${S}/hw/xfree86/modes/xf86cvt.c \
+        ${S}/os/xprintf.c \
+        $LDFLAGS
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${B}/cvt ${D}${bindir}
+}
-- 
2.20.1

Re: [PATCH 07/41] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles'

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org <openembedded-
> devel-bounces@lists.openembedded.org> On Behalf Of Andreas Müller
> Sent: den 23 maj 2019 08:48
> To: openembedded-devel@lists.openembedded.org
> Subject: [oe] [PATCH 07/41] gnome-help.bbclass: Handle gnome-help files
> with new distro feature 'helpfiles'
> 
> Gnome help file generation cannot be configured so handle files
> properly
> 
> * Add a new distro feature 'helpfiles':
>    If set: split help file into ${PN}-help-*
>    If not set: delete help files on installation
> * Append ${PN}-help-.* to PACKAGES_DYNAMIC
> 
> Once accepted / applied it takes a on-line patch to add help files based on

I assume you mean "one-line"?

> IMAGE_LINGUAS.
> 
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

//Peter

Re: [PATCH 07/41] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles'

[Andreas Müller]

On Thu, May 23, 2019 at 10:55 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: openembedded-devel-bounces@lists.openembedded.org <openembedded-
> > devel-bounces@lists.openembedded.org> On Behalf Of Andreas Müller
> > Sent: den 23 maj 2019 08:48
> > To: openembedded-devel@lists.openembedded.org
> > Subject: [oe] [PATCH 07/41] gnome-help.bbclass: Handle gnome-help files
> > with new distro feature 'helpfiles'
> >
> > Gnome help file generation cannot be configured so handle files
> > properly
> >
> > * Add a new distro feature 'helpfiles':
> >    If set: split help file into ${PN}-help-*
> >    If not set: delete help files on installation
> > * Append ${PN}-help-.* to PACKAGES_DYNAMIC
> >
> > Once accepted / applied it takes a on-line patch to add help files based on
>
> I assume you mean "one-line"?
Your assumption is correct :)
>
> > IMAGE_LINGUAS.
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>
> //Peter
>
Andreas

Re: [PATCH 07/41] gnome-help.bbclass: Handle gnome-help files with new distro feature 'helpfiles'

[Khem Raj]

On 5/23/19 2:43 AM, Andreas Müller wrote:
> On Thu, May 23, 2019 at 10:55 AM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
>>
>>> -----Original Message-----
>>> From: openembedded-devel-bounces@lists.openembedded.org <openembedded-
>>> devel-bounces@lists.openembedded.org> On Behalf Of Andreas Müller
>>> Sent: den 23 maj 2019 08:48
>>> To: openembedded-devel@lists.openembedded.org
>>> Subject: [oe] [PATCH 07/41] gnome-help.bbclass: Handle gnome-help files
>>> with new distro feature 'helpfiles'
>>>
>>> Gnome help file generation cannot be configured so handle files
>>> properly
>>>
>>> * Add a new distro feature 'helpfiles':
>>>     If set: split help file into ${PN}-help-*
>>>     If not set: delete help files on installation
>>> * Append ${PN}-help-.* to PACKAGES_DYNAMIC
>>>
>>> Once accepted / applied it takes a on-line patch to add help files based on
>>
>> I assume you mean "one-line"?
> Your assumption is correct :)

I cant apply this patch when taken from patchwork.

>>
>>> IMAGE_LINGUAS.
>>>
>>> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>>
>> //Peter
>>
> Andreas
> 

Re: [PATCH 08/41] evolution-data-server: uprade 3.26.6 -> 3.32.2 and rework

[Khem Raj]

small nit, typo in subject

On 5/22/19 11:48 PM, Andreas Müller wrote:
> * Unfortuantely they stopped maintaing Changelog and suggest to clone the repo.
> * a native variant had to be introduced for code-generator tools
> * gobject-introspection builds theoretically :) Unfortunataelly qemu runs
>    with 100% CPU load and never returns -> disable introspection for now
> * add PACKAGECONFIGs for new dependencies - disabled by default
> * give up fine grained packaging: It was broken over the years completely
>    and nobody seemed to take care.
> * ICU-patch does not apply anymore and it seems upstream has fixed issues
>    with ICU
> * add upstream-version-is-even to inherit
> * rename folder containing recipe
> * get rid of gconf dependency
> 
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>   ...nded-way-to-handle-the-icu-namespace.patch |  46 -------
>   .../evolution-data-server-native.bb           |  23 ++++
>   .../evolution-data-server.bb}                 | 123 +++++-------------
>   .../evolution-data-server.inc                 |  16 +++
>   ...keLists.txt-Remove-TRY_RUN-for-iconv.patch |  24 ++--
>   ...txt-remove-CHECK_C_SOURCE_RUNS-check.patch |   0
>   ...the-Novell-sample-contact-with-somet.patch |   0
>   ...abi-from-the-default-C-warning-flags.patch |  29 +++++
>   .../0005-call-native-helpers.patch            |  45 +++++++
>   .../evolution-data-server/iconv-detect.h      |   0
>   10 files changed, 158 insertions(+), 148 deletions(-)
>   delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
>   rename meta-gnome/recipes-gnome/{eds/evolution-data-server_3.26.6.bb => evolution-data-server/evolution-data-server.bb} (15%)
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch (59%)
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch (100%)
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch (100%)
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/iconv-detect.h (100%)
> 
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
> deleted file mode 100644
> index d3b0ac673..000000000
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From 698a0e104dcbe4b630df848fd4af7c59f76cdc37 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sat, 5 May 2018 17:46:52 -0700
> -Subject: [PATCH] Use recommended way to handle the icu namespace
> -
> -Fixes build with icu >= 61
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - src/libedataserver/e-alphabet-index-private.cpp | 2 ++
> - src/libedataserver/e-transliterator-private.cpp | 2 ++
> - 2 files changed, 4 insertions(+)
> -
> -diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
> -index d3e44f4..ddffd99 100644
> ---- a/src/libedataserver/e-alphabet-index-private.cpp
> -+++ b/src/libedataserver/e-alphabet-index-private.cpp
> -@@ -33,9 +33,11 @@
> -
> - /* ICU headers */
> - #include <unicode/alphaindex.h>
> -+#include <unicode/ustring.h>
> -
> - using icu::AlphabeticIndex;
> - using icu::Locale;
> -+using U_ICU_NAMESPACE::UnicodeString;
> -
> - struct _EAlphabetIndex {
> - 	AlphabeticIndex *priv;
> -diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
> -index bb15593..573446f 100644
> ---- a/src/libedataserver/e-transliterator-private.cpp
> -+++ b/src/libedataserver/e-transliterator-private.cpp
> -@@ -33,8 +33,10 @@
> -
> - /* ICU headers */
> - #include <unicode/translit.h>
> -+#include <unicode/ustring.h>
> -
> - using icu::Transliterator;
> -+using U_ICU_NAMESPACE::UnicodeString;
> -
> - struct _ETransliterator {
> - 	Transliterator *priv;
> diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
> new file mode 100644
> index 000000000..681a61c33
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
> @@ -0,0 +1,23 @@
> +require ${BPN}.inc
> +
> +inherit native
> +
> +DEPENDS = "glib-2.0-native"
> +
> +# build native helpers
> +do_compile() {
> +    cd ${S}/src/camel
> +    sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c
> +    ${CC} -o ${B}/camel-gen-tables camel-gen-tables.c ${CFLAGS} ${LDFLAGS}
> +
> +    LDFLAGS_glib=`pkg-config glib-2.0 --libs`
> +    CFLAGS_glib=`pkg-config glib-2.0 --cflags`
> +    cd ${S}/src/addressbook/libebook-contacts
> +    sed -i 's:#include "evolution-data-server-config.h"::g' gen-western-table.c
> +    ${CC} -o ${B}/gen-western-table gen-western-table.c ${CFLAGS} ${CFLAGS_glib} ${LDFLAGS} ${LDFLAGS_glib}
> +}
> +
> +do_install() {
> +    install -d ${D}${bindir}
> +    install -m 755 ${B}/* ${D}${bindir}
> +}
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
> similarity index 15%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
> index 1949fc7fd..5f535c1b5 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.6.bb
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
> @@ -1,51 +1,48 @@
> -SUMMARY = "Evolution database backend server"
> -HOMEPAGE = "http://www.gnome.org/projects/evolution/"
> -BUGTRACKER = "https://bugzilla.gnome.org/"
> -
> -LICENSE = "LGPLv2 & LGPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
> -                    file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
> -                    file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \
> -                    file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196"
> +require ${BPN}.inc
>   
>   DEPENDS = " \
> -    intltool-native gperf-native \
> -    glib-2.0 gtk+3 gconf libgnome-keyring libgdata \
> +    ${BPN}-native intltool-native gperf-native \
> +    glib-2.0 gtk+3 libgdata \
>       dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
>   "
>   
> -inherit distro_features_check gnomebase cmake gtk-doc gettext gobject-introspection perlnative pythonnative
> +inherit distro_features_check cmake gtk-doc gettext gobject-introspection perlnative pythonnative
>   
>   REQUIRED_DISTRO_FEATURES = "x11"
>   
> -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
> -           file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
> -           file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
> -           file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
> -           file://iconv-detect.h \
> -           file://0004-Use-recommended-way-to-handle-the-icu-namespace.patch \
> -           "
> -SRC_URI[archive.md5sum] = "ae7bbf543b2c3ff79af27e0edea5d472"
> -SRC_URI[archive.sha256sum] = "e43aa1847ddc02965f560261ef88d18fb8704eddaa55555bf96b884a33e510ec"
> +SRC_URI += " \
> +    file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
> +    file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
> +    file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
> +    file://0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch \
> +    file://0005-call-native-helpers.patch \
> +    file://iconv-detect.h \
> +"
>   
>   LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
>   LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF"
>   
> +# For arm qemu-arm runs at 100% CPU load and never returns - so disable introspection for now
> +GI_DATA_ENABLED="False"
> +
>   EXTRA_OECMAKE = " \
> +    -DSYSCONF_INSTALL_DIR=${sysconfdir} \
>       -DWITH_KRB5=OFF \
>       -DENABLE_GOA=OFF \
>       -DENABLE_UOA=OFF \
>       -DENABLE_GOOGLE_AUTH=OFF \
>       -DENABLE_WEATHER=OFF \
> +    -DENABLE_INTROSPECTION=${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'ON', 'OFF', d)} \
>       -D${LKSTRFTIME} \
>       -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
>   "
>   
> -PACKAGECONFIG ??= ""
> -PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
> +PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
> +PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
>   
> -EXTRA_OECONF = "--with-libdb=${STAGING_DIR_HOST}${prefix} \
> -                --disable-nntp --disable-gtk-doc"
> +# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
> +# searching for openldap-libs
> +PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
>   
>   # -ldb needs this on some platforms
>   LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
> @@ -55,78 +52,20 @@ do_configure_append () {
>   
>       # fix native perl shebang
>       sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard
> +
> +    # fix abs path for g-ir-scanner-wrapper
> +    sed  -i ${B}/build.ninja \
> +        -e 's: ${bindir}/g-ir-scanner-wrapper: ${STAGING_BINDIR}/g-ir-scanner-wrapper:g'
>   }
>   
>   do_compile_prepend() {
>       export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs"
>   }
>   
> +FILES_${PN} =+ " \
> +    ${datadir}/dbus-1 \
> +    ${datadir}/evolution-data-server-*/ui/ \
> +    ${systemd_user_unitdir} \
> +"
>   
> -PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
> -             libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
> -             libedataserver libedataserver-dev \
> -             libedataserverui libedataserverui-dev"
> -
> -FILES_${PN} =+ "${systemd_user_unitdir} \
> -                ${datadir}/dbus-1 \
> -                ${datadir}/evolution-data-server-*/ui/"
>   RDEPENDS_${PN} += "perl"
> -
> -FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc"
> -FILES_${PN}-dbg =+ "${libdir}/evolution-data-server*/camel-providers/.debug \
> -                    ${libdir}/evolution-data-server*/calendar-backends/.debug \
> -                    ${libdir}/evolution-data-server*/addressbook-backends/.debug \
> -                    ${libdir}/evolution-data-server*/extensions/.debug/"
> -
> -RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev"
> -
> -FILES_libcamel = "${libdir}/libcamel-*.so.* \
> -                  ${libdir}/libcamel-provider-*.so.* \
> -                  ${libdir}/evolution-data-server*/camel-providers/*.so \
> -                  ${libdir}/evolution-data-server*/camel-providers/*.urls"
> -FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \
> -                      ${libdir}/pkgconfig/camel*pc \
> -                      ${libdir}/evolution-data-server*/camel-providers/*.la \
> -                      ${includedir}/evolution-data-server*/camel"
> -
> -FILES_libebook = "${libdir}/libebook-*.so.*"
> -FILES_libebook-dev = "${libdir}/libebook-1.2.so \
> -                      ${libdir}/pkgconfig/libebook-*.pc \
> -                      ${includedir}/evolution-data-server*/libebook/*.h"
> -RRECOMMENDS_libebook = "libedata-book"
> -
> -FILES_libecal = "${libdir}/libecal-*.so.* \
> -                 ${datadir}/evolution-data-server-1.4/zoneinfo"
> -FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \
> -                     ${includedir}/evolution-data-server*/libecal/*.h \
> -                     ${includedir}/evolution-data-server*/libical/*.h"
> -RRECOMMENDS_libecal = "libedata-cal tzdata"
> -
> -FILES_libedata-book = "${libexecdir}/e-addressbook-factory \
> -                       ${datadir}/dbus-1/services/*.AddressBook.service \
> -                       ${libdir}/libedata-book-*.so.* \
> -                       ${libdir}/evolution-data-server-*/extensions/libebook*.so \
> -                       ${datadir}/evolution-data-server-1.4/weather/Locations.xml"
> -FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \
> -                           ${libdir}/pkgconfig/libedata-book-*.pc \
> -                           ${libdir}/evolution-data-server-*/extensions/libebook*.la \
> -                           ${includedir}/evolution-data-server-*/libedata-book"
> -
> -FILES_libedata-cal = "${libexecdir}/e-calendar-factory \
> -                      ${datadir}/dbus-1/services/*.Calendar.service \
> -                      ${libdir}/libedata-cal-*.so.* \
> -                      ${libdir}/evolution-data-server-*/extensions/libecal*.so"
> -FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \
> -                          ${libdir}/pkgconfig/libedata-cal-*.pc \
> -                          ${includedir}/evolution-data-server-*/libedata-cal \
> -                          ${libdir}/evolution-data-server-*/extensions/libecal*.la"
> -
> -FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
> -FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \
> -                            ${libdir}/pkgconfig/libedataserver-*.pc \
> -                            ${includedir}/evolution-data-server-*/libedataserver/*.h"
> -
> -FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade"
> -FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \
> -                              ${libdir}/pkgconfig/libedataserverui-*.pc \
> -                              ${includedir}/evolution-data-server-*/libedataserverui/*.h"
> diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
> new file mode 100644
> index 000000000..2ea94920b
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
> @@ -0,0 +1,16 @@
> +SUMMARY = "Evolution database backend server"
> +HOMEPAGE = "http://www.gnome.org/projects/evolution/"
> +BUGTRACKER = "https://bugzilla.gnome.org/"
> +
> +LICENSE = "LGPLv2 & LGPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
> +                    file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
> +                    file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543 \
> +                    file://src/calendar/libecal/e-cal.h;endline=24;md5=e699ec3866f73f129f7a4ffffdcfc196"
> +
> +inherit gnomebase
> +
> +SRC_URI[archive.md5sum] = "965648316c7cee06f49878eceed5da01"
> +SRC_URI[archive.sha256sum] = "7ea7491065fd0382f2268cf6bf95331a75dfda587d5940deb47f9e74be1ab3c9"
> +PV = "3.32.2"
> +
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> similarity index 59%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> index a821a14ab..e8c6d6a76 100644
> --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
> @@ -1,6 +1,6 @@
>   From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
>   From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> -Date: Tue, 19 Dec 2017 16:37:20 +0100
> +Date: Sun, 31 Mar 2019 18:11:55 +0200
>   Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
>   MIME-Version: 1.0
>   Content-Type: text/plain; charset=UTF-8
> @@ -13,20 +13,24 @@ Upstream-Status: Inappropriate [OE specific]
>   
>   Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>   ---
> - CMakeLists.txt | 5 -----
> - 1 file changed, 5 deletions(-)
> + CMakeLists.txt | 11 -----------
> + 1 file changed, 11 deletions(-)
>   
>   diff --git a/CMakeLists.txt b/CMakeLists.txt
> -index 8d07772..a2396f2 100644
> +index 1672daf..0b3e4e0 100644
>   --- a/CMakeLists.txt
>   +++ b/CMakeLists.txt
> -@@ -521,13 +521,8 @@ if(NOT HAVE_ICONV)
> +@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV)
> + 	message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
>    endif(NOT HAVE_ICONV)
>    
> - set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
> --CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
> - unset(CMAKE_REQUIRED_LIBRARIES)
> -
> +-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
> +-file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
> +-CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\"
> +-		     #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
> +-unset(_binary_dir_with_separator)
> +-unset(CMAKE_REQUIRED_LIBRARIES)
> +-
>   -if(NOT _correct_iconv)
>   -	message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
>   -endif(NOT _correct_iconv)
> @@ -35,5 +39,5 @@ index 8d07772..a2396f2 100644
>    # Backtraces for debugging
>    # ******************************
>   --
> -2.14.3
> +2.20.1
>   
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> similarity index 100%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> similarity index 100%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
> diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
> new file mode 100644
> index 000000000..8cfc1f8d6
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
> @@ -0,0 +1,29 @@
> +From 3cfeb3c7f458c6fe40c67cea43987b45cf6cbeaf Mon Sep 17 00:00:00 2001
> +From: Milan Crha <mcrha@redhat.com>
> +Date: Thu, 14 Mar 2019 14:16:56 +0100
> +Subject: [PATCH] I#94 - Remove -Wabi from the default C++ warning flags
> +
> +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/94
> +
> +Upstream-Status: Applied [1]
> +
> +[1] https://gitlab.gnome.org/GNOME/evolution-data-server/commit/3cfeb3c7f458c6fe40c67cea43987b45cf6cbeaf
> +---
> + cmake/modules/SetupBuildFlags.cmake | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/cmake/modules/SetupBuildFlags.cmake b/cmake/modules/SetupBuildFlags.cmake
> +index 4c6154129..284445455 100644
> +--- a/cmake/modules/SetupBuildFlags.cmake
> ++++ b/cmake/modules/SetupBuildFlags.cmake
> +@@ -56,7 +56,6 @@ macro(setup_build_flags _maintainer_mode)
> +
> + 	list(APPEND proposed_cxx_flags
> + 		${proposed_flags}
> +-		-Wabi
> + 		-Wnoexcept
> + 	)
> +
> +--
> +2.20.1
> +
> diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
> new file mode 100644
> index 000000000..e320f6342
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
> @@ -0,0 +1,45 @@
> +From 9c375e3fcf8ff778a5010a07a7da4b6a58adec7c Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Sun, 31 Mar 2019 19:11:31 +0200
> +Subject: [PATCH] call native helpers
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate[oe-specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + src/addressbook/libebook-contacts/CMakeLists.txt | 2 +-
> + src/camel/CMakeLists.txt                         | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt
> +index e9e3259..e749d1b 100644
> +--- a/src/addressbook/libebook-contacts/CMakeLists.txt
> ++++ b/src/addressbook/libebook-contacts/CMakeLists.txt
> +@@ -25,7 +25,7 @@ target_link_libraries(gen-western-table
> +
> + add_custom_command(
> + 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
> +-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
> ++	COMMAND gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h
> + 	DEPENDS gen-western-table e-name-western-tables.h.in
> + )
> +
> +diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
> +index be626a8..14ac8b8 100644
> +--- a/src/camel/CMakeLists.txt
> ++++ b/src/camel/CMakeLists.txt
> +@@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC
> +
> + add_custom_command(
> + 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
> +-	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
> ++	COMMAND camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
> + 	DEPENDS camel-gen-tables
> + )
> +
> +--
> +2.20.1
> +
> diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
> similarity index 100%
> rename from meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
> rename to meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/iconv-detect.h
> 

Re: [PATCH 00/41] More GNOME & cleanups

[Khem Raj]

Hi Andreas

This is good stuff, I wanted to stage it for some CI but the series
does not apply cleanly over master-next. If you can send a v2 of whole 
series rebased on master-next that will be super cool

Thanks
-Khem

On 5/22/19 11:48 PM, Andreas Müller wrote:
> Have more patches for GNOM in my WIP but remaining patches need more love.
> To avoid nasty rebasing I have cherry-picked this series - hope I did not
> overlook some missing dependency or...
> 
> Andreas Müller (41):
>    libstemmer: initial add
>    appstream: initial add 0.12.6
>    appstream-glib: initial add 0.7.15
>    yelp-xsl: initial add 3.32.1
>    yelp-tools: initial add 3.32.0
>    yelp: initial add 3.32.1
>    gnome-help.bbclass: Handle gnome-help files with new distro feature
>      'helpfiles'
>    evolution-data-server: uprade 3.26.6 -> 3.32.2 and rework
>    gnome-menus3: upgrade 3.10.1 -> 3.32.0
>    gnome-bluetooth: upgrade 3.18.2 -> 3.32.1
>    glade3: upgrade 3.8.5 -> 3.8.6
>    gnome-bluetooth: add upstream-version-is-even to inherit
>    gtksourceview4: upgrade 4.2.0 -> 4.3.1
>    gtksourceview3: upgrade 3.24.10 -> 3.24.11
>    mousepad: move to gtk3
>    network-manager-applet: port to meson build
>    network-manager-applet: cleanup
>    abiword: remove
>    evince: upgrade 3.28.2 -> 3.32.0
>    exiv2: initial add 0.27.0
>    gexiv2: initial add 0.12.0
>    gnome-autoar: inital add 0.2.3
>    tracker: initial add 2.2.2
>    nautilus: upgrade 3.18.5 -> 3.32.1
>    ibus: initial add 1.5.20
>    gnome-desktop3: upgrade 3.32.0 -> 3.32.2
>    libgusb: initial add 0.3.0+
>    colord: initial add 1.4.4
>    colord-gtk: initial add 0.1.26
>    itstool: upgrade 2.0.5 -> 2.0.6
>    libwacom: initial add 0.33
>    geocode-glib: initial add 3.26.1
>    libgweather: initial add 3.32.1
>    pinpoint: remove dead project
>    libgnomekbd: cleanup
>    libwnck: GNOME_COMPRESS_TYPE = "xz"
>    rygel: remove GNOME_COMPRESS_TYPE = "xz"
>    libmediaart(-2.0): remove GNOME_COMPRESS_TYPE = "xz"
>    gvfs: upgrade 1.40.0 -> 1.40.1
>    upower: upgrade 0.99.7 -> 0.99.10
>    xserver-xorg-cvt-native: initial add 1.20.4
> 
>   meta-gnome/classes/gnome-help.bbclass         |  71 +++++++
>   meta-gnome/conf/layer.conf                    |   3 +
>   .../recipes-apps/pinpoint/pinpoint_git.bb     |  24 ---
>   .../network-manager-applet_1.8.20.bb          |  34 +---
>   ...1-Bug-13770-Require-C-11-from-now-on.patch | 180 ------------------
>   .../recipes-gnome/abiword/abiword_3.0.2.bb    | 142 --------------
>   ...nded-way-to-handle-the-icu-namespace.patch |  46 -----
>   ...-format-attribute-to-_synctex_malloc.patch |  12 +-
>   .../evince/0001-help-remove-YELP-macro.patch  |  24 ---
>   ...vDocumentModel-get-type-function-dec.patch |  33 ----
>   ...02-add-a-formatting-attribute-check.patch} |   0
>   .../{evince_3.28.2.bb => evince_3.32.0.bb}    |  60 +++---
>   .../evolution-data-server-native.bb           |  23 +++
>   .../evolution-data-server.bb}                 | 123 +++---------
>   .../evolution-data-server.inc                 |  16 ++
>   ...keLists.txt-Remove-TRY_RUN-for-iconv.patch |  24 ++-
>   ...txt-remove-CHECK_C_SOURCE_RUNS-check.patch |   0
>   ...the-Novell-sample-contact-with-somet.patch |   0
>   ...abi-from-the-default-C-warning-flags.patch |  29 +++
>   .../0005-call-native-helpers.patch            |  45 +++++
>   .../evolution-data-server/iconv-detect.h      |   0
>   .../geocode-glib/geocode-glib_3.26.1.bb       |  20 ++
>   .../recipes-gnome/gexiv2/gexiv2_0.12.0.bb     |  21 ++
>   .../gnome-autoar/gnome-autoar_0.2.3.bb        |  18 ++
>   ...th_3.18.2.bb => gnome-bluetooth_3.32.1.bb} |  14 +-
>   ...op3_3.32.0.bb => gnome-desktop3_3.32.2.bb} |  10 +-
>   ...enus3_3.10.1.bb => gnome-menus3_3.32.0.bb} |  11 +-
>   ...3_3.24.10.bb => gtksourceview3_3.24.11.bb} |   6 +-
>   ...view4_4.2.0.bb => gtksourceview4_4.3.1.bb} |  13 +-
>   .../gvfs/{gvfs_1.40.0.bb => gvfs_1.40.1.bb}   |  12 +-
>   .../libgnomekbd_3.26.1.bb                     |   9 +-
>   .../libgweather/libgweather_3.32.1.bb         |  24 +++
>   .../recipes-gnome/libwnck/libwnck_2.31.0.bb   |   1 -
>   ...ome-desktop-thumbnail-API-with-new-g.patch |  40 ----
>   .../recipes-gnome/nautilus/nautilus_3.18.5.bb |  33 ----
>   .../recipes-gnome/nautilus/nautilus_3.32.1.bb |  32 ++++
>   .../recipes-gnome/tracker/tracker_2.2.2.bb    |  51 +++++
>   .../recipes-gnome/yelp/yelp-tools_3.32.0.bb   |  21 ++
>   .../recipes-gnome/yelp/yelp-xsl_3.32.1.bb     |  18 ++
>   meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb  |  37 ++++
>   .../appstream-glib/appstream-glib_0.7.15.bb   |  37 ++++
>   .../colord-gtk/colord-gtk_0.1.26.bb           |  19 ++
>   .../recipes-support/ibus/ibus-native.bb       |  28 +++
>   meta-gnome/recipes-support/ibus/ibus.bb       |  28 +++
>   meta-gnome/recipes-support/ibus/ibus.inc      |  33 ++++
>   ...start-dbus-we-do-not-have-dbus-lauch.patch |  39 ++++
>   .../libstemmer/0001-Build-so-lib.patch        |  63 ++++++
>   .../libstemmer/libstemmer_0.0.0.bb            |  46 +++++
>   .../recipes-support/libwacom/libwacom_0.33.bb |  14 ++
>   .../rygel/rygel_0.37.0.bb                     |   1 -
>   .../libmediaart/libmediaart.inc               |   2 -
>   .../0001-Do-not-use-host-include-path.patch   |  51 +++--
>   .../appstream/appstream_0.12.6.bb             |  41 ++++
>   .../recipes-support/colord/colord-native.bb   |  64 +++++++
>   ...n-cd_icc_create_from_edid-to-avoid-u.patch | 166 ++++++++++++++++
>   .../colord/colord-native/Makefile             |  48 +++++
>   meta-oe/recipes-support/colord/colord.bb      |  42 ++++
>   meta-oe/recipes-support/colord/colord.inc     |  13 ++
>   ...Run-native-cd_idt8-cd_create_profile.patch |  59 ++++++
>   meta-oe/recipes-support/exiv2/exiv2.bb        |  26 +++
>   ...es-only-installed-with-the-exiv2-app.patch |  41 ++++
>   ...nings-about-missing-PDB-files-in-3rd.patch |  64 +++++++
>   ...-to-exiv2-xmp-to-avoid-name-conflict.patch |  82 ++++++++
>   ...nstall-header-files-without-globbing.patch | 111 +++++++++++
>   ...t-installation-dir-for-generated-doc.patch |  28 +++
>   ...t-installation-dir-for-cmake-config-.patch | 124 ++++++++++++
>   ...psdk-Build-with-DBanAllEntityUsage-1.patch |  34 ++++
>   ...compile-warnings-in-ExpatAdapter.cpp.patch |  31 +++
>   ...e-for-being-compatible-with-more-dis.patch |  27 +++
>   ...ate-install-exiv2ConfigVersion.cmake.patch |  50 +++++
>   ...on-fault-bug-introduced-with-version.patch |  33 ++++
>   .../{itstool_2.0.5.bb => itstool_2.0.6.bb}    |   9 +-
>   .../recipes-support/libgusb/libgusb_git.bb    |  12 ++
>   ...everity-of-unhandled-action-messages.patch |  31 ---
>   .../{upower_0.99.7.bb => upower_0.99.10.bb}   |  16 +-
>   .../xserver-xorg-cvt-native_1.20.4.bb         |  43 +++++
>   .../recipes-apps/mousepad/mousepad_0.4.1.bb   |   5 +-
>   .../{glade3_3.8.5.bb => glade3_3.8.6.bb}      |  21 +-
>   78 files changed, 2038 insertions(+), 824 deletions(-)
>   create mode 100644 meta-gnome/classes/gnome-help.bbclass
>   delete mode 100644 meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
>   delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword/0001-Bug-13770-Require-C-11-from-now-on.patch
>   delete mode 100644 meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb
>   delete mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0004-Use-recommended-way-to-handle-the-icu-namespace.patch
>   delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
>   delete mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-libview-Remove-EvDocumentModel-get-type-function-dec.patch
>   rename meta-gnome/recipes-gnome/evince/evince/{0001-add-a-formatting-attribute-check.patch => 0002-add-a-formatting-attribute-check.patch} (100%)
>   rename meta-gnome/recipes-gnome/evince/{evince_3.28.2.bb => evince_3.32.0.bb} (32%)
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb
>   rename meta-gnome/recipes-gnome/{eds/evolution-data-server_3.26.6.bb => evolution-data-server/evolution-data-server.bb} (15%)
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch (59%)
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch (100%)
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch (100%)
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-I-94-Remove-Wabi-from-the-default-C-warning-flags.patch
>   create mode 100644 meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-call-native-helpers.patch
>   rename meta-gnome/recipes-gnome/{eds => evolution-data-server}/evolution-data-server/iconv-detect.h (100%)
>   create mode 100644 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.1.bb
>   create mode 100644 meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.0.bb
>   create mode 100644 meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.3.bb
>   rename meta-gnome/recipes-gnome/gnome-bluetooth/{gnome-bluetooth_3.18.2.bb => gnome-bluetooth_3.32.1.bb} (48%)
>   rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.32.0.bb => gnome-desktop3_3.32.2.bb} (69%)
>   rename meta-gnome/recipes-gnome/gnome-menus/{gnome-menus3_3.10.1.bb => gnome-menus3_3.32.0.bb} (41%)
>   rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview3_3.24.10.bb => gtksourceview3_3.24.11.bb} (75%)
>   rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview4_4.2.0.bb => gtksourceview4_4.3.1.bb} (65%)
>   rename meta-gnome/recipes-gnome/gvfs/{gvfs_1.40.0.bb => gvfs_1.40.1.bb} (87%)
>   rename meta-gnome/recipes-gnome/{libgnome => libgnomekbd}/libgnomekbd_3.26.1.bb (63%)
>   create mode 100644 meta-gnome/recipes-gnome/libgweather/libgweather_3.32.1.bb
>   delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch
>   delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
>   create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus_3.32.1.bb
>   create mode 100644 meta-gnome/recipes-gnome/tracker/tracker_2.2.2.bb
>   create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.0.bb
>   create mode 100644 meta-gnome/recipes-gnome/yelp/yelp-xsl_3.32.1.bb
>   create mode 100644 meta-gnome/recipes-gnome/yelp/yelp_3.32.1.bb
>   create mode 100644 meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.15.bb
>   create mode 100644 meta-gnome/recipes-support/colord-gtk/colord-gtk_0.1.26.bb
>   create mode 100644 meta-gnome/recipes-support/ibus/ibus-native.bb
>   create mode 100644 meta-gnome/recipes-support/ibus/ibus.bb
>   create mode 100644 meta-gnome/recipes-support/ibus/ibus.inc
>   create mode 100644 meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch
>   create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch
>   create mode 100644 meta-gnome/recipes-support/libstemmer/libstemmer_0.0.0.bb
>   create mode 100644 meta-gnome/recipes-support/libwacom/libwacom_0.33.bb
>   rename meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch => meta-oe/recipes-support/appstream/appstream/0001-Do-not-use-host-include-path.patch (10%)
>   create mode 100644 meta-oe/recipes-support/appstream/appstream_0.12.6.bb
>   create mode 100644 meta-oe/recipes-support/colord/colord-native.bb
>   create mode 100644 meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
>   create mode 100644 meta-oe/recipes-support/colord/colord-native/Makefile
>   create mode 100644 meta-oe/recipes-support/colord/colord.bb
>   create mode 100644 meta-oe/recipes-support/colord/colord.inc
>   create mode 100644 meta-oe/recipes-support/colord/colord/0001-Run-native-cd_idt8-cd_create_profile.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2.bb
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0001-cmake-man-pages-only-installed-with-the-exiv2-app.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0002-cmake-ignore-warnings-about-missing-PDB-files-in-3rd.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0003-cmake-Rename-xmp-to-exiv2-xmp-to-avoid-name-conflict.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0004-cmake-Install-header-files-without-globbing.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0005-cmake-Use-correct-installation-dir-for-generated-doc.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0006-cmake-Use-correct-installation-dir-for-cmake-config-.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0007-xmpsdk-Build-with-DBanAllEntityUsage-1.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0008-xmpsdk-Fix-compile-warnings-in-ExpatAdapter.cpp.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0009-Fixes-in-.pc-file-for-being-compatible-with-more-dis.patch
>   create mode 100644 meta-oe/recipes-support/exiv2/exiv2/0010-create-install-exiv2ConfigVersion.cmake.patch
>   create mode 100644 meta-oe/recipes-support/itstool/itstool/0001-Fix-a-segmentation-fault-bug-introduced-with-version.patch
>   rename meta-oe/recipes-support/itstool/{itstool_2.0.5.bb => itstool_2.0.6.bb} (70%)
>   create mode 100644 meta-oe/recipes-support/libgusb/libgusb_git.bb
>   delete mode 100644 meta-oe/recipes-support/upower/upower/0001-linux-lower-severity-of-unhandled-action-messages.patch
>   rename meta-oe/recipes-support/upower/{upower_0.99.7.bb => upower_0.99.10.bb} (73%)
>   create mode 100644 meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.4.bb
>   rename meta-xfce/recipes-devtools/glade/{glade3_3.8.5.bb => glade3_3.8.6.bb} (42%)
> 

Re: [PATCH 00/41] More GNOME & cleanups

[Andreas Müller]

On Fri, May 24, 2019 at 6:07 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> Hi Andreas
>
> This is good stuff, I wanted to stage it for some CI but the series
> does not apply cleanly over master-next. If you can send a v2 of whole
> series rebased on master-next that will be super cool
>
> Thanks
> -Khem
>
Hi Khem,

it went out too early and based on master - sorry. Will send a V2 - as
soon as I have:
* a solution for gnome-help.bbclass adding IMAGE_LINGUAS specific
packets to image that is independent of oe-core modification
* mozjs building with python3
* a full gnome session running with issues acceptable

Andreas