Date: Mon, 10 Jul 2017 12:49:18 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r445435 - in branches/2017Q3/devel/sdl12: . files Message-ID: <201707101249.v6ACnIkJ086171@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Jul 10 12:49:18 2017 New Revision: 445435 URL: https://svnweb.freebsd.org/changeset/ports/445435 Log: MFH: r445140 devel/sdl12: backport crashfix for sparc64 Obtained from: upstream (via PkgSrc and OpenBSD Ports) Approved by: ports-secteam (junovitch) Added: branches/2017Q3/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c - copied unchanged from r445140, head/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c Modified: branches/2017Q3/devel/sdl12/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/devel/sdl12/Makefile ============================================================================== --- branches/2017Q3/devel/sdl12/Makefile Mon Jul 10 12:47:31 2017 (r445434) +++ branches/2017Q3/devel/sdl12/Makefile Mon Jul 10 12:49:18 2017 (r445435) @@ -3,7 +3,7 @@ PORTNAME= sdl PORTVERSION= 1.2.15 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ Copied: branches/2017Q3/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c (from r445140, head/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c Mon Jul 10 12:49:18 2017 (r445435, copy of r445140, head/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c) @@ -0,0 +1,30 @@ +https://bugzilla.libsdl.org/show_bug.cgi?id=1427 +https://hg.libsdl.org/SDL/rev/57a55e457ef6 + +--- src/video/x11/SDL_x11video.c.orig 2012-01-19 06:30:06 UTC ++++ src/video/x11/SDL_x11video.c +@@ -418,16 +418,21 @@ static void create_aux_windows(_THIS) + } + + { +- pid_t pid = getpid(); ++ union align_pid { ++ pid_t pid; ++ long dummy; ++ } a_pid; + char hostname[256]; ++ ++ a_pid.pid = getpid(); + +- if (pid > 0 && gethostname(hostname, sizeof(hostname)) > -1) { ++ if (a_pid.pid > 0 && gethostname(hostname, sizeof(hostname)) > -1) { + Atom _NET_WM_PID = XInternAtom(SDL_Display, "_NET_WM_PID", False); + Atom WM_CLIENT_MACHINE = XInternAtom(SDL_Display, "WM_CLIENT_MACHINE", False); + + hostname[sizeof(hostname)-1] = '\0'; + XChangeProperty(SDL_Display, WMwindow, _NET_WM_PID, XA_CARDINAL, 32, +- PropModeReplace, (unsigned char *)&pid, 1); ++ PropModeReplace, (unsigned char *)&(a_pid.pid), 1); + XChangeProperty(SDL_Display, WMwindow, WM_CLIENT_MACHINE, XA_STRING, 8, + PropModeReplace, (unsigned char *)hostname, SDL_strlen(hostname)); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707101249.v6ACnIkJ086171>