diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-20 13:15:02 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-20 13:15:14 +0300 |
commit | 23eaf03b3fff4acf8a79d082a85024bda6690436 (patch) | |
tree | 01b23dee8d55aea42b0fd9000c5ea0d32f5bd155 /meta-openembedded/meta-gnome/recipes-gnome/gedit | |
parent | fb62a68f16d3fa64b242bd8c65abf64ef8088889 (diff) | |
download | openbmc-23eaf03b3fff4acf8a79d082a85024bda6690436.tar.xz |
meta-openembedded: subtree update:55de2d06ad..53d431639a
Adrian Bunk (1):
ltrace: Remove RDEPENDS on elfutils
Andreas Müller (22):
gedit: upgrade 2.30.4 -> 3.34.0
gtksourceview2: remove
evolution-data-server: give up fine grained -dev/-dbg packages
evolution-data-server: upgrade 3.26.6 -> 3.34.1 and rework
gnome-font-viewer: initial add 3.34.0
evince: upgrade 3.28.2 -> 3.34.1
file-roller: inital add 3.32.2
gexiv2: initial add 0.12.0
gnome-autoar: inital add 0.2.3
tracker: initial add 2.3.1
nautilus: upgrade 3.18.5 -> 3.34.1
geocode-glib: initial add 3.26.1
libgweather: initial add 3.34.0
libwacom: initial add 0.33
gnome-settings-daemon: initial add 3.34.1
fluidsynth: upgrade 2.0.7 -> 2.0.9
gnome-terminal: re-add 3.34.2
gnome-terminal: Fix build for musl
gmime: cleanup recipe
gmime: move to meta-oe/recipes-gnome
gmime: upgrade 3.2.4 -> 3.2.5
evolution-data-server: add upstream-version-is-even & gsettings to inherit
Bartosz Golaszewski (1):
libgpiod: put gpio utils into an actual separate package
Gaylord Charles (1):
nginx: fix install paths
Khem Raj (11):
evince: Fix build with clang
poppler: Extend the c/c++ flags fix to cover clang
pidgin-sipe: Fix another case of struct incompatiblility due to 64bit time_t
gperftools: Convert static and libunwind support to packageconfig
libmad: Define O2 for all arches as default optimization
rsyslog: Dont force enable atomic builtins on mips
libtorrent: Drop 64bit atomics patch for mips/ppc
libtorrent: Disable instrumentation on ppc/mips
libkcapi: Move static inline functions where used
grpc: Link with libatomic on clang/x86
upm: Link with libatomic on clang/x86
Leon Anavi (1):
surf: Add a simple web browser
Martin Balik (1):
squid: upgrade 4.6 -> 4.9
Nicola Lunghi (2):
python-jsonschema: multiple fixes
python-jsonschema: add PACKAGECONFIG nongpl option
Oleksandr Kravchuk (1):
flatbuffers: update to 1.11.0
Peter Kjellerstedt (1):
libldb: Do not require the "pam" distro feature to be enabled
nick83ola (2):
python3-apply-defaults: add recipe
python3-jsonrpcserver: add recipe
Change-Id: I231fc015cba86b7c14915ffc3f6f123c9296fd68
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gnome/gedit')
7 files changed, 44 insertions, 219 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch deleted file mode 100644 index 4ad57effe..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 17 May 2016 14:14:03 +0300 -Subject: [PATCH] Remove help directory from build - -It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Makefile.am | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e57b203..a88152d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx - --if !OS_OSX --SUBDIRS += help --endif - - distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper - --- -2.8.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch deleted file mode 100644 index 4885c4511..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 623ffac1f6e7725041b386e0f2933fe36809b5a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 09:04:30 -0700 -Subject: [PATCH] gedit-utils: qualify handle_builder_error() with format - string parameters - -gedit-utils.c:1063:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] - msg_plain = g_strdup_vprintf (message, args); - ^~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gedit/gedit-utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c -index 41a5afd..c800828 100644 ---- a/gedit/gedit-utils.c -+++ b/gedit/gedit-utils.c -@@ -1051,7 +1051,7 @@ gedit_utils_is_valid_uri (const gchar *uri) - return TRUE; - } - --static GtkWidget * -+static G_GNUC_PRINTF(1, 2) GtkWidget * - handle_builder_error (const gchar *message, ...) - { - GtkWidget *label; --- -2.14.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch deleted file mode 100644 index 11afe75ce..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ee43bcc3c8d69fe56a64c3487e2d3c780ea5d25e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 06:53:35 -0700 -Subject: [PATCH] tests/document-saver.c: Define ACCESSPERMS if not defined - already - -Helps compile with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/document-saver.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/document-saver.c b/tests/document-saver.c -index 9f44d5a..811ade6 100644 ---- a/tests/document-saver.c -+++ b/tests/document-saver.c -@@ -41,6 +41,10 @@ - #define UNOWNED_GROUP_LOCAL_URI "/tmp/gedit-document-saver-unowned-group.txt" - #define UNOWNED_GROUP_REMOTE_URI "sftp://localhost/tmp/gedit-document-saver-unowned-group.txt" - -+#if !defined(ACCESSPERMS) -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -+#endif -+ - static gboolean test_completed; - static gboolean mount_completed; - static gboolean mount_success; --- -2.13.2 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch deleted file mode 100644 index a28808b8d..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8e0cbfac142d38320dd02416601e14c65585cd17 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sat, 9 Mar 2013 12:47:06 +0100 -Subject: [PATCH] workaround void pointer arithmetic -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fixes errors like: -error: pointer of type 'void *' used in arithmetic [-Werror=pointer-arith] - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gedit/gedit-document-input-stream.c | 4 ++-- - gedit/gedit-smart-charset-converter.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gedit/gedit-document-input-stream.c b/gedit/gedit-document-input-stream.c -index 5a1f961..38316e7 100644 ---- a/gedit/gedit-document-input-stream.c -+++ b/gedit/gedit-document-input-stream.c -@@ -426,7 +426,7 @@ gedit_document_input_stream_read (GInputStream *stream, - - do - { -- n = read_line (dstream, buffer + read, space_left); -+ n = read_line (dstream, ((char*)buffer) + read, space_left); - read += n; - space_left -= n; - } while (space_left > 0 && n != 0 && dstream->priv->bytes_partial == 0); -@@ -451,7 +451,7 @@ gedit_document_input_stream_read (GInputStream *stream, - - newline = get_new_line (dstream); - -- memcpy (buffer + read, newline, newline_size); -+ memcpy (((char*)buffer) + read, newline, newline_size); - - read += newline_size; - dstream->priv->newline_added = TRUE; -diff --git a/gedit/gedit-smart-charset-converter.c b/gedit/gedit-smart-charset-converter.c -index e32b0b1..6745ce3 100644 ---- a/gedit/gedit-smart-charset-converter.c -+++ b/gedit/gedit-smart-charset-converter.c -@@ -153,7 +153,7 @@ try_convert (GCharsetConverter *converter, - do - { - res = g_converter_convert (G_CONVERTER (converter), -- inbuf + nread, -+ ((const char*)inbuf) + nread, - inbuf_size - nread, - out + nwritten, - out_size - nwritten, --- -1.7.4.4 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch deleted file mode 100644 index a5d231012..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4ebdf8023f763f75a7e1b548894de2e8b784f4a8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -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 <schnitzeltony@googlemail.com> ---- - 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-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb deleted file mode 100644 index 6e0720888..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPLv2+" -PR = "r2" - -DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 glib-2.0-native gtk+ \ - gtksourceview2 iso-codes intltool-native gnome-common-native \ - libice python3-six-native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit distro_features_check gnomebase gconf gettext python3native - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ - 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 \ - file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \ - file://0001-gedit-utils-qualify-handle_builder_error-with-format.patch \ - " -SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" -SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = "--disable-scrollkeeper \ - --enable-gvfs-metadata" - -LDFLAGS += "-lgmodule-2.0 -lICE" - -FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" -FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb new file mode 100644 index 000000000..9679a1ce6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.0.bb @@ -0,0 +1,44 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + yelp-tools-native \ + libxml2-native \ + gdk-pixbuf-native \ + iso-codes \ + gtk+3 \ + gsettings-desktop-schemas \ + gtksourceview4 \ + libpeas \ + libsoup-2.4 \ + gspell \ + gtksourceview4 \ +" + +inherit gnomebase itstool gnome-help gobject-introspection gtk-doc vala gettext distro_features_check upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "ec6632fa73d9ea6c817e74a98d16eab6" +SRC_URI[archive.sha256sum] = "3e95e51d3ccb495a9ac95aa3ed7fe8fe37ccde7c678f37fa3cea684bc71d507e" + +GTKDOC_MESON_OPTION = "documentation" + +PACKAGECONFIG ??= "gvfs" +PACKAGECONFIG[gvfs] = "-Denable-gvfs-metadata=yes,-Denable-gvfs-metadata=no,,gvfs" + +PACKAGES += "${PN}-python" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES_${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + |