[pkg-remote-commits] [remmina] 09/12: debian/patches/: patchset dropped (applied upstream)
Matteo F. Vescovi
mfv at moszumanska.debian.org
Mon Oct 9 20:18:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
mfv pushed a commit to branch master
in repository remmina.
commit d3fb4f9860ecc6d225914c97af69402998596acf
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Mon Oct 9 21:55:31 2017 +0200
debian/patches/: patchset dropped (applied upstream)
---
debian/patches/0100-external_tools.patch | 37 ---------
debian/patches/0105-fix_RDP_Clipboard.patch | 90 ----------------------
debian/patches/0110-vte-master.patch | 113 ----------------------------
debian/patches/0700-desktop.patch | 19 -----
debian/patches/0705-wayland.patch | 20 -----
debian/patches/series | 5 --
6 files changed, 284 deletions(-)
diff --git a/debian/patches/0100-external_tools.patch b/debian/patches/0100-external_tools.patch
deleted file mode 100644
index 37b10ea..0000000
--- a/debian/patches/0100-external_tools.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Look for external tools into a system directory
-Author: Luca Falavigna <dktrkranz at debian.org>
-
-Index: remmina/remmina/src/remmina_external_tools.c
-===================================================================
---- remmina.orig/remmina/src/remmina_external_tools.c
-+++ remmina/remmina/src/remmina_external_tools.c
-@@ -33,7 +33,7 @@ gboolean remmina_external_tools_from_fil
- GNode* root;
- root = g_node_new(NULL);
-
-- g_snprintf(dirname, MAX_PATH_LEN, "%s/.remmina/external_tools", g_get_home_dir());
-+ g_snprintf(dirname, MAX_PATH_LEN, "/usr/share/remmina/external_tools");
- dir = g_dir_open(dirname, 0, NULL);
-
- if (dir == NULL)
-@@ -72,7 +72,7 @@ gboolean remmina_external_tools_launcher
- {
- RemminaFile *remminafile;
- gchar launcher[MAX_PATH_LEN];
-- g_snprintf(launcher, MAX_PATH_LEN, "%s/.remmina/external_tools/launcher.sh", g_get_home_dir());
-+ g_snprintf(launcher, MAX_PATH_LEN, "/usr/share/remmina/external_tools/launcher.sh");
-
- remminafile = remmina_file_load(filename);
- GHashTableIter iter;
-Index: remmina/remmina/CMakeLists.txt
-===================================================================
---- remmina.orig/remmina/CMakeLists.txt
-+++ remmina/remmina/CMakeLists.txt
-@@ -173,7 +173,6 @@ if(WITH_TRANSLATIONS)
- endif()
- add_subdirectory(icons)
- add_subdirectory(desktop)
--add_subdirectory(external_tools)
-
- install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR})
-
diff --git a/debian/patches/0105-fix_RDP_Clipboard.patch b/debian/patches/0105-fix_RDP_Clipboard.patch
deleted file mode 100644
index 34db69a..0000000
--- a/debian/patches/0105-fix_RDP_Clipboard.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: remmina-plugins/rdp/rdp_cliprdr.c
-===================================================================
---- remmina-plugins.orig/rdp/rdp_cliprdr.c
-+++ remmina-plugins/rdp/rdp_cliprdr.c
-@@ -308,7 +308,7 @@ int remmina_rdp_cliprdr_server_file_contents_response(CliprdrClientContext* cont
- }
-
-
--static int remmina_rdp_cliprdr_monitor_ready(CliprdrClientContext* context, CLIPRDR_MONITOR_READY* monitorReady)
-+static UINT remmina_rdp_cliprdr_monitor_ready(CliprdrClientContext* context, CLIPRDR_MONITOR_READY* monitorReady)
- {
- TRACE_CALL("remmina_rdp_cliprdr_monitor_ready");
- RemminaPluginRdpUiObject* ui;
-@@ -323,17 +323,17 @@ static int remmina_rdp_cliprdr_monitor_ready(CliprdrClientContext* context, CLIP
- ui->clipboard.type = REMMINA_RDP_UI_CLIPBOARD_MONITORREADY;
- rf_queue_ui(gp, ui);
-
-- return 1;
-+ return CHANNEL_RC_OK;
- }
-
--static int remmina_rdp_cliprdr_server_capabilities(CliprdrClientContext* context, CLIPRDR_CAPABILITIES* capabilities)
-+static UINT remmina_rdp_cliprdr_server_capabilities(CliprdrClientContext* context, CLIPRDR_CAPABILITIES* capabilities)
- {
- TRACE_CALL("remmina_rdp_cliprdr_server_capabilities");
-- return 1;
-+ return CHANNEL_RC_OK;
- }
-
-
--static int remmina_rdp_cliprdr_server_format_list(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST* formatList)
-+static UINT remmina_rdp_cliprdr_server_format_list(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST* formatList)
- {
- TRACE_CALL("remmina_rdp_cliprdr_server_format_list");
-
-@@ -399,17 +399,17 @@ static int remmina_rdp_cliprdr_server_format_list(CliprdrClientContext* context,
- ui->clipboard.targetlist = list;
- rf_queue_ui(gp, ui);
-
-- return 1;
-+ return CHANNEL_RC_OK;
- }
-
--static int remmina_rdp_cliprdr_server_format_list_response(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse)
-+static UINT remmina_rdp_cliprdr_server_format_list_response(CliprdrClientContext* context, CLIPRDR_FORMAT_LIST_RESPONSE* formatListResponse)
- {
- TRACE_CALL("remmina_rdp_cliprdr_server_format_list_response");
-- return 1;
-+ return CHANNEL_RC_OK;
- }
-
-
--static int remmina_rdp_cliprdr_server_format_data_request(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest)
-+static UINT remmina_rdp_cliprdr_server_format_data_request(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_REQUEST* formatDataRequest)
- {
- TRACE_CALL("remmina_rdp_cliprdr_server_format_data_request");
-
-@@ -427,12 +427,13 @@ static int remmina_rdp_cliprdr_server_format_data_request(CliprdrClientContext*
- ui->clipboard.format = formatDataRequest->requestedFormatId;
- rf_queue_ui(gp, ui);
-
-- return 1;
-+ return CHANNEL_RC_OK;
- }
-
--static int remmina_rdp_cliprdr_server_format_data_response(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse)
-+static UINT remmina_rdp_cliprdr_server_format_data_response(CliprdrClientContext* context, CLIPRDR_FORMAT_DATA_RESPONSE* formatDataResponse)
- {
- TRACE_CALL("remmina_rdp_cliprdr_server_format_data_response");
-+
- UINT8* data;
- size_t size;
- rfContext* rfi;
-@@ -565,7 +566,7 @@ static int remmina_rdp_cliprdr_server_format_data_response(CliprdrClientContext*
- }
- pthread_mutex_unlock(&clipboard->transfer_clip_mutex);
-
-- return 1;
-+ return CHANNEL_RC_OK;
- }
-
- void remmina_rdp_cliprdr_request_data(GtkClipboard *gtkClipboard, GtkSelectionData *selection_data, guint info, RemminaProtocolWidget* gp )
-@@ -933,6 +934,7 @@ void remmina_rdp_clipboard_free(rfContext *rfi)
- void remmina_rdp_cliprdr_init(rfContext* rfi, CliprdrClientContext* cliprdr)
- {
- TRACE_CALL("remmina_rdp_cliprdr_init");
-+
- rfClipboard* clipboard;
- clipboard = &(rfi->clipboard);
-
\ No newline at end of file
diff --git a/debian/patches/0110-vte-master.patch b/debian/patches/0110-vte-master.patch
deleted file mode 100644
index 8555bca..0000000
--- a/debian/patches/0110-vte-master.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/remmina/src/remmina_masterthread_exec.c b/remmina/src/remmina_masterthread_exec.c
-index e6b03ee..3500b07 100644
---- a/remmina/src/remmina_masterthread_exec.c
-+++ b/remmina/src/remmina_masterthread_exec.c
-@@ -108,7 +108,8 @@ static gboolean remmina_masterthread_exec_callback(RemminaMTExecData *d)
- case FUNC_VTE_TERMINAL_SET_ENCODING_AND_PTY:
- #if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE)
- remmina_plugin_ssh_vte_terminal_set_encoding_and_pty( d->p.vte_terminal_set_encoding_and_pty.terminal,
-- d->p.vte_terminal_set_encoding_and_pty.codeset, d->p.vte_terminal_set_encoding_and_pty.slave );
-+ d->p.vte_terminal_set_encoding_and_pty.codeset,
-+ d->p.vte_terminal_set_encoding_and_pty.master, d->p.vte_terminal_set_encoding_and_pty.slave );
- #endif
- break;
- }
-diff --git a/remmina/src/remmina_masterthread_exec.h b/remmina/src/remmina_masterthread_exec.h
-index 477616c..a0e9fa4 100644
---- a/remmina/src/remmina_masterthread_exec.h
-+++ b/remmina/src/remmina_masterthread_exec.h
-@@ -152,6 +152,7 @@ typedef struct remmina_masterthread_exec_data
- {
- VteTerminal *terminal;
- const char *codeset;
-+ int master;
- int slave;
- } vte_terminal_set_encoding_and_pty;
- #endif
-diff --git a/remmina/src/remmina_ssh.c b/remmina/src/remmina_ssh.c
-index 207732a..e02f6c8 100644
---- a/remmina/src/remmina_ssh.c
-+++ b/remmina/src/remmina_ssh.c
-@@ -1531,15 +1531,15 @@ remmina_ssh_shell_thread (gpointer data)
- timeout.tv_usec = 0;
-
- FD_ZERO (&fds);
-- FD_SET (shell->master, &fds);
-+ FD_SET (shell->slave, &fds);
-
-- ret = ssh_select (ch, chout, shell->master + 1, &fds, &timeout);
-+ ret = ssh_select (ch, chout, shell->slave + 1, &fds, &timeout);
- if (ret == SSH_EINTR) continue;
- if (ret == -1) break;
-
-- if (FD_ISSET (shell->master, &fds))
-+ if (FD_ISSET (shell->slave, &fds))
- {
-- len = read (shell->master, buf, buf_len);
-+ len = read (shell->slave, buf, buf_len);
- if (len <= 0) break;
- LOCK_SSH (shell)
- ssh_channel_write (channel, buf, len);
-@@ -1571,7 +1571,7 @@ remmina_ssh_shell_thread (gpointer data)
- }
- while (len > 0)
- {
-- ret = write (shell->master, buf, len);
-+ ret = write (shell->slave, buf, len);
- if (ret <= 0) break;
- len -= ret;
- }
-diff --git a/remmina/src/remmina_ssh_plugin.c b/remmina/src/remmina_ssh_plugin.c
-index aa84263..a7f6452 100644
---- a/remmina/src/remmina_ssh_plugin.c
-+++ b/remmina/src/remmina_ssh_plugin.c
-@@ -143,14 +143,14 @@ remmina_plugin_ssh_main_thread (gpointer data)
- gpdata->shell = shell;
-
- charset = REMMINA_SSH (shell)->charset;
-- remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VTE_TERMINAL (gpdata->vte), charset, shell->slave);
-+ remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VTE_TERMINAL (gpdata->vte), charset, shell->master, shell->slave);
- remmina_plugin_service->protocol_plugin_emit_signal (gp, "connect");
-
- gpdata->thread = 0;
- return NULL;
- }
-
--void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int slave)
-+void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int master, int slave)
- {
- TRACE_CALL("remmina_plugin_ssh_vte_terminal_set_encoding_and_pty");
- if ( !remmina_masterthread_exec_is_main_thread() )
-@@ -161,6 +161,7 @@ void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal,
- d->func = FUNC_VTE_TERMINAL_SET_ENCODING_AND_PTY;
- d->p.vte_terminal_set_encoding_and_pty.terminal = terminal;
- d->p.vte_terminal_set_encoding_and_pty.codeset = codeset;
-+ d->p.vte_terminal_set_encoding_and_pty.master = master;
- d->p.vte_terminal_set_encoding_and_pty.slave = slave;
- remmina_masterthread_exec_and_wait(d);
- g_free(d);
-@@ -182,9 +183,9 @@ void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal,
- vte_terminal_set_delete_binding(terminal, VTE_ERASE_DELETE_SEQUENCE);
-
- #if !VTE_CHECK_VERSION(0,38,0)
-- vte_terminal_set_pty (terminal, slave);
-+ vte_terminal_set_pty (terminal, master);
- #else
-- vte_terminal_set_pty (terminal, vte_pty_new_foreign_sync(slave, NULL, NULL));
-+ vte_terminal_set_pty (terminal, vte_pty_new_foreign_sync(master, NULL, NULL));
- #endif
-
- }
-diff --git a/remmina/src/remmina_ssh_plugin.h b/remmina/src/remmina_ssh_plugin.h
-index 336bd9b..2d3b16c 100644
---- a/remmina/src/remmina_ssh_plugin.h
-+++ b/remmina/src/remmina_ssh_plugin.h
-@@ -46,7 +46,7 @@ void remmina_ssh_plugin_register(void);
-
- /* For callback in main thread */
- #if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE)
--void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int slave);
-+void remmina_plugin_ssh_vte_terminal_set_encoding_and_pty(VteTerminal *terminal, const char *codeset, int master, int slave);
- void remmina_plugin_ssh_vte_select_all (GtkMenuItem *menuitem, gpointer user_data);
- void remmina_plugin_ssh_vte_copy_clipboard (GtkMenuItem *menuitem, gpointer user_data);
- void remmina_plugin_ssh_vte_paste_clipboard (GtkMenuItem *menuitem, gpointer user_data);
diff --git a/debian/patches/0700-desktop.patch b/debian/patches/0700-desktop.patch
deleted file mode 100644
index fb5e929..0000000
--- a/debian/patches/0700-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add Keywords to desktop file
-Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
-Forwarded: not-needed
-Last-Update: 2015-09-29
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/Index: trunk/remmina/desktop/remmina.desktop
-===================================================================
-Index: trunk/remmina/desktop/remmina.desktop.in
-===================================================================
---- trunk.orig/remmina/desktop/remmina.desktop.in
-+++ trunk/remmina/desktop/remmina.desktop.in
-@@ -72,6 +72,7 @@ Terminal=false
- Type=Application
- Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
- Actions=Profile;Tray;Quit;
-+Keywords=remote desktop;rdp;vnc;nx;ssh;
-
- [Desktop Action Profile]
- Name=Create a New Connection Profile
diff --git a/debian/patches/0705-wayland.patch b/debian/patches/0705-wayland.patch
deleted file mode 100644
index b3fa053..0000000
--- a/debian/patches/0705-wayland.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Set allowed backends to "x11,broadway,quartz" to
- prevend crashes with wayland.
-Bug: https://github.com/FreeRDP/Remmina/pull/680
-Bug-Debian: https://bugs.debian.org/801963
-Last-Update: 2016-12-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/remmina/src/remmina.c
-===================================================================
---- trunk.orig/remmina/src/remmina.c
-+++ trunk/remmina/src/remmina.c
-@@ -211,6 +211,8 @@ int main(int argc, char* argv[])
- GApplication* app;
- int status;
-
-+ gdk_set_allowed_backends("x11,broadway,quartz");
-+
- bindtextdomain(GETTEXT_PACKAGE, REMMINA_LOCALEDIR);
- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- textdomain(GETTEXT_PACKAGE);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f14e0c6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-0700-desktop.patch
-##0100-external_tools.patch
-#0105-fix_RDP_Clipboard.patch
-#0110-vte-master.patch
-##0705-wayland.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/remmina.git
More information about the pkg-remote-commits
mailing list