diff options
5 files changed, 0 insertions, 187 deletions
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest index 2f1b53f6ee0d..33c4db829efa 100644 --- a/net-libs/gtk-vnc/Manifest +++ b/net-libs/gtk-vnc/Manifest @@ -1,2 +1 @@ -DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb DIST gtk-vnc-1.3.0.tar.xz 220488 BLAKE2B ea5070cc396fe4ef52fe980b766658f1a4f82eb7dec52856ab79836363c8fdb48827d52c0df7edb2c943f5087fcfd87898aa43457f7cbf5a544a4c7063f84f3d SHA512 ff25c19a1cbd4588990f1f3a2448fd2e0b694b933ca1a7be9565188db78055efe13f90ad1243bf8237d6a29d38987d7b3e77344e50d09191207b09200b01f5df 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 deleted file mode 100644 index eba775dd3a52..000000000000 --- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-build-improve-with-coroutine-auto-choice.patch +++ /dev/null @@ -1,59 +0,0 @@ -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/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch deleted file mode 100644 index bd72b5727927..000000000000 --- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Find-python-explicitly-to-honor-downstream-pyt.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 3/3] meson: Find python explicitly to honor downstream python - choice - ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 5306fb9..247c597 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -319,7 +319,7 @@ gtk_vnc_sources = gtk_vnc_gir_sources + gvnc_marshal + [ - 'vncdisplaykeymap.c', - ] - --python = import('python').find_installation() -+python = import('python').find_installation('python3') - keymaps = [ - 'xorgevdev', - 'xorgkbd', --- -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 deleted file mode 100644 index fd305f777c5d..000000000000 --- a/net-libs/gtk-vnc/files/gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch +++ /dev/null @@ -1,36 +0,0 @@ -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.2.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild deleted file mode 100644 index e879d2277a27..000000000000 --- a/net-libs/gtk-vnc/gtk-vnc-1.2.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit gnome.org vala meson python-any-r1 xdg - -DESCRIPTION="VNC viewer widget for GTK" -HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc" - -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.56.0:2 - >=x11-libs/gdk-pixbuf-2.36.0:2 - >=dev-libs/libgcrypt-1.8.0:0= - >=net-libs/gnutls-3.6.0:0= - >=sys-libs/zlib-1.2.11 - sasl? ( >=dev-libs/cyrus-sasl-2.1.27 ) - >=x11-libs/gtk+-3.22.0:3[introspection?] - >=x11-libs/cairo-1.15.0 - >=x11-libs/libX11-1.6.5 - pulseaudio? ( >=media-sound/pulseaudio-11.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=( - "${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() { - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(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) - ) - meson_src_configure -} |