From owner-svn-ports-head@freebsd.org Wed Jan 27 02:43:03 2021 Return-Path: Delivered-To: svn-ports-head@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 03F484EA6EE; Wed, 27 Jan 2021 02:43:03 +0000 (UTC) (envelope-from jhale@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQSZZ6hG3z4qt6; Wed, 27 Jan 2021 02:43:02 +0000 (UTC) (envelope-from jhale@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 D85C6152D2; Wed, 27 Jan 2021 02:43:02 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10R2h2Ua000128; Wed, 27 Jan 2021 02:43:02 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10R2h2GA000127; Wed, 27 Jan 2021 02:43:02 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <202101270243.10R2h2GA000127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Wed, 27 Jan 2021 02:43:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563024 - head/x11-toolkits/fox17/files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: head/x11-toolkits/fox17/files X-SVN-Commit-Revision: 563024 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2021 02:43:03 -0000 Author: jhale Date: Wed Jan 27 02:43:02 2021 New Revision: 563024 URL: https://svnweb.freebsd.org/changeset/ports/563024 Log: x11-toolkits/fox17: Fix build on FreeBSD 12.2. pthread_getname_np() was MFC'd in r362264 and I didn't take into account in the original patch. FXThread.cpp:970:8: error: no matching function for call to 'pthread_getname_np' if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){ ^~~~~~~~~~~~~~~~~~ /usr/include/pthread.h:305:6: note: candidate function not viable: no known conversion from 'const volatile FX::FXThreadID' (aka 'const volatile unsigned long') to 'pthread_t' (aka 'pthread *') for 1st argument int pthread_getname_np(pthread_t, char *, size_t); Reported by: pkg-fallout Modified: head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp Modified: head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp ============================================================================== --- head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp Wed Jan 27 02:05:30 2021 (r563023) +++ head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp Wed Jan 27 02:43:02 2021 (r563024) @@ -35,7 +35,7 @@ int pthread_getname_np(pthread_t, char *, if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){ + return desc; + } -+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 1300098) ++#elif defined(__FreeBSD__) && ((__FreeBSD_version >= 1201518 && __FreeBSD_version < 1300000) || (__FreeBSD_version >= 1300098)) + FXchar desc[256]; + if(pthread_getname_np((pthread_t)tid,desc,ARRAYNUMBER(desc))==0){ return desc;