meta-openembedded: subtree update:5caca0f7bd..fe77eaab8f

Adam Miartus (3):
      meta-oe toybox-inittab: toybox inittab implementation
      meta-oe toybox-inittab: allow getty as a packageconfig feature
      meta-oe toybox: enable toybox init when selected as init manager

Alex Kiernan (1):
      libgusb: Upgrade 0.3.0+ -> 0.3.4

Andreas Müller (48):
      gfbgraph: initial add 0.2.4
      libgdata: Change PACKAGECONFIG defaults
      gnome-photos: initial add 3.34.2
      dconf: upgrade 0.34.0 -> 0.36.0
      dconf-editor: upgrade 3.34.2 -> 3.36.2
      nautilus: upgrade 3.34.3 -> 3.36.3
      evince: upgrade 3.34.2 -> 3.36.3
      evolution-data-server: upgrade 3.34.4 -> 3.36.3
      file-roller: upgrade 3.32.5 -> 3.36.2
      amtk: initial add 5.1.1
      uchardet: initial add 0.0.7
      tepl: initial add 4.4.0
      gedit: upgradde 3.34.1 -> 3.36.2
      gdm: upgrade 3.34.1 -> 3.36.2
      gnome-backgrounds: upgrade 3.34.0 -> 3.36.0
      gnome-calculator: upgrade 3.34.1 -> 3.36.0
      gnome-system-monitor: upgrade 3.32.1 -> 3.36.1
      gvfs: upgrade 1.42.2 -> 1.44.1
      gtksourceview4: upgrade 4.4.0 -> 4.6.0
      gnome-desktop3; upgrade 3.34.5 -> 3.36.2
      gnome-panel: upgrade 3.34.1 -> 3.36.1
      gnome-flashback: upgrade 3.34.2 -> 3.36.3
      gnome-keyring: upgrade 3.34.0 -> 3.36.0
      gnome-menus3: upgrade 3.32.0 -> 3.36.0
      gnome-online-accounts: upgrade 3.34.1 -> 3.36.0
      gnome-session: upgrade 3.34.2 -> 3.36.0
      gnome-settings-daemon: upgrade 3.34.2 -> 3.36.1
      gnome-terminal: upgrade 3.34.2 -> 3.36.2
      grilo: upgrade 0.3.10 -> 0.3.12
      libgnomekbd: remove
      libgweather: upgrade 3.34.0 -> 3.36.0
      libwnck3: upgrade 3.32.0 -> 3.36.0
      metacity: upgrade 3.34.1 -> 3.36.1
      graphene: initial add 1.10.0
      yelp-xsl: upgrade 3.34.2 -> 3.36.0
      yelp: upgrade 3.34.0 -> 3.36.0
      sysprof: upgrade 3.34.1 -> 3.36.0
      gnome-control-center: upgrade 3.34.5 -> 3.36.2
      libblockdev: upgrade 2.23 -> 2.24
      poppler: upgrade 0.88.0 -> 0.89.0
      gtksourceview: remove forgotten files
      vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
      vlc: upgrade 3.0.9.2 -> 3.0.10
      babl: upgrade 0.1.74 -> 0.1.78
      gegl: upgrade 0.4.22 -> 0.4.24
      libmypaint: upgrade 1.4.0 -> 1.6.1
      mypaint-brushes-1.0: upgrade 1.3.0 -> 1.3.1
      gimp: upgrade 2.10.18 -> 2.10.20

Andrej Valek (1):
      thrift: drop unsupported features

Bog999 (1):
      python3: Add python3-cryptography to RDEPENDS for python3-redis

Changqing Li (3):
      packagegroup-xfce-base: add RDEPEND packagegroup-core-x11
      python-django: add RDEPENDS
      python-m2crypto: Add RDEPENDS

Chenxi Mao (1):
      geoclue: select avahi-daemon if nmea enabled

Christian Eggers (4):
      graphviz: Extend for nativesdk
      ttf-dejavu: Extend for native and nativesdk
      gd: Extend for native and nativesdk
      mscgen: Extend for native and nativesdk

Denys Dmytriyenko (1):
      serialcheck: switch to a fork and update to the latest

Jacob Kroon (1):
      meta-oe: Don't inherit 'features_check' in recipes that don't utilize it

Joris Offouga (1):
      c-periphery: add recipe

Kai Kang (1):
      lvm2: remove service template from SYSTEMD_SERVICE

Khem Raj (5):
      python3-zopeinterface: Upgrade to 5.1.0
      multipath-tools: Fix build with json-c 0.14 and newer
      toybox-inittab: Get rid of bashism
      mpv: Drop unused features_check inherit
      evince: Drop unused features_check inherit

Konrad Weihmann (3):
      mpd: fix PACKAGECONFIG assignment
      netkit-rsh: properly append PACKAGECONFIG
      zile: properly append PACKAGECONFIG

Lei YU (1):
      httpfs2: mount a http url as a file based on FUSE

Leon Anavi (57):
      python3-unidiff: Upgrade 0.5.5 -> 0.6.0
      python3-tzlocal: Upgrade 2.0.0 -> 2.1
      python3-serpent: Upgrade 1.28 -> 1.30.2
      python3-python-vlc: Upgrade 3.0.7110 -> 3.0.9113
      python3-gast: Upgrade 0.2.2 -> 0.3.3
      python3-langtable: Upgrade 0.0.38 -> 0.0.51
      python3-automat: Upgrade 0.8.0 -> 20.2.0
      python3-humanize: Upgrade 0.5.1 -> 2.4.0
      python-pyaudio: Consolidate in a single file
      python3-isort: Consolidate in a single file
      python3-editor: Consolidate in a single file
      python3-engineio: Upgrade 3.12.1 -> 3.13.0
      python3-feedformatter: Consolidate in a single file
      python3-decorator: Consolidate in a single file
      python3-dateutil: Consolidate in a single file
      python3-dnspython: Consolidate in a single file
      python3-future: Consolidate in a single file
      python3-requests-futures: Upgrade 0.9.5 -> 1.0.0
      python3-greenlet: Consolidate in a single file
      python3-html2text: Upgrade 2019.8.11 -> 2020.1.16
      python3-jsonpatch: Consolidate in a single file
      python3-jsonschema: Consolidate in a single file
      python3-evdev: Consolidate in a single file
      python3-oauthlib: Consolidate in a single file
      python3-oauthlib: Upgrade 2.0.6 -> 3.1.0
      python3-tornado: Consolidate in a single file
      python3-tornado: Upgrade 6.0.3 -> 6.0.4
      python3-waitress: Upgrade 1.4.3 -> 1.4.4
      python3-urllib3: Upgrade 1.25.7 -> 1.25.9
      python3-ujson: Upgrade 2.0.3 -> 3.0.0
      python3-wheel: Upgrade 0.33.6 -> 0.34.2
      python3-wcwidth: Upgrade 0.1.8 -> 0.2.4
      python3-twine: Upgrade 1.13.0 -> 3.1.1
      python3-beautifulsoup4: Upgrade 4.8.2 -> 4.9.1
      python3-bitarray: Upgrade 1.2.1 -> 1.2.2
      python3-soupsieve: Upgrade 1.9.4 -> 2.0.1
      python3-meld3: Consolidate in a single file
      python3-meld3: Upgrade 1.0.2 -> 2.0.1
      python3-markupsafe: Consolidate in a single file
      python3-more-itertools: Consolidate in a single file
      python3-more-itertools: Upgrade 8.2.0 -> 8.3.0
      python3-nmap: Upgrade 1.4.1 -> 1.4.7
      python3-multidict: Upgrade 4.7.5 -> 4.7.6
      python3-lxml: Consolidate in a single file
      python3-hyperlink: Consolidate in a single file
      python3-humanfriendly: Upgrade 4.18 -> 8.2
      python3-html5lib: Consolidate in a single file
      python3-progress: Consolidate in a single file
      python3-prettytable: Consolidate in a single file
      python3-lxml: Upgrade 4.5.0 -> 4.5.1
      python3-pika: Consolidate in a single file
      python3-pluggy: Consolidate in a single file
      python3-ply: Consolidate in a single file
      python3-pocketsphinx: Consolidate in a single file
      python3-pocketsphinx: 0.1.0 -> 0.1.15
      python3-pint: Consolidate in a single file
      python3-pint: Upgrade 0.11 -> 0.12

Martin Jansa (1):
      meta-python: depend on core version 12 or higher

Martin Kelly (4):
      mosquitto: add native, nativesdk support
      msgpack-c: add native, nativesdk support
      mosquitto: typo fix
      python3-paho-mqtt: add native,nativesdk support

Mingli Yu (2):
      python3-webcolors: add the missing rdepends
      python3-m2crypto: add the missing rdepends

Naveen Saini (2):
      ace: add new recipe
      ocl-icd_git.bb: Add recipe for OpenCL ICD loaders

Peace Lee (1):
      guider: Upgrade to 3.9.7

Pierre-Jean Texier (14):
      zchunk: upgrade 1.1.5 -> 1.1.6
      uriparser: upgrade 0.9.3 -> 0.9.4
      dbus-brocker: upgrade 22 -> 23
      jsoncpp: upgrade 1.9.2 -> 1.9.3
      hwdata: upgrade 0.333 -> 0.336
      libiio: upgrade 0.19 -> 0.20
      libnfc: upgrade 1.7.1 -> 1.8.0
      tcpreplay: fix upstream check URL
      tinyproxy: fix upstream check URL
      jpnevulator: upgrade 2.3.4 -> 2.3.5
      libnftnl: upgrade 1.1.6 -> 1.1.7
      nftables: upgrade 0.9.4 -> 0.9.5
      libzip: upgrade 1.6.1 -> 1.7.0
      haveged: upgrade 1.9.8 -> 1.9.9

Qi.Chen@windriver.com (1):
      python-django: set CVE_PRODUCT to be django

Wang Mingyu (5):
      opensaf: upgrade 5.19.10 -> 5.20.05
      dash: upgrade 0.5.10.2 -> 0.5.11
      postgresql: 12.2 -> 12.3
      python3-pycodestyle: upgrade 2.5.0 -> 2.6.0
      python3-scapy: upgrade 0.25 -> 0.26

Yi Zhao (1):
      gpsd: add new init script

Yongxin Liu (1):
      intel-speed-select: Add new recipe for the tool to validate Intel SST

Zang Ruochen (7):
      proj: upgrade 7.0.0 -> 7.0.1
      mksh: upgrade 58 -> 59
      libvpx: upgrade 1.8.1 -> 1.8.2
      mercurial: upgrade 5.2 -> 5.4
      libcgi-perl: upgrade 4.47 -> 4.48
      mm-common: upgrade 1.0..0 -> 1.0.1
      cryptsetup: upgrade 2.3.2 -> 2.3.3

Zheng Ruoqin (2):
      nghttp2: upgrade 1.40.0 -> 1.41.0
      python3-inflection: upgrade 0.3.1 -> 0.5.0

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I15cb7860a288b903ef186f1979ee028e6f54ea50

6 files changed, 3 insertions, 383 deletions

diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch
deleted file mode 100644
index 6118b679a..000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0781b218beb8ba160ea223ff3d74a4fa2abf86fa Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 13 Apr 2017 16:21:14 -0700
-Subject: [PATCH] test-widget.c: fix non-literal format string issues
-
-clang errors out when using -Werror=format-nonliteral
-since the definition of g_strdup_vprintf() from glib-2.0
-is using va_list and clang seems to still warn where as
-gcc doesn't do that for va_list arguments
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tests/test-widget.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-widget.c b/tests/test-widget.c
-index 46f5f4e..3f2e60f 100644
---- a/tests/test-widget.c
-+++ b/tests/test-widget.c
-@@ -260,7 +260,7 @@ static const gchar *buffer_ui_description =
- 
- /* File loading code ----------------------------------------------------------------- */
- 
--static void
-+static void G_GNUC_PRINTF (2, 0)
- error_dialog (GtkWindow *parent, const gchar *msg, ...)
- {
- 	va_list ap;
--- 
-2.12.2
-
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4 b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4
deleted file mode 100644
index 53518fb2e..000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4
+++ /dev/null
@@ -1,90 +0,0 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN(AM_CHECK_PYMOD,
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-AC_ARG_WITH(python-includes,
-	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
-if test x$py_exec_prefix != x; then
-PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-else
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
-
-dnl
-dnl JH_ADD_CFLAG(FLAG)
-dnl checks whether the C compiler supports the given flag, and if so, adds
-dnl it to $CFLAGS.  If the flag is already present in the list, then the
-dnl check is not performed.
-AC_DEFUN([JH_ADD_CFLAG],
-[
-case " $CFLAGS " in
-*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
-  ;;
-*)
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-  AC_MSG_CHECKING([whether [$]CC understands $1])
-  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
-  AC_MSG_RESULT($jh_has_option)
-  if test $jh_has_option = no; then
-    CFLAGS="$save_CFLAGS"
-  fi
-  ;;
-esac])
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4 b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4
deleted file mode 100644
index 3ec41666b..000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make
deleted file mode 100644
index 354ffb7c6..000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make
+++ /dev/null
@@ -1,173 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-REPORT_FILES = \
-	$(DOC_MODULE)-undocumented.txt \
-	$(DOC_MODULE)-undeclared.txt \
-	$(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-else
-all-local:
-endif
-
-docs: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-tmpl/*.sgml:
-	@true
-
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references'
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
-
-install-data-local:
-	-installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	  which gtkdoc-rebase >/dev/null && \
-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-	fi
-	
-
-uninstall-local:
-	rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch
deleted file mode 100644
index f9ae07763..000000000
--- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix build error with gcc6:
-../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c: In function 'strdup_strftime':
-../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c:1951:3: error: format not a string literal, format string not checked [-Werror=format-nonliteral]
-   tmplen = strftime (tmpbuf, tmpbufsize, locale_format, tm);
-   ^~~~~~
-
-Patch Reference:
-https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7
-https://git.gnome.org/browse/glib/commit/?id=8cdbc7fb2c8c876902e457abe46ee18a0b134486
-
-Upstream-Status: Pending
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-
-diff -Nurp gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c
---- gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c	2016-07-01 13:11:43.631173762 +0800
-+++ gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c	2016-07-04 13:54:18.223726343 +0800
-@@ -1913,6 +1913,8 @@ setup_pango_layouts (GtkSourcePrintCompo
-  * GLIB - Library of useful routines for C programming
-  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald */
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- static gchar *
- strdup_strftime (const gchar *format, const struct tm *tm)
- {
-@@ -1982,6 +1984,7 @@ strdup_strftime (const gchar *format, co
- 
- 	return convbuf;
- }
-+#pragma GCC diagnostic pop
- 
- static gchar *
- evaluate_format_string (GtkSourcePrintCompositor *compositor,
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb
index bb49550c5..bc7f4b05e 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb
@@ -16,9 +16,9 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.4/${PNAME}-${PV}.tar.xz"
-SRC_URI[md5sum] = "5c47e314517692f2622a0b724c65e628"
-SRC_URI[sha256sum] = "9ddb914aef70a29a66acd93b4f762d5681202e44094d2d6370e51c9e389e689a"
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.6/${PNAME}-${PV}.tar.xz"
+SRC_URI[md5sum] = "51558b386cd12602b7bb1c460c09bc62"
+SRC_URI[sha256sum] = "4c13e30ab2e602abdc56f55d35f43c1142a79b1cd77aa8839d2fc85e966d9a85"
 
 GIR_MESON_OPTION = 'gir'
 GTKDOC_MESON_OPTION = "gtk_doc"