* [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/files/, net-misc/vinagre/
@ 2011-04-16 15:59 Gilles Dartiguelongue
0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-16 15:59 UTC (permalink / raw
To: gentoo-commits
commit: a33eea733dd11a3790987c89ddbbd219f3c12e6b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 15:56:24 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 15:56:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a33eea73
net-misc/vinagre: QAed
* Fix build failure with USE=ssh
* Split phases
* Fix typo for USE=applet
* Sync with gentoo-x86
* Raise some DEPENDs per configure
---
.../vinagre/files/vinagre-3.0.0-ssh-plugin.patch | 40 ++++++++++++++++++++
net-misc/vinagre/vinagre-3.0.0.ebuild | 38 +++++++++++--------
2 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/net-misc/vinagre/files/vinagre-3.0.0-ssh-plugin.patch b/net-misc/vinagre/files/vinagre-3.0.0-ssh-plugin.patch
new file mode 100644
index 0000000..6cc0066
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.0.0-ssh-plugin.patch
@@ -0,0 +1,40 @@
+From 81d78b74fc2678c793d96df9a57b0a3e5ca3a470 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Mon, 11 Apr 2011 22:09:47 +0200
+Subject: [PATCH 1/3] Fix the SSH plugin build, bug 647497
+
+Add LIBADD for ssh plugin, and use $(VINAGRE_LIBS) for it. Add $SSH_DEPS
+to VINAGRE pkg-config check.
+---
+ Makefile.am | 1 +
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2794c0f..d10a152 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -249,6 +249,7 @@ libssh_la_SOURCES = \
+ plugins/ssh/vinagre-ssh-tab.c
+
+ libssh_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
++libssh_la_LIBADD = $(VINAGRE_LIBS)
+ endif
+
+ plugin_LTLIBRARIES = \
+diff --git a/configure.ac b/configure.ac
+index a169d22..7420fdb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -193,7 +193,7 @@ AS_IF([test "x$have_panelapplet" = "xyes"],
+ AM_CONDITIONAL([VINAGRE_HAVE_PANELAPPLET], [test "x$have_panelapplet" = "xyes"])
+
+ # Check required libraries
+-PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS])
++PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS $SSH_DEPS])
+
+ PKG_CHECK_MODULES([VNC], [$GTK_VNC_DEPS $GTK_DEPS $XML2_DEPS])
+
+--
+1.7.4.1
+
diff --git a/net-misc/vinagre/vinagre-3.0.0.ebuild b/net-misc/vinagre/vinagre-3.0.0.ebuild
index fe14dd7..025d766 100644
--- a/net-misc/vinagre/vinagre-3.0.0.ebuild
+++ b/net-misc/vinagre/vinagre-3.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,53 +16,59 @@ HOMEPAGE="http://www.gnome.org/projects/vinagre/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="applet avahi +introspection +telepathy test" #+ssh
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
+IUSE="applet avahi +introspection +ssh +telepathy test"
RDEPEND=">=dev-libs/glib-2.25.11:2
>=x11-libs/gtk+-3.0.3:3
>=dev-libs/libpeas-0.7.2[gtk]
>=dev-libs/libxml2-2.6.31:2
- >=net-libs/gtk-vnc-0.4.3-r300
+ >=net-libs/gtk-vnc-0.4.3[gtk3]
- gnome-base/gnome-keyring
+ >=gnome-base/gnome-keyring-1
+ applet? ( >=gnome-base/gnome-panel-2.91 )
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- telepathy? (
- dev-libs/dbus-glib
- >=net-libs/telepathy-glib-0.11.6 )
- applet? ( >=gnome-base/gnome-panel-2.91 )"
-# ssh? ( >=x11-libs/vte-0.20:2.90 )
+ ssh? ( >=x11-libs/vte-0.20:2.90 )
+ telepathy? ( >=net-libs/telepathy-glib-0.11.6 )
+"
DEPEND="${RDEPEND}
gnome-base/gnome-common
>=dev-lang/perl-5
- >=dev-util/pkgconfig-0.9
+ >=dev-util/pkgconfig-0.16
>=dev-util/intltool-0.40
app-text/scrollkeeper
app-text/gnome-doc-utils
+ >=sys-devel/gettext-0.17
test? ( ~app-text/docbook-xml-dtd-4.3 )"
-DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-
-src_prepare() {
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
# Spice support?
# SSH support fails to compile
G2CONF="${G2CONF}
--disable-schemas-compile
--disable-scrollkeeper
--disable-spice
- --disable-ssh
--enable-rdp
- $(use_with panelapplet)
+ $(use_with applet panelapplet)
$(use_with avahi)
$(use_enable introspection)
+ $(use_enable ssh)
$(use_with telepathy)"
- #$(use_enable ssh)
+}
+
+src_prepare() {
+ # Fix build of ssh plugin
+ epatch "${FILESDIR}/${P}-ssh-plugin.patch"
+
+ intltoolize --force --copy --automake || die
+ eautoreconf
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/files/, net-misc/vinagre/
@ 2011-07-08 16:34 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-08 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 3350de2964956974cbe48b9fd969205bd63492df
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 8 16:32:21 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 8 16:32:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3350de29
net-misc/vinagre: 3.0.1 → 3.0.2
Version bump, add new dbus-glib dependency, punt unused patch.
---
.../vinagre/files/vinagre-3.0.0-ssh-plugin.patch | 40 --------------------
.../{vinagre-3.0.1.ebuild => vinagre-3.0.2.ebuild} | 6 ++-
2 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/net-misc/vinagre/files/vinagre-3.0.0-ssh-plugin.patch b/net-misc/vinagre/files/vinagre-3.0.0-ssh-plugin.patch
deleted file mode 100644
index 6cc0066..0000000
--- a/net-misc/vinagre/files/vinagre-3.0.0-ssh-plugin.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 81d78b74fc2678c793d96df9a57b0a3e5ca3a470 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Mon, 11 Apr 2011 22:09:47 +0200
-Subject: [PATCH 1/3] Fix the SSH plugin build, bug 647497
-
-Add LIBADD for ssh plugin, and use $(VINAGRE_LIBS) for it. Add $SSH_DEPS
-to VINAGRE pkg-config check.
----
- Makefile.am | 1 +
- configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2794c0f..d10a152 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -249,6 +249,7 @@ libssh_la_SOURCES = \
- plugins/ssh/vinagre-ssh-tab.c
-
- libssh_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-+libssh_la_LIBADD = $(VINAGRE_LIBS)
- endif
-
- plugin_LTLIBRARIES = \
-diff --git a/configure.ac b/configure.ac
-index a169d22..7420fdb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -193,7 +193,7 @@ AS_IF([test "x$have_panelapplet" = "xyes"],
- AM_CONDITIONAL([VINAGRE_HAVE_PANELAPPLET], [test "x$have_panelapplet" = "xyes"])
-
- # Check required libraries
--PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS])
-+PKG_CHECK_MODULES([VINAGRE], [$GLIB_DEPS $GTHREAD_DEPS $GTK_DEPS gnome-keyring-1 $XML2_DEPS $PEAS_DEPS $AVAHI_DEPS $TELEPATHY_GLIB_DEPS $SSH_DEPS])
-
- PKG_CHECK_MODULES([VNC], [$GTK_VNC_DEPS $GTK_DEPS $XML2_DEPS])
-
---
-1.7.4.1
-
diff --git a/net-misc/vinagre/vinagre-3.0.1.ebuild b/net-misc/vinagre/vinagre-3.0.2.ebuild
similarity index 96%
rename from net-misc/vinagre/vinagre-3.0.1.ebuild
rename to net-misc/vinagre/vinagre-3.0.2.ebuild
index f16b010..7e03e88 100644
--- a/net-misc/vinagre/vinagre-3.0.1.ebuild
+++ b/net-misc/vinagre/vinagre-3.0.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.4 2011/01/19 21:26:57 hwoarang Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -35,7 +35,9 @@ RDEPEND=">=dev-libs/glib-2.25.11:2
avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
ssh? ( >=x11-libs/vte-0.20:2.90 )
- telepathy? ( >=net-libs/telepathy-glib-0.11.6 )
+ telepathy? (
+ dev-libs/dbus-glib
+ >=net-libs/telepathy-glib-0.11.6 )
"
DEPEND="${RDEPEND}
gnome-base/gnome-common
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/files/, net-misc/vinagre/
@ 2015-05-25 9:19 Gilles Dartiguelongue
0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-25 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 6a65a865d6bd91d3dc5f864a31bd3abff8810062
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 09:17:23 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 25 09:18:56 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6a65a865
net-misc/vinagre: sync RDP build fixes from gentoo-x86
.../vinagre/files/vinagre-3.16.1-freerdp.patch | 38 ++++++++++++++++++++++
net-misc/vinagre/vinagre-3.16.1.ebuild | 3 ++
2 files changed, 41 insertions(+)
diff --git a/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
new file mode 100644
index 0000000..dacce43
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.16.1-freerdp.patch
@@ -0,0 +1,38 @@
+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
index 8da8a75..033e57e 100644
--- a/net-misc/vinagre/vinagre-3.16.1.ebuild
+++ b/net-misc/vinagre/vinagre-3.16.1.ebuild
@@ -48,6 +48,9 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ # Fix RDP initialization with recent FreeRDP (from 'master')
+ epatch "${FILESDIR}"/${PN}-3.16.1-freerdp.patch
+
vala_src_prepare
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-25 9:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-16 15:59 [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/files/, net-misc/vinagre/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2011-07-08 16:34 Alexandre Restovtsev
2015-05-25 9:19 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox