From owner-svn-ports-all@freebsd.org Mon May 4 19:53:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7AEF82C136A; Mon, 4 May 2020 19:53:30 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GD7G2QWgz3DfN; Mon, 4 May 2020 19:53:30 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 341F31950; Mon, 4 May 2020 19:53:30 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044JrT9W039014; Mon, 4 May 2020 19:53:29 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044JrTnM039010; Mon, 4 May 2020 19:53:29 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <202005041953.044JrTnM039010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Mon, 4 May 2020 19:53:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533979 - head/x11-wm/afterstep/files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: head/x11-wm/afterstep/files X-SVN-Commit-Revision: 533979 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 19:53:30 -0000 Author: dinoex Date: Mon May 4 19:53:28 2020 New Revision: 533979 URL: https://svnweb.freebsd.org/changeset/ports/533979 Log: - replace deprecated XKeycodeToKeysym Added: head/x11-wm/afterstep/files/patch-Wharf.c (contents, props changed) head/x11-wm/afterstep/files/patch-afterstep.c (contents, props changed) head/x11-wm/afterstep/files/patch-configure.c (contents, props changed) head/x11-wm/afterstep/files/patch-events.c (contents, props changed) Added: head/x11-wm/afterstep/files/patch-Wharf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep/files/patch-Wharf.c Mon May 4 19:53:28 2020 (r533979) @@ -0,0 +1,29 @@ +--- modules/Wharf/Wharf.c.orig 1997-03-19 01:28:51 UTC ++++ modules/Wharf/Wharf.c +@@ -191,7 +191,7 @@ void FindLockMods(void); + * + *********************************************************************** + */ +-void main(int argc, char **argv) ++int main(int argc, char **argv) + { + char *display_name = NULL; + int i,j; +@@ -2267,7 +2267,7 @@ void FindLockMods(void) + for (i = 0; i < mm->max_keypermod; i++) + { + if ((kc = *kp++) && +- ((ks = XKeycodeToKeysym(dpy, kc, 0)) != NoSymbol)) ++ ((ks = XkbKeycodeToKeysym(dpy, kc, 0, 0)) != NoSymbol)) + { + kn = XKeysymToString(ks); + knl = strlen(kn); +@@ -2433,7 +2433,7 @@ void ConstrainSize (XSizeHints *hints, int *widthp, in + + *widthp = dwidth; + *heightp = dheight; +- return; ++ return 0; + } + + Added: head/x11-wm/afterstep/files/patch-afterstep.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep/files/patch-afterstep.c Mon May 4 19:53:28 2020 (r533979) @@ -0,0 +1,29 @@ +--- afterstep/afterstep.c.orig 1997-05-04 15:19:57 UTC ++++ afterstep/afterstep.c +@@ -147,7 +147,7 @@ char *display_name = NULL; + * + *********************************************************************** + */ +-void main(int argc, char **argv) ++int main(int argc, char **argv) + { + unsigned long valuemask; /* mask for create windows */ + XSetWindowAttributes attributes; /* attributes for create windows */ +@@ -463,7 +463,7 @@ void main(int argc, char **argv) + + XDefineCursor(dpy, Scr.Root, Scr.ASCursors[DEFAULT]); + HandleEvents(); +- return; ++ return 0; + } + + /*********************************************************************** +@@ -787,7 +787,7 @@ void InitModifiers(void) + for (i = 0; i < mm->max_keypermod; i++) + { + if ((kc = *kp++) && +- ((ks = XKeycodeToKeysym(dpy, kc, 0)) != NoSymbol)) ++ ((ks = XkbKeycodeToKeysym(dpy, kc, 0, 0)) != NoSymbol)) + { + kn = XKeysymToString(ks); + knl = strlen(kn); Added: head/x11-wm/afterstep/files/patch-configure.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep/files/patch-configure.c Mon May 4 19:53:28 2020 (r533979) @@ -0,0 +1,11 @@ +--- afterstep/configure.c.orig 1997-03-09 00:43:54 UTC ++++ afterstep/configure.c +@@ -2090,7 +2090,7 @@ void AddFuncKey (char *name, int cont, int mods, int f + + XDisplayKeycodes(dpy, &min, &max); + for (i=min; i<=max; i++) +- if (XKeycodeToKeysym(dpy, i, 0) == keysym) ++ if (XkbKeycodeToKeysym(dpy, i, 0, 0) == keysym) + { + tmp = (FuncKey *) safemalloc(sizeof(FuncKey)); + tmp->next = Scr.FuncKeyRoot.next; Added: head/x11-wm/afterstep/files/patch-events.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/afterstep/files/patch-events.c Mon May 4 19:53:28 2020 (r533979) @@ -0,0 +1,20 @@ +--- afterstep/events.c.orig 1997-04-26 12:21:36 UTC ++++ afterstep/events.c +@@ -319,7 +319,7 @@ void HandleKeyPress() + * same keysym and different keycodes. This converts all + * the cases to one keycode. */ + Event.xkey.keycode = +- XKeysymToKeycode(dpy,XKeycodeToKeysym(dpy,Event.xkey.keycode,0)); ++ XKeysymToKeycode(dpy,XkbKeycodeToKeysym(dpy,Event.xkey.keycode,0,0)); + if ((key->keycode == Event.xkey.keycode) && + ((key->mods == (modifier&(~LockMask)))|| + (key->mods == AnyModifier)) && +@@ -558,7 +558,7 @@ void HandleExpose() + ReallyRedrawPager(); + } + #endif +- if ((Event.xany.window == Tmp_win->title_w)) ++ if (Event.xany.window == Tmp_win->title_w) + { + SetTitleBar(Tmp_win,(Scr.Hilite == Tmp_win),False); + }