From db97c329c23df9da06d2deb0e628c1ea01293326 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 31 Jul 2016 04:15:04 +0200 Subject: gedit: remove blacklist caused by gtksourceview2 / fix/cleanup build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- ...ring-format-literal-warning-to-fix-build-.patch | 38 ++++++++++++++++++++++ meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb | 11 ++++--- 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch new file mode 100644 index 0000000000..a5d2310123 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch @@ -0,0 +1,38 @@ +From 4ebdf8023f763f75a7e1b548894de2e8b784f4a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 29 Jul 2016 23:19:40 +0200 +Subject: [PATCH] suppress string format literal warning to fix build with gcc6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + plugins/time/gedit-time-plugin.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c +index d2ffdb9..441d9f9 100644 +--- a/plugins/time/gedit-time-plugin.c ++++ b/plugins/time/gedit-time-plugin.c +@@ -473,12 +473,15 @@ get_time (const gchar* format) + clock = time (NULL); + now = localtime (&clock); + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + do + { + out_length += 255; + out = g_realloc (out, out_length); + } + while (strftime (out, out_length, locale_format, now) == 0); ++#pragma GCC diagnostic pop + + g_free (locale_format); + +-- +2.5.5 + diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 7e6b343a81..a6c68d383a 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -3,13 +3,16 @@ SECTION = "x11/gnome" LICENSE = "GPLv2+" PR = "r2" -DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes" +DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes intltool-native" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit gnome gettext pythonnative -SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch \ - file://0001-Remove-help-directory-from-build.patch" +SRC_URI+= " \ + file://0001-workaround-void-pointer-arithmetic.patch \ + file://0001-Remove-help-directory-from-build.patch \ + file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ +" SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" GNOME_COMPRESS_TYPE="bz2" @@ -19,5 +22,3 @@ EXTRA_OECONF = "--disable-scrollkeeper \ FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug" - -PNBLACKLIST[gedit] ?= "Depends on broken gtksourceview2" -- cgit 1.2.3-korg