From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1180547-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6B7FD1382C5
for <garchives@archives.gentoo.org>; Thu, 18 Jun 2020 13:27:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90070E08D4;
Thu, 18 Jun 2020 13:27:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 69F89E08D9
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jun 2020 13:27:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CCEF434F39F
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jun 2020 13:27:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 17AAC1EF
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jun 2020 13:27:39 +0000 (UTC)
From: "Ben Kohler" <bkohler@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" <bkohler@gentoo.org>
Message-ID: <1592486848.0eae940a426b85831abb2deea89fdcbbcd55b4e4.bkohler@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/remmina/files/, net-misc/remmina/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/remmina/files/remmina-1.4.6-with-examples.patch net-misc/remmina/remmina-1.4.6.ebuild
X-VCS-Directories: net-misc/remmina/files/ net-misc/remmina/
X-VCS-Committer: bkohler
X-VCS-Committer-Name: Ben Kohler
X-VCS-Revision: 0eae940a426b85831abb2deea89fdcbbcd55b4e4
X-VCS-Branch: master
Date: Thu, 18 Jun 2020 13:27:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f9dd977d-c943-416d-b89d-1e9f2b3a8560
X-Archives-Hash: 82a45c4bff23393d6c48e3633934c8e7
commit: 0eae940a426b85831abb2deea89fdcbbcd55b4e4
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 13:26:45 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 13:27:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eae940a
net-misc/remmina: add patch for USE=examples
Also drop (afaik) unneeded xdg_src_prepare as it caused double-applied
patches & is not needed.
Closes: https://bugs.gentoo.org/727870
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../files/remmina-1.4.6-with-examples.patch | 34 ++++++++++++++++++++++
net-misc/remmina/remmina-1.4.6.ebuild | 2 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/net-misc/remmina/files/remmina-1.4.6-with-examples.patch b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
new file mode 100644
index 00000000000..259ef19e0fc
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
@@ -0,0 +1,34 @@
+diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
+--- a/plugins/tool_hello_world/plugin.c 2020-06-08 22:07:44.000000000 +0200
++++ b/plugins/tool_hello_world/plugin.c 2020-06-10 20:18:48.495507560 +0200
+@@ -42,17 +42,19 @@
+ #include <gdk/gdkx.h>
+
+ static RemminaPluginService *remmina_plugin_service = NULL;
++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
++
+
+ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
+ {
+ TRACE_CALL(__func__);
+- remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
++ remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
+ }
+
+ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
+ {
+ TRACE_CALL(__func__);
+- remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
++ remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
+
+ GtkDialog *dialog;
+ dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
+@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
+ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
+ {
+ TRACE_CALL(__func__);
+- remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
++ remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
+ remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
+ return FALSE;
+ }
diff --git a/net-misc/remmina/remmina-1.4.6.ebuild b/net-misc/remmina/remmina-1.4.6.ebuild
index f429622f2dc..b1bcb852ddf 100644
--- a/net-misc/remmina/remmina-1.4.6.ebuild
+++ b/net-misc/remmina/remmina-1.4.6.ebuild
@@ -54,12 +54,12 @@ RDEPEND="
"
DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+PATCHES=( "${FILESDIR}"/${P}-with-examples.patch )
S="${WORKDIR}/${MY_P}"
src_prepare() {
cmake_src_prepare
- xdg_src_prepare
}
src_configure() {