* [gentoo-commits] repo/gentoo:master commit in: net-misc/vinagre/, net-misc/vinagre/files/
@ 2016-06-28 20:30 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2016-06-28 20:30 UTC (permalink / raw
To: gentoo-commits
commit: 9399d0fb110c8d557c95736ddf5e111a917613cd
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 20:26:16 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 20:30:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9399d0fb
net-misc/vinagre: Drop old
Package-Manager: portage-2.3.0_rc1
net-misc/vinagre/Manifest | 1 -
.../vinagre/files/vinagre-3.16.1-freerdp.patch | 38 -----------
net-misc/vinagre/vinagre-3.16.1.ebuild | 73 ----------------------
3 files changed, 112 deletions(-)
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 4d61478..be4cc6b 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,2 +1 @@
-DIST vinagre-3.16.1.tar.xz 812964 SHA256 d77c0057e8525efeef8b35839bce07e5451d99f3ef9d156c7f549a4c1ad6483f SHA512 60b83a7eb8f4d49e8825a4116d2de4579373cb4fbcde70c241b43f079debc30f0b5ce38da39ed4a3841724a70798338a7c319c72be0e991b97f70cdc264dfacf WHIRLPOOL 24828f91d545fd8da63f14002b1988a677c37ffc3abd10678467cfe5223ec4adbd4c9cec39e1ad7c4d46e2beb7369109445f7e1c19e5d10b7be6b79533c99a50
DIST vinagre-3.18.2.tar.xz 819820 SHA256 65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4 SHA512 5d72cc5fc99a6400ef0135e65bde9bc3687257e22176f18606e8780d7a20860fa226a25e0c2bf2ffa85b58d25fa5c262ab6db1751c6f1a6a6e490a373e19a2b9 WHIRLPOOL 1d84691b203744b16fe18bf9e370554f5459f5ff2fe2d4020c79bf64c833a6c8d565a5cc843fdf398239dae17d028fb3c156f25741ae25e3b8b7de7bbdd27d4c
diff --git a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
deleted file mode 100644
index dacce43..0000000
--- a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 89cc8bfeaf47a24c57616021915b30bbc4d12d53 Mon Sep 17 00:00:00 2001
-From: Nick Andrade <SDNick484@gmail.com>
-Date: Sat, 16 May 2015 08:03:29 +0100
-Subject: [PATCH] Fix building against newer FreeRDP versions
-
-https://bugzilla.gnome.org/show_bug.cgi?id=749124
----
- plugins/rdp/vinagre-rdp-tab.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
-index c4c11f8..690a580 100644
---- a/plugins/rdp/vinagre-rdp-tab.c
-+++ b/plugins/rdp/vinagre-rdp-tab.c
-@@ -887,7 +887,6 @@ open_freerdp (VinagreRdpTab *rdp_tab)
- settings->RdpSecurity = TRUE;
- settings->TlsSecurity = TRUE;
- settings->NlaSecurity = TRUE;
-- settings->DisableEncryption = FALSE;
- settings->EncryptionMethods = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
- settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- #else
-@@ -898,6 +897,12 @@ open_freerdp (VinagreRdpTab *rdp_tab)
- settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
- settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
- #endif
-+#include <freerdp/version.h>
-+#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1)
-+ settings->UseRdpSecurityLayer = FALSE;
-+#else
-+ settings->DisableEncryption = FALSE;
-+#endif
-
- /* Set display size */
- #if HAVE_FREERDP_1_1
---
-2.4.0
-
diff --git a/net-misc/vinagre/vinagre-3.16.1.ebuild b/net-misc/vinagre/vinagre-3.16.1.ebuild
deleted file mode 100644
index a8dd29d..0000000
--- a/net-misc/vinagre/vinagre-3.16.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
-
-inherit gnome2 linux-info vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-IUSE="rdp +ssh spice +telepathy zeroconf"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-RDEPEND="
- >=dev-libs/glib-2.28.0:2
- >=x11-libs/gtk+-3.9.6:3
- app-crypt/libsecret
- >=dev-libs/libxml2-2.6.31:2
- >=net-libs/gtk-vnc-0.4.3[gtk3]
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-themes/hicolor-icon-theme
-
- rdp? ( net-misc/freerdp )
- ssh? ( >=x11-libs/vte-0.20:2.91 )
- spice? (
- app-emulation/spice-protocol
- >=net-misc/spice-gtk-0.5[gtk3] )
- telepathy? (
- dev-libs/dbus-glib
- >=net-libs/telepathy-glib-0.11.6 )
- zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-"
-DEPEND="${RDEPEND}
- >=dev-lang/perl-5
- dev-libs/appstream-glib
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- $(vala_depend)
-"
-
-pkg_pretend() {
- # Needed for VNC ssh tunnel, bug #518574
- CONFIG_CHECK="~IPV6"
- check_extra_config
-}
-
-src_prepare() {
- # Fix RDP initialization with recent FreeRDP (from 'master')
- epatch "${FILESDIR}"/${PN}-3.16.1-freerdp.patch
-
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
- gnome2_src_configure \
- $(use_enable rdp) \
- $(use_enable ssh) \
- $(use_enable spice) \
- $(use_with telepathy) \
- $(use_with zeroconf avahi) \
- ITSTOOL=$(type -P true)
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/vinagre/, net-misc/vinagre/files/
@ 2020-02-13 14:26 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-02-13 14:26 UTC (permalink / raw
To: gentoo-commits
commit: c7c4a47cc71ce36163a91610334bc694f7ad2caa
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 14:25:56 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 14:25:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c4a47c
net-misc/vinagre: Fix for GCC 10 / -fno-common
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/vinagre-3.22.0-gcc10-fno-common.patch | 22 ++++++++++++++++++++++
net-misc/vinagre/vinagre-3.22.0-r3.ebuild | 5 ++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch b/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch
new file mode 100644
index 00000000000..d23ce4fa59f
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/plugins/vnc/vinagre-vnc-connection.c
++++ b/plugins/vnc/vinagre-vnc-connection.c
+@@ -27,6 +27,8 @@
+ #include "vinagre-vnc-connection.h"
+ #include "vinagre-vala.h"
+
++gboolean scaling_command_line;
++
+ struct _VinagreVncConnectionPrivate
+ {
+ gchar *desktop_name;
+--- a/plugins/vnc/vinagre-vnc-connection.h
++++ b/plugins/vnc/vinagre-vnc-connection.h
+@@ -26,7 +26,7 @@
+
+ G_BEGIN_DECLS
+
+-gboolean scaling_command_line;
++extern gboolean scaling_command_line;
+
+ #define VINAGRE_TYPE_VNC_CONNECTION (vinagre_vnc_connection_get_type ())
+ #define VINAGRE_VNC_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnection))
diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
index 681c6aac3fd..dd6c7bc9f77 100644
--- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
+++ b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,6 +55,9 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=765444
eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch
eapply "${FILESDIR}"/${PN}-3.22.0-freerdp2-2.patch
+ # https://gitlab.gnome.org/GNOME/vinagre/merge_requests/8
+ eapply "${FILESDIR}"/${PN}-3.22.0-gcc10-fno-common.patch
+
vala_src_prepare
eautoreconf
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-13 14:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-28 20:30 [gentoo-commits] repo/gentoo:master commit in: net-misc/vinagre/, net-misc/vinagre/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-02-13 14:26 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox