gentoo resync : 11.05.2021

6 files changed, 111 insertions, 86 deletions

diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 8811d781fd18..7ea2b2da3df8 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,7 +1,6 @@
-AUX 1.0.0-honor-python-ver.patch 691 BLAKE2B 1e7954d6bc2feffa97ec429bb96f0d5b6ef4e04eef977731db75bfde4a00d4afab35944a595131b0088569b17f577c41f0ce63987ddbeba5187ae7591f5e9cb4 SHA512 ca5e2495a13a5bedd29dcdfba4c03f74a65d46f964d861adb7d2bcdf73813fe64c456ab52d0ccbb9fc913d6d5c0a76a9d199c114b1f3850d2184e3c7959412f9
-DIST gtk-vnc-1.0.0-patchset.tar.xz 9636 BLAKE2B 4f25fdf279e5a1718ea8dc42bdb59722630b363e4e289704b946ae788d593b5d95c56d0eb5315e30ff00c2eb4d3a9e5df366f74808f94e926a47c2f817b0f1ee SHA512 998771ceb28516f52bb083d872a1ad8aa22a7208c8a0ca94270f63d91cc7f7a0f99c4bb93f7a545d9a6c796fa063dd27b36a1cb9a3d7c9349a9d8372754ea929
-DIST gtk-vnc-1.0.0.tar.xz 215904 BLAKE2B 05ef0389c3ac307859228506adf55a5ed0f5d577078b82686ad97c9df180fc5c23d8dd030930c61f87b1bbd3cb6cee74c4485af4816b7b29fd53016c2d9b1d07 SHA512 63a40b9b284c4e46a92d5375ab3660b324ff27bfc572559d3b34d29fe4f7d24e976396b6688b8f3e3109d49dc5527075d128c43bb997507e68ddc0880b0ad148
+AUX gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch 1692 BLAKE2B 6ac0db2a08ec541bb213099e19a67eb7d295b8439c0562032de964343b4c698e6dea3227b0e4fff1dbb5bd3bde715d1bc288ed70b7efe5972ad78407213bc331 SHA512 02c3294e7e94a7f0bc2223c59362351a7256a5934e8c2b9304d226be7d289f2759c9222c2d715364438669048178ad722bcff8c8f31049bd7fa0c1b9780361ce
+AUX gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 755 BLAKE2B 95934ecb04553fd3153a2d0b81e52a487f922b888868d395a423e28f2d94c1012f9cda4025d79e855e371161a191c6c7b9c6dd6fc8acd603f91286ef9492dac3 SHA512 060ba2f9a95ae6fa790b6481acc3d23b93220b733b1e2966e80c33a7a802dbdf84a55023da381efd037b23cb1ca698251fc6b3779debfe7bf21b9e5ce5c54d76
+AUX gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch 1052 BLAKE2B 8ba4a7c553bf2af5a4cb6fde0daaa990db67f6fc105d64b03c555f2a091063249dddf657d03907f4d63220dd26d42d10e9be01e766459399b1a7ce4b824e62ea SHA512 d288723785d143bd306b0ff85d25658709f22a75d5a294b43b3e45ef8a84f40bbd00017b84da776453097a218f642d337c2308ca965b0cde0a1a3e97f3b6bae3
 DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb
-EBUILD gtk-vnc-1.0.0.ebuild 1850 BLAKE2B 08f14959a9440e1fd8a404d287633bdd4eb7bd1ae134f5ff011dc13d6800572426bb50ad8ad173864785f381defe1d677c9e8c5f0ead404f09336f01a72309b0 SHA512 7121e7e4181db642101072fd2f3b7337268edc0cb69961bc203184111c6c1db92734669c1f3926f4af00f7b90a1917aed215d6e32e80df2dd7d2f34781a866f1
-EBUILD gtk-vnc-1.2.0.ebuild 1573 BLAKE2B 29268356e8fd5a33d1eeeeaae1c0f0a718b01115355607cfd9d45072aba6ad3a6c10b667931e10a1982a57e38a5c2692e4bc3f78a2f74ec702bc77fe75fe5657 SHA512 d2770a023396eba61f14b402a0367a7bee89de744363ae107ee1ff09dd20b7b65b80a1a04262214d793d96cc0074a6cd6757ab3454b5f9e5f22a7579cc8067e2
+EBUILD gtk-vnc-1.2.0.ebuild 1726 BLAKE2B df068d3bea9685e002579f981cda026260b159948cf127f8152b10c0f102acb43d7a065b79a3d08cd1922bd661f4bb69a0c35450923f5896bbfc92d6ef9ac96b SHA512 20a13ba3044552513299c611bb35b732aca2cced2ce218e9b56947f9386c14acf990119844e09bb09172dd84b889c6665f3361ff5807f25f7dc0f9a4fa9780cb
 MISC metadata.xml 397 BLAKE2B 0e99084e903bd50b1228c59e87a97bbec3d6c2543328b9ac42587969cc402e93537c360ca8e1df2e5a9bb1129473e8d6c698b373b3e65ee7b322bb87f01baf71 SHA512 eeedc7da2c6292330fa47841afdbf4038d1c3bec1b2803bd462ea4b13c6cd88448274a0814675d3d85ef89f2fd1aa9c45344412a9742e26214dfdf9d51a63d06
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
new file mode 100644
index 000000000000..eba775dd3a52
--- /dev/null
+++ b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch
@@ -0,0 +1,59 @@
+From e540fbc34d6bbfe3e84f1d9c33deaacc2326c7c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com>
+Date: Mon, 26 Apr 2021 17:38:13 +0200
+Subject: [PATCH 1/3] build: improve --with-coroutine=auto choice
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the required ucontext functions aren't found, switch to gthread
+coroutines instead of failing during the build.
+
+These functions are absent from the POSIX.1-2008.
+
+Fixes: https://gitlab.gnome.org/GNOME/gtk-vnc/-/issues/11
+
+Signed-off-by: Jakub Janků <jjanku@redhat.com>
+---
+ meson.build | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 8052d43..e9829e6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -43,8 +43,20 @@ cc = meson.get_compiler('c')
+ 
+ coroutine = get_option('with-coroutine')
+ 
++uctx_args = []
++if host_machine.system() == 'darwin'
++  uctx_args += ['-D_XOPEN_SOURCE=600']
++endif
++has_ucontext = true
++foreach uctx_func : ['makecontext', 'swapcontext', 'getcontext']
++  if not cc.has_function(uctx_func, prefix: '#include <ucontext.h>', args: uctx_args)
++    has_ucontext = false
++    break
++  endif
++endforeach
++
+ if coroutine == 'auto'
+-  if host_machine.system() == 'windows'
++  if host_machine.system() == 'windows' or not has_ucontext
+     coroutine = 'gthread'
+   else
+     coroutine = 'ucontext'
+@@ -52,6 +64,9 @@ if coroutine == 'auto'
+ endif
+ 
+ if coroutine == 'ucontext'
++  if not has_ucontext
++    error('ucontext requested, but not available')
++  endif
+   conf_data.set('WITH_UCONTEXT', true)
+ elif coroutine != 'gthread'
+   error('Unknown coroutine backend')
+-- 
+2.26.3
+
diff --git a/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
index f26a85719b08..bd72b5727927 100644
--- a/net-libs/gtk-vnc/files/1.0.0-honor-python-ver.patch
+++ b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
@@ -1,7 +1,9 @@
-From a51acc0c353959e8af06a031724a79cfe6b60963 Mon Sep 17 00:00:00 2001
+https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/15
+
+From 4609ad35b6dc11f016ac3a50158eeef7f19d9889 Mon Sep 17 00:00:00 2001
 From: Mart Raudsepp <leio@gentoo.org>
 Date: Sun, 5 Apr 2020 00:05:49 +0300
-Subject: [PATCH] meson: Find python explicitly to honor downstream python
+Subject: [PATCH 3/3] meson: Find python explicitly to honor downstream python
  choice
 
 ---
@@ -9,10 +11,10 @@ Subject: [PATCH] meson: Find python explicitly to honor downstream python
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/meson.build b/src/meson.build
-index 461d8d2..a09aee9 100644
+index 5306fb9..247c597 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -308,7 +308,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [
+@@ -319,7 +319,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [
    'vncdisplaykeymap.c',
  ]
  
@@ -22,5 +24,5 @@ index 461d8d2..a09aee9 100644
    'xorgevdev',
    'xorgkbd',
 -- 
-2.20.1
+2.26.3
 
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
new file mode 100644
index 000000000000..fd305f777c5d
--- /dev/null
+++ b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
@@ -0,0 +1,36 @@
+https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/14
+
+From bdab05584bab5c2ecdd508df49b03e80aedd19fc Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 28 Apr 2021 17:16:54 -0400
+Subject: [PATCH 2/3] meson: Fix configuration failure with
+ -Dwith-vala=disabled
+
+Otherwise with_vala is not defined, and meson setup results in
+
+    src/meson.build:169:5: ERROR: Unknown variable "with_vala".
+---
+ meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e9829e6..777876c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -318,12 +318,11 @@ gir = find_program('g-ir-scanner', required: get_option('introspection'))
+ with_gir = gir.found()
+ 
+ vala_opt = get_option('with-vala')
++with_vala = false
+ if not vala_opt.disabled()
+   if not with_gir
+     if vala_opt.enabled()
+       error('Vala API requires GObject introspection (-Dintrospection=true)')
+-    else
+-      with_vala = false
+     endif
+   else
+     with_vala = add_languages('vala', required: vala_opt)
+-- 
+2.26.3
+
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
deleted file mode 100644
index 1229170f2861..000000000000
--- a/net-libs/gtk-vnc/gtk-vnc-1.0.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome.org vala meson python-any-r1 xdg
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection pulseaudio sasl +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2
-	>=x11-libs/gdk-pixbuf-2.12.0:2
-	>=dev-libs/libgcrypt-1.5.0:0=
-	>=net-libs/gnutls-3.1.18:0=
-	>=sys-libs/zlib-1.2.5
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=x11-libs/cairo-1.2.0
-	>=x11-libs/libX11-1.6.5
-	pulseaudio? ( >=media-sound/pulseaudio-10.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
-"
-# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
-# perl for pod2man
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	# Few fixes from origin/master + optionality patches filed as https://gitlab.gnome.org/GNOME/gtk-vnc/merge_requests/6
-	"${WORKDIR}"/patches
-	"${FILESDIR}"/${PV}-honor-python-ver.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-	# Don't add -O2 explicitly to CFLAGS
-	sed -i -e "/'-O2'/d" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_feature pulseaudio)
-		$(meson_feature sasl)
-		-Denable-werror=false
-		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
-		$(meson_use vala with-vala)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
index f5587f996c28..e879d2277a27 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -41,7 +41,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/1.0.0-honor-python-ver.patch
+	"${FILESDIR}"/${P}-build-improve-with-coroutine-auto-choice.patch
+	"${FILESDIR}"/${P}-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+	"${FILESDIR}"/${P}-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch
 )
 
 src_prepare() {
@@ -54,14 +56,8 @@ src_configure() {
 		$(meson_feature introspection)
 		$(meson_feature pulseaudio)
 		$(meson_feature sasl)
+		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
 		$(meson_feature vala with-vala)
 	)
-
-	if use elibc_musl; then
-		emesonargs+=( -Dwith-coroutine=gthread )
-	else
-		emesonargs+=( -Dwith-coroutine=auto )
-	fi
-
 	meson_src_configure
 }