summaryrefslogtreecommitdiff
path: root/net-misc/vinagre
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-17 01:16:38 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-17 01:16:38 +0000
commit53cba99042fa967e2a93da9f8db806fe2d035543 (patch)
tree9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /net-misc/vinagre
parent71deace00d1a2b091313fe137ab7092418c6f87c (diff)
gentoo resync : 17.02.2020
Diffstat (limited to 'net-misc/vinagre')
-rw-r--r--net-misc/vinagre/Manifest3
-rw-r--r--net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch22
-rw-r--r--net-misc/vinagre/vinagre-3.22.0-r3.ebuild5
3 files changed, 28 insertions, 2 deletions
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 9a9d5dfad050..fe7776167d7a 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,5 +1,6 @@
AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9d29a999845be18eaa611d3162125ba4b8b7e3743406c1381c191edde2fbfb29967cf427823ce74e445ddc29b93c10ed SHA512 9fbe2c45bdda85226410020154441f25f1010e331c30a6d64eabd302c59408d2097238412f4b75407b0bb65163b3ed7258c280b411f17e4b071c95c27b0b2095
AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312
+AUX vinagre-3.22.0-gcc10-fno-common.patch 690 BLAKE2B 4f552f190f520fb1e09ae91fb8d88a4c31658f99c4e218df1d2362c8b2c20de1b7d67d04a6846041d26a0eaaf38236823381436c05abb2e293491fde2b17e94a SHA512 f6ec1a339aaf0d8a6a9f663cc51ae10c9a15e6c772dcc978c27a54842e8079d68079f5280cec34942921e4265f8fe94f61af9edc29946b6262d36ad321b6c37d
DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f
-EBUILD vinagre-3.22.0-r3.ebuild 1649 BLAKE2B 879c8af71284485da26297599f484fcf84395a3836b6c0409ed39144bc98f1b02abdf5b6758f91b2241647a6eee23c0ab4c86bb92b6988e81bb6fbe56abb0440 SHA512 90ecf342cd46f26ee8d655f4a77877711547e841b8a37b94bfe17b2256f184dac30b18cda90789a0e6569c9eec92298c5039e8cb65599347bf7ec931645b3eea
+EBUILD vinagre-3.22.0-r3.ebuild 1767 BLAKE2B 25c5a6267b4f08cbe60aa58693074e57bce9022fb01e06bdc7e7bf60bab79cf74c7fd3cf38e0b2af84833174917964da9cdd56862a29980dcd6aa67d5f40005e SHA512 dfcb08bbe6b39a8c2ed8e35538e365721f93589dd30e14e374e0b5811beea4fa2c1b25ab9c9e62e73f15e213537587f398969b8a9d0a25966e75a7d07d7729a5
MISC metadata.xml 550 BLAKE2B 6f81c1e289dfcf1839030e45752fb4970ea84b3f8f8d187ae476f4fdbbce15739b8a5857b87bd4b426936f90554a9346f7abf3b9c60624fb39af4f6e2fab1b98 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840
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 000000000000..d23ce4fa59f6
--- /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 681c6aac3fd8..dd6c7bc9f772 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