From a72f5e75344aa80556a8059c1e4aa547e38204d5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jan 24 2015 03:30:02 +0000 Subject: Rebase args patch for beta1-android7 --- diff --git a/freerdp-args.patch b/freerdp-args.patch index efedc4c..1a5506c 100644 --- a/freerdp-args.patch +++ b/freerdp-args.patch @@ -1,7 +1,7 @@ -diff -up FreeRDP-1.2.0-beta1-android9/client/common/cmdline.c.args FreeRDP-1.2.0-beta1-android9/client/common/cmdline.c ---- FreeRDP-1.2.0-beta1-android9/client/common/cmdline.c.args 2015-01-15 14:38:15.573870682 -0700 -+++ FreeRDP-1.2.0-beta1-android9/client/common/cmdline.c 2015-01-15 14:51:29.640391722 -0700 -@@ -1087,8 +1087,10 @@ BOOL freerdp_client_detect_command_line( +diff -up FreeRDP-1.2.0-beta1-android7/client/common/cmdline.c.args FreeRDP-1.2.0-beta1-android7/client/common/cmdline.c +--- FreeRDP-1.2.0-beta1-android7/client/common/cmdline.c.args 2014-06-12 07:51:57.000000000 -0600 ++++ FreeRDP-1.2.0-beta1-android7/client/common/cmdline.c 2015-01-23 20:20:07.868761079 -0700 +@@ -1042,8 +1042,10 @@ BOOL freerdp_client_detect_command_line( *flags |= COMMAND_LINE_SIGIL_DASH | COMMAND_LINE_SIGIL_DOUBLE_DASH; *flags |= COMMAND_LINE_SIGIL_ENABLE_DISABLE; @@ -13,10 +13,10 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/cmdline.c.args FreeRDP-1.2.0 *flags = COMMAND_LINE_SEPARATOR_COLON; *flags |= COMMAND_LINE_SIGIL_SLASH | COMMAND_LINE_SIGIL_PLUS_MINUS; } -diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c ---- FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args 2014-09-11 16:46:32.000000000 -0600 -+++ FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c 2015-01-15 14:53:19.418773129 -0700 -@@ -119,16 +119,20 @@ void freerdp_client_old_parse_hostname(c +diff -up FreeRDP-1.2.0-beta1-android7/client/common/compatibility.c.args FreeRDP-1.2.0-beta1-android7/client/common/compatibility.c +--- FreeRDP-1.2.0-beta1-android7/client/common/compatibility.c.args 2014-06-12 07:51:57.000000000 -0600 ++++ FreeRDP-1.2.0-beta1-android7/client/common/compatibility.c 2015-01-23 20:21:38.618951560 -0700 +@@ -118,16 +118,20 @@ void freerdp_client_old_parse_hostname(c int freerdp_client_old_process_plugin(rdpSettings* settings, ADDIN_ARGV* args) { @@ -25,7 +25,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP { + args_handled++; settings->RedirectClipboard = TRUE; - DEBUG_WARN( "--plugin cliprdr -> +clipboard\n"); + fprintf(stderr, "--plugin cliprdr -> +clipboard\n"); } else if (strcmp(args->argv[0], "rdpdr") == 0) { @@ -38,7 +38,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP if ((strcmp(args->argv[1], "disk") == 0) || (strcmp(args->argv[1], "drive") == 0)) { -@@ -156,21 +160,26 @@ int freerdp_client_old_process_plugin(rd +@@ -155,21 +159,26 @@ int freerdp_client_old_process_plugin(rd } else if (strcmp(args->argv[0], "drdynvc") == 0) { @@ -67,7 +67,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP settings->RemoteApplicationProgram = _strdup(args->argv[1]); } else -@@ -178,14 +187,12 @@ int freerdp_client_old_process_plugin(rd +@@ -177,14 +186,12 @@ int freerdp_client_old_process_plugin(rd freerdp_client_add_static_channel(settings, args->argc, args->argv); } @@ -84,7 +84,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP if (index == (argc - 1)) { -@@ -201,11 +208,10 @@ int freerdp_client_old_command_line_pre_ +@@ -200,11 +207,10 @@ int freerdp_client_old_command_line_pre_ return -1; } @@ -100,7 +100,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP } else { -@@ -215,6 +221,7 @@ int freerdp_client_old_command_line_pre_ +@@ -214,6 +220,7 @@ int freerdp_client_old_command_line_pre_ if (strcmp("--plugin", argv[index]) == 0) { @@ -108,7 +108,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP int length; char *a, *p; int i, j, t; -@@ -230,20 +237,19 @@ int freerdp_client_old_command_line_pre_ +@@ -229,20 +236,19 @@ int freerdp_client_old_command_line_pre_ return -1; args = (ADDIN_ARGV*) malloc(sizeof(ADDIN_ARGV)); @@ -132,7 +132,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP for (j = 0, p = (char*) argv[index]; (j < 4) && (p != NULL); j++) { -@@ -264,6 +270,9 @@ int freerdp_client_old_command_line_pre_ +@@ -263,6 +269,9 @@ int freerdp_client_old_command_line_pre_ if (p != NULL) { p = strchr(p, ':'); @@ -142,7 +142,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP length = (int) (p - a); args->argv[j + 1] = (char*) malloc(length + 1); CopyMemory(args->argv[j + 1], a, length); -@@ -278,11 +287,14 @@ int freerdp_client_old_command_line_pre_ +@@ -277,11 +286,14 @@ int freerdp_client_old_command_line_pre_ args->argc++; } @@ -158,7 +158,7 @@ diff -up FreeRDP-1.2.0-beta1-android9/client/common/compatibility.c.args FreeRDP index++; i++; } -@@ -291,19 +303,16 @@ int freerdp_client_old_command_line_pre_ +@@ -290,19 +302,16 @@ int freerdp_client_old_command_line_pre_ { if (settings) { diff --git a/freerdp.spec b/freerdp.spec index bf4dede..7865d00 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -1,6 +1,6 @@ Name: freerdp Version: 1.2.0 -Release: 0.6.beta.1%{?dist} +Release: 0.6.beta.1%{?dist}.1 Epoch: 1 Summary: Free implementation of the Remote Desktop Protocol (RDP) @@ -187,6 +187,9 @@ find %{buildroot} -name "*.a" -delete %{_libdir}/pkgconfig/winpr.pc %changelog +* Fri Jan 23 2015 Orion Poplawski - 1:1.2.0-0.6.beta.1.1 +- Rebase args patch for beta1-android7 + * Thu Jan 15 2015 Orion Poplawski - 1:1.2.0-0.6.beta.1 - Use better upstream patch to fix command line parsing