cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zap gcc2 patches

Browse Source 
OK naddy@
This commit is contained in:
gsoares 2013-08-07 19:13:11 +00:00
parent 25a3f79e15
commit bf93d0fd4a
3 changed files with 2 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/rdesktop/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.39 2013/07/04 15:12:34 gsoares Exp $
# $OpenBSD: Makefile,v 1.40 2013/08/07 19:13:11 gsoares Exp $
COMMENT= open source client for Windows Terminal Server
DISTNAME= rdesktop-1.7.1
REVISION= 1
REVISION= 2
CATEGORIES= x11 net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rdesktop/}

39
x11/rdesktop/patches/patch-rdesktop_c
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-rdesktop_c,v 1.2 2012/03/14 18:36:04 gsoares Exp $
fix build with gcc-2.95
--- rdesktop.c.orig Fri Nov 25 08:03:03 2011
+++ rdesktop.c Tue Mar 13 13:53:08 2012
@@ -473,6 +473,7 @@ main(int argc, char *argv[])
char *locale = NULL;
int username_option = 0;
RD_BOOL geometry_option = False;
+ struct sigaction act;
#ifdef WITH_RDPSND
char *rdpsnd_optarg = NULL;
#endif
@@ -488,7 +489,6 @@ main(int argc, char *argv[])
#endif
/* Ignore SIGPIPE, since we are using popen() */
- struct sigaction act;
memset(&act, 0, sizeof(act));
act.sa_handler = SIG_IGN;
sigemptyset(&act.sa_mask);
@@ -901,6 +901,7 @@ main(int argc, char *argv[])
if (!username_option)
{
+ int pwlen;
pw = getpwuid(getuid());
if ((pw == NULL) || (pw->pw_name == NULL))
{
@@ -908,7 +909,7 @@ main(int argc, char *argv[])
return EX_OSERR;
}
/* +1 for trailing \0 */
- int pwlen = strlen(pw->pw_name) + 1;
+ pwlen = strlen(pw->pw_name) + 1;
g_username = (char *) xmalloc(pwlen);
STRNCPY(g_username, pw->pw_name, pwlen);
}

22
x11/rdesktop/patches/patch-xclip_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-xclip_c,v 1.1 2011/06/23 15:17:13 sebastia Exp $
fix build with gcc-2.95
--- xclip.c.orig Wed Jun 22 16:17:57 2011
+++ xclip.c Wed Jun 22 16:18:21 2011
@@ -158,6 +158,7 @@ utf16_lf2crlf(uint8 * data, uint32 * size)
uint8 *result;
uint16 *inptr, *outptr;
RD_BOOL swap_endianess;
+ uint16 uvalue_previous = 0; /* Kept so we'll avoid translating CR-LF to CR-CR-LF */
/* Worst case: Every char is LF */
result = xmalloc((*size * 2) + 2);
@@ -170,7 +171,6 @@ utf16_lf2crlf(uint8 * data, uint32 * size)
/* Check for a reversed BOM */
swap_endianess = (*inptr == 0xfffe);
- uint16 uvalue_previous = 0; /* Kept so we'll avoid translating CR-LF to CR-CR-LF */
while ((uint8 *) inptr < data + *size)
{
uint16 uvalue = *inptr;