gentoo resync : 24.12.2018

4 files changed, 90 insertions, 2 deletions

diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 833ecbff84aa..0f260b04dfa6 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,3 +1,6 @@
+AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b68d7090fe961d36ce9c0ca06f85acad67fef1102952bca991b1f7b5886c1a9a421b4bcc7ce146a74b645f98 SHA512 a8df67b6793cecda6787dcf8023f6cbf50066ebb282c94ff1c22f5e51ed331df841b33627bd0116a73fc38522bda0071a353a2bad807d599acc672e029a499ed
 DIST libdazzle-3.28.5.tar.xz 422792 BLAKE2B 65b994798c2f9c7ec0d5ec5b3506896ba3fe09e8e563f1c03246684837a876d0918763f8589deccfc1477071434acda56973097904c3ad5469aa4374a56d1914 SHA512 e4616994226a7e755913343487a2850030dc13816c94dd0de166bb617a001097f6b849fa45ee546e75a15ad3357bd5a61a0caf436c4e3656eaa3480ed4b7f903
-EBUILD libdazzle-3.28.5.ebuild 1316 BLAKE2B fea311b5e322a68509d784e3c0bb4923f737c892c108efb06a245868014bb61ada0232acbc37f61f923025426f5b18c04efd706ca30006075506c80f465f7afd SHA512 948fe1592b4ca032d193f4c1758ada180fcd0dc9b600a3874f793c97980f023edc2e13eb1e94f9b5cecdc9f1598200f3034502b633bbf87b1c371182fe79cd63
+DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
+EBUILD libdazzle-3.28.5.ebuild 1333 BLAKE2B f96e034c10cf9142ead418a0b86980e5450c9529ce4d408317ed9ebabe80821596b5b4cee3a422e80aeb66e515e2c0e6cce0f20ce0dff46ade2f3a369d2ece1d SHA512 43e1def81a4f3e09fa7a91617216c3e989e8fe2019e65bc712010942c93753018c9783b15b203480cd69c811ac267eba215ad676ba1d882c58cd35983aa48a37
+EBUILD libdazzle-3.30.2.ebuild 1420 BLAKE2B 866e53e83f16edc934c2d6e19c0afe0ff55fbc75a44925510768b99e1ccc30e194a61f5beb6f7bfc84f983218cf505a69679f0bb332ba92704ff9dd141b95792 SHA512 92d8cab32919018da9fc50fedc8d86126e4804a1952ae2999799471ed384fffe88e8e9b9ba9fedd6f0ddca7fb09707d254b03b1d4787768b52b36a11d86a3e21
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/files/3.30.2-leak-fix.patch b/dev-libs/libdazzle/files/3.30.2-leak-fix.patch
new file mode 100644
index 000000000000..b3a1debf605e
--- /dev/null
+++ b/dev-libs/libdazzle/files/3.30.2-leak-fix.patch
@@ -0,0 +1,27 @@
+From 6f8436709430fd5ebaebd90dd55885636030940d Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Mon, 19 Nov 2018 17:43:24 -0800
+Subject: [PATCH] three-grid: don't leak values from hashtable
+
+We are responsible for freeing the GList chain, so ensure we do that at
+the end of size-allocate.
+---
+ src/widgets/dzl-three-grid.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/widgets/dzl-three-grid.c b/src/widgets/dzl-three-grid.c
+index 0de5484..d00d0b1 100644
+--- a/src/widgets/dzl-three-grid.c
++++ b/src/widgets/dzl-three-grid.c
+@@ -569,6 +569,8 @@ dzl_three_grid_size_allocate (GtkWidget     *widget,
+       area.y += child_alloc.height + priv->row_spacing;
+       area.height -= child_alloc.height + priv->row_spacing;
+     }
++
++  g_list_free (values);
+ }
+ 
+ static void
+-- 
+2.17.0
+
diff --git a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
index 221853d5f5ed..bd629ecc4e4e 100644
--- a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
new file mode 100644
index 000000000000..635275f8d6e3
--- /dev/null
+++ b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Experimental new features for GTK+ and GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.0:3[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-leak-fix.patch # from libdazzle-3-30 branch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
+		-Denable_profiling=false # -pg passing
+		# -Denable_rdtscp=false # TODO: CPU_FLAGS_X86 for it?
+		-Denable_tools=true # /usr/bin/dazzle-list-counters
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}