[PATCH 1/6] fluidsynth: upgrade 2.0.7 -> 2.0.9

[PATCH 1/6] fluidsynth: upgrade 2.0.7 -> 2.0.9

[Andreas Müller]

From announcement 2.0.9:
* an implicitly declared function caused a pointer to int truncation in CoreAudio driver (#591)
* fix a stack-based overflow in CoreAudio driver (#594, thanks to @fkmclane)

From announcement 2.0.8:
* fix incorrect behavior of fluid_sample_set_sound_data() (#576, thanks to @swesterfeld)
* fix voices being mixed incorrectly, causing audible crackle esp. at sample-rates >48kHz (#580)
* make sure that defining NDEBUG disables assertions

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-multimedia/fluidsynth/fluidsynth.inc            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index c4c623ad9..764ed375e 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -4,9 +4,9 @@ SECTION = "libs/multimedia"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
 
-SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
-SRCREV = "62b38b1c66aec606f83b322bb03bd84810bbda41"
+SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=2.0.x"
+SRCREV = "c2f4683bf57f61451d14d219fdb25cf9f29cb7fe"
 S = "${WORKDIR}/git"
-PV = "2.0.7"
+PV = "2.0.9"
 
 inherit cmake pkgconfig lib_package
-- 
2.21.0

[PATCH 2/6] gnome-terminal: Fix build for musl

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...EXITCODE-macro-for-non-glibc-systems.patch | 35 +++++++++++++++++++
 .../gnome-terminal/gnome-terminal_3.34.2.bb   |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch

diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
new file mode 100644
index 000000000..a69390eb2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
@@ -0,0 +1,35 @@
+From f231cecc151930fd5b6309da317a8c5bc6001f38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 17 Nov 2019 15:55:54 +0100
+Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems
+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@gmail.com>
+---
+ src/terminal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/terminal.c b/src/terminal.c
+index d06ce35..6284e4c 100644
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -47,6 +47,12 @@
+ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free)
+ #define gs_free_options __attribute__ ((cleanup(gs_local_options_free)))
+ 
++/* fix for musl */
++#ifndef W_EXITCODE
++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
++#endif
++
++
+ /* Wait-for-exit helper */
+ 
+ typedef struct {
+-- 
+2.21.0
+
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
index d688176d5..ffbabbf88 100644
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb
@@ -21,6 +21,7 @@ DEPENDS = " \
 
 SRC_URI[archive.md5sum] = "13fa9f5f459481c7f05b6964c470ef16"
 SRC_URI[archive.sha256sum] = "3bd723f4058ec014da4715db4181b7d73eccc797b85ad5e6236996951c01803d"
+SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
 
 EXTRA_OECONF += " \
     --disable-search-provider \
-- 
2.21.0

[PATCH 3/6] gmime: cleanup recipe

[Andreas Müller]

* autotools is inherited by gnomebase
* --disable-schemas-install is not set in EXTRA_OECONF so no need to remove it.
  Looks like a leftover from inheriting gconf
* gmimeConf.sh is not installed so no need to remove it

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-support/pidgin/gmime_3.2.4.bb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb b/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb
index dcdaed5a2..205868eec 100644
--- a/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb
+++ b/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Runtime libraries for parsing and creating MIME mail"
 SECTION = "libs"
 DEPENDS = "glib-2.0 zlib"
 
-inherit gnomebase autotools gobject-introspection
+inherit gnomebase gobject-introspection
 
 SRC_URI += "file://iconv-detect.h \
             file://nodolt.patch"
@@ -12,12 +12,5 @@ SRC_URI += "file://iconv-detect.h \
 SRC_URI[archive.md5sum] = "b6b4e9fdc8f3336551d23872c83b539a"
 SRC_URI[archive.sha256sum] = "249ea7c0e080b067aa9669162c36b181b402f6cf6cebc4999d838c6f1e81d024"
 
-EXTRA_OECONF_remove = "--disable-schemas-install"
-
 export ac_cv_have_iconv_detect_h="yes"
 do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}"
-
-# we do not need GNOME 1 gnome-config support
-do_install_append () {
-    rm -f ${D}${libdir}/gmimeConf.sh
-}
-- 
2.21.0

[PATCH 4/6] gmime: move to meta-oe/recipes-gnome

[Andreas Müller]

We cannot (yet) move it to meta-gnome because pidgin-sipe depends on it

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../pidgin => recipes-gnome/gmime}/gmime/iconv-detect.h           | 0
 .../pidgin => recipes-gnome/gmime}/gmime/nodolt.patch             | 0
 .../pidgin => recipes-gnome/gmime}/gmime_3.2.4.bb                 | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-oe/{recipes-support/pidgin => recipes-gnome/gmime}/gmime/iconv-detect.h (100%)
 rename meta-oe/{recipes-support/pidgin => recipes-gnome/gmime}/gmime/nodolt.patch (100%)
 rename meta-oe/{recipes-support/pidgin => recipes-gnome/gmime}/gmime_3.2.4.bb (100%)

diff --git a/meta-oe/recipes-support/pidgin/gmime/iconv-detect.h b/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h
similarity index 100%
rename from meta-oe/recipes-support/pidgin/gmime/iconv-detect.h
rename to meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h
diff --git a/meta-oe/recipes-support/pidgin/gmime/nodolt.patch b/meta-oe/recipes-gnome/gmime/gmime/nodolt.patch
similarity index 100%
rename from meta-oe/recipes-support/pidgin/gmime/nodolt.patch
rename to meta-oe/recipes-gnome/gmime/gmime/nodolt.patch
diff --git a/meta-oe/recipes-support/pidgin/gmime_3.2.4.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.4.bb
similarity index 100%
rename from meta-oe/recipes-support/pidgin/gmime_3.2.4.bb
rename to meta-oe/recipes-gnome/gmime/gmime_3.2.4.bb
-- 
2.21.0

[PATCH 5/6] gmime: upgrade 3.2.4 -> 3.2.5

[Andreas Müller]

From gmime-3.2.5.news [1]:
*  Modified GMimeParser to prevent stack overflows when parsing deeply nested messages.

     GMimeParser now has a limit on how deep multipart and/or message/rfc822 MIME part
     nesting is allowed to go before the parser will take action to prevent a stack
     overflow. If the max level is reached at a message/rfc822 part, then that part
     will be consumed by the parser as a generic GMimePart rather than a
     GMimeMessagePart. Likewise, if the max level is reached at any type of multipart,
     then the content of said multipart will be packed into the GMimeMultipart's
     preface and not parsed any further.

* g_mime_multipart_foreach has been rewritten to avoid recursion, thereby avoiding potential
  stack overflows.

* The gmime-port-2-6-to-3-0.sh script has been fixed to use proper sed syntax.

[1] http://ftp.gnome.org/pub/gnome/sources/gmime/3.2/gmime-3.2.5.news

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-gnome/gmime/{gmime_3.2.4.bb => gmime_3.2.5.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-gnome/gmime/{gmime_3.2.4.bb => gmime_3.2.5.bb} (72%)

diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.4.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb
similarity index 72%
rename from meta-oe/recipes-gnome/gmime/gmime_3.2.4.bb
rename to meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb
index 205868eec..568083bf3 100644
--- a/meta-oe/recipes-gnome/gmime/gmime_3.2.4.bb
+++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.5.bb
@@ -9,8 +9,8 @@ inherit gnomebase gobject-introspection
 SRC_URI += "file://iconv-detect.h \
             file://nodolt.patch"
 
-SRC_URI[archive.md5sum] = "b6b4e9fdc8f3336551d23872c83b539a"
-SRC_URI[archive.sha256sum] = "249ea7c0e080b067aa9669162c36b181b402f6cf6cebc4999d838c6f1e81d024"
+SRC_URI[archive.md5sum] = "98970e3995e67ac3f23827ff52308f9e"
+SRC_URI[archive.sha256sum] = "fb7556501f85c3bf3e65fdd82697cbc4fa4b55dccd33ad14239ce0197e78ba59"
 
 export ac_cv_have_iconv_detect_h="yes"
 do_configure_append = "cp ${WORKDIR}/iconv-detect.h ${S}"
-- 
2.21.0

[PATCH 6/6] evolution-data-server: add upstream-version-is-even & gsettings to inherit

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../evolution-data-server/evolution-data-server.bb              | 2 +-
 .../evolution-data-server/evolution-data-server.inc             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index a8bb69f00..82160b1ed 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -6,7 +6,7 @@ DEPENDS = " \
     dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
 "
 
-inherit distro_features_check cmake gtk-doc gettext gobject-introspection perlnative pythonnative
+inherit gsettings gobject-introspection distro_features_check cmake gtk-doc gettext perlnative pythonnative
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
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
index 2e5176ce7..0893f8e92 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -7,7 +7,7 @@ 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"
 
-inherit gnomebase
+inherit gnomebase upstream-version-is-even
 
 SRC_URI[archive.md5sum] = "d1701875bbac80d6d62e9acfc6c43bea"
 SRC_URI[archive.sha256sum] = "6ff56ba04cb639e627fe9d6e0ada106a10cadd68a0d53b8ec72b4e285df53abe"
-- 
2.21.0