SF.net SVN: gar:[26767] csw/mgar/pkg/rdesktop/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 26767
          http://sourceforge.net/p/gar/code/26767
Author:   jake_goerzen
Date:     2021-06-23 23:25:41 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
rdesktop: undo change compiler to GNU; update and restore patch

Modified Paths:
--------------
    csw/mgar/pkg/rdesktop/trunk/Makefile
    csw/mgar/pkg/rdesktop/trunk/files/0001-remove-return-from-void-function.patch

Modified: csw/mgar/pkg/rdesktop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/Makefile	2021-06-23 18:01:06 UTC (rev 26766)
+++ csw/mgar/pkg/rdesktop/trunk/Makefile	2021-06-23 23:25:41 UTC (rev 26767)
@@ -15,6 +15,8 @@
 
 VENDOR_URL = http://www.rdesktop.org
 
+PATCHFILES = 0001-remove-return-from-void-function.patch
+
 BUILD_DEP_PKGS += CSWlibao-dev
 BUILD_DEP_PKGS += CSWlibsamplerate-dev
 BUILD_DEP_PKGS += CSWlibssl-dev
@@ -35,7 +37,7 @@
 BUILD64 = 1
 ISAEXEC = 1
 
-GARCOMPILER = GNU
+#GARCOMPILER = SOS12U6
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-openssl=$(prefix)

Modified: csw/mgar/pkg/rdesktop/trunk/files/0001-remove-return-from-void-function.patch
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/files/0001-remove-return-from-void-function.patch	2021-06-23 18:01:06 UTC (rev 26766)
+++ csw/mgar/pkg/rdesktop/trunk/files/0001-remove-return-from-void-function.patch	2021-06-23 23:25:41 UTC (rev 26767)
@@ -1,6 +1,6 @@
-From fcf3cdea71db6bf639e5fd57c641e701973783ec Mon Sep 17 00:00:00 2001
+From ce09e02e3d5e155f45a6cb8bdb939d4411784444 Mon Sep 17 00:00:00 2001
 From: Jake Goerzen <jgoerzen at opencsw.org>
-Date: Wed, 1 Mar 2017 18:53:46 +0100
+Date: Thu, 24 Jun 2021 01:09:53 +0200
 Subject: [PATCH] remove return from void function
 
 ---
@@ -8,13 +8,13 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rdp.c b/rdp.c
-index 44d8bdb..6be46c1 100644
+index e7a849b..ce577bc 100644
 --- a/rdp.c
 +++ b/rdp.c
-@@ -285,7 +285,7 @@ rdp_in_unistr(STREAM s, int in_len, char **string, uint32 * str_size)
- 					WINDOWS_CODEPAGE, g_codepage, iconv_h);
+@@ -305,7 +305,7 @@ rdp_in_unistr(STREAM s, int in_len, char **string, uint32 * str_size)
  
  				g_iconv_works = False;
+ 				s_seek(s, start);
 -				return rdp_in_unistr(s, in_len, string, str_size);
 +				rdp_in_unistr(s, in_len, string, str_size);
  			}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.