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

[jake_goerzen at users.sourceforge.net]

Revision: 26938
          http://sourceforge.net/p/gar/code/26938
Author:   jake_goerzen
Date:     2022-05-17 19:20:57 +0000 (Tue, 17 May 2022)
Log Message:
-----------
rdesktop: update patch and clean up recipe

Modified Paths:
--------------
    csw/mgar/pkg/rdesktop/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/rdesktop/trunk/files/0001-fix-return-from-void-function.patch

Removed Paths:
-------------
    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	2022-05-13 20:12:50 UTC (rev 26937)
+++ csw/mgar/pkg/rdesktop/trunk/Makefile	2022-05-17 19:20:57 UTC (rev 26938)
@@ -15,7 +15,7 @@
 
 VENDOR_URL = http://www.rdesktop.org
 
-PATCHFILES = 0001-remove-return-from-void-function.patch
+PATCHFILES = 0001-fix-return-from-void-function.patch
 
 BUILD_DEP_PKGS += CSWlibao-dev
 BUILD_DEP_PKGS += CSWlibsamplerate-dev
@@ -37,8 +37,6 @@
 BUILD64 = 1
 ISAEXEC = 1
 
-#GARCOMPILER = SOS12U6
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 

Added: csw/mgar/pkg/rdesktop/trunk/files/0001-fix-return-from-void-function.patch
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/files/0001-fix-return-from-void-function.patch	                        (rev 0)
+++ csw/mgar/pkg/rdesktop/trunk/files/0001-fix-return-from-void-function.patch	2022-05-17 19:20:57 UTC (rev 26938)
@@ -0,0 +1,26 @@
+From 7fcbc321418e809d4e763bf199eb234e764d68fa Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoerzen at opencsw.org>
+Date: Tue, 17 May 2022 19:25:04 +0200
+Subject: [PATCH] fix return from void function
+
+---
+ rdp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rdp.c b/rdp.c
+index e7a849b..8401c6f 100644
+--- a/rdp.c
++++ b/rdp.c
+@@ -305,7 +305,8 @@ 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);
++				return;
+ 			}
+ 		}
+ 
+-- 
+2.4.0
+

Deleted: 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	2022-05-13 20:12:50 UTC (rev 26937)
+++ csw/mgar/pkg/rdesktop/trunk/files/0001-remove-return-from-void-function.patch	2022-05-17 19:20:57 UTC (rev 26938)
@@ -1,25 +0,0 @@
-From ce09e02e3d5e155f45a6cb8bdb939d4411784444 Mon Sep 17 00:00:00 2001
-From: Jake Goerzen <jgoerzen at opencsw.org>
-Date: Thu, 24 Jun 2021 01:09:53 +0200
-Subject: [PATCH] remove return from void function
-
----
- rdp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rdp.c b/rdp.c
-index e7a849b..ce577bc 100644
---- a/rdp.c
-+++ b/rdp.c
-@@ -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);
- 			}
- 		}
- 
--- 
-2.4.0
-

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