Date: Tue, 12 Jan 2021 15:01:57 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561341 - in head/x11-toolkits/fox17: . files Message-ID: <202101121501.10CF1vBH063342@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Tue Jan 12 15:01:57 2021 New Revision: 561341 URL: https://svnweb.freebsd.org/changeset/ports/561341 Log: x11-toolkits/fox17: Update to 1.7.74 Changes: http://www.fox-toolkit.org/news.html Added: head/x11-toolkits/fox17/files/patch-lib_FXSystemTime.cpp (contents, props changed) head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp (contents, props changed) Deleted: head/x11-toolkits/fox17/files/patch-tests_math.cpp Modified: head/x11-toolkits/fox17/Makefile head/x11-toolkits/fox17/distinfo head/x11-toolkits/fox17/pkg-plist Modified: head/x11-toolkits/fox17/Makefile ============================================================================== --- head/x11-toolkits/fox17/Makefile Tue Jan 12 14:55:21 2021 (r561340) +++ head/x11-toolkits/fox17/Makefile Tue Jan 12 15:01:57 2021 (r561341) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fox -PORTVERSION= 1.7.64 -PORTREVISION= 3 +PORTVERSION= 1.7.74 CATEGORIES= x11-toolkits MASTER_SITES= http://ftp.fox-toolkit.org/pub/ \ ftp://ftp.fox-toolkit.org/pub/ Modified: head/x11-toolkits/fox17/distinfo ============================================================================== --- head/x11-toolkits/fox17/distinfo Tue Jan 12 14:55:21 2021 (r561340) +++ head/x11-toolkits/fox17/distinfo Tue Jan 12 15:01:57 2021 (r561341) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532721943 -SHA256 (fox-1.7.64.tar.gz) = 7bcbadb0978d45942e9aea54c256f19fcf39249ac1d870a922c158e1b434a5d3 -SIZE (fox-1.7.64.tar.gz) = 5361802 +TIMESTAMP = 1610207572 +SHA256 (fox-1.7.74.tar.gz) = 21f8a10116102e0b1d43b779c2cc287df8d01902b020faea8e32b151c1935093 +SIZE (fox-1.7.74.tar.gz) = 5705006 Added: head/x11-toolkits/fox17/files/patch-lib_FXSystemTime.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/fox17/files/patch-lib_FXSystemTime.cpp Tue Jan 12 15:01:57 2021 (r561341) @@ -0,0 +1,24 @@ +Emulate the behavior of the USG UXIX daylight variable implemented in glibc. +It is supposed to be 0 if the time zone does not have any daylight saving time +rules and non-zero if there is a time during the year when daylight saving +time applies. [1] + +In FreeBSD, tzname[1] should be set to " " (three spaces) if DST is never +observed. [2] + +[1] https://www.gnu.org/software/libc/manual/html_node/Time-Zone-Functions.html#Time-Zone-Functions +[2] https://svnweb.freebsd.org/base/head/contrib/tzcode/stdtime/localtime.c?revision=313774&view=markup#l84 + +--- lib/FXSystemTime.cpp.orig 2020-11-28 04:52:31 UTC ++++ lib/FXSystemTime.cpp +@@ -278,6 +278,10 @@ FXTime FXSystem::daylightSavingsOffset(){ + #if defined(_WIN32) + return minutes*tzi.DaylightBias; // Or difference between standard and daylight bias. + #else ++# if defined(__FreeBSD__) ++ tzset(); ++ int daylight = ((tzname[1][0] == ' ') ? 0 : 1); ++# endif + return -hours*daylight; + #endif + } Added: head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp Tue Jan 12 15:01:57 2021 (r561341) @@ -0,0 +1,43 @@ +FXThread.cpp:929:5: error: no matching function for call to 'pthread_set_name_np' + pthread_set_name_np(tid,desc.text()); + ^~~~~~~~~~~~~~~~~~~ +/usr/include/pthread_np.h:67:6: note: candidate function not viable: no known +conversionfrom 'volatile FX::FXThreadID' (aka 'volatile unsigned long') +to 'pthread_t' (aka 'pthread *') for 1st argument +void pthread_set_name_np(pthread_t, const char *); + ^ +FXThread.cpp:962: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); + ^ + +--- lib/FXThread.cpp.orig 2020-11-30 16:10:17 UTC ++++ lib/FXThread.cpp +@@ -925,7 +925,10 @@ FXbool FXThread::description(const FXString& desc){ + return pthread_setname_np(desc.text())==0; + #elif defined(__NetBSD__) + return pthread_setname_np(tid,"%s",desc.text())==0; +-#elif defined(__FreeBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) ++ pthread_set_name_np((pthread_t)tid,desc.text()); ++ return true; ++#elif defined(__OpenBSD__) + pthread_set_name_np(tid,desc.text()); + return true; + #elif defined(HAVE_PTHREAD_SETNAME_NP) +@@ -955,6 +958,11 @@ FXString FXThread::description() const { + #elif defined(__NetBSD__) + FXchar desc[256]; + if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){ ++ return desc; ++ } ++#elif defined(__FreeBSD__) && (__FreeBSD_version >= 1300098) ++ FXchar desc[256]; ++ if(pthread_getname_np((pthread_t)tid,desc,ARRAYNUMBER(desc))==0){ + return desc; + } + #elif defined(HAVE_PTHREAD_GETNAME_NP) Modified: head/x11-toolkits/fox17/pkg-plist ============================================================================== --- head/x11-toolkits/fox17/pkg-plist Tue Jan 12 14:55:21 2021 (r561340) +++ head/x11-toolkits/fox17/pkg-plist Tue Jan 12 15:01:57 2021 (r561341) @@ -99,13 +99,16 @@ include/fox-%%MAJORVER%%/FXDelegator.h include/fox-%%MAJORVER%%/FXDial.h include/fox-%%MAJORVER%%/FXDialogBox.h include/fox-%%MAJORVER%%/FXDictionary.h +include/fox-%%MAJORVER%%/FXDictionaryOf.h include/fox-%%MAJORVER%%/FXDir.h include/fox-%%MAJORVER%%/FXDirBox.h include/fox-%%MAJORVER%%/FXDirDialog.h include/fox-%%MAJORVER%%/FXDirList.h include/fox-%%MAJORVER%%/FXDirSelector.h include/fox-%%MAJORVER%%/FXDirVisitor.h +include/fox-%%MAJORVER%%/FXDirWatch.h include/fox-%%MAJORVER%%/FXDispatcher.h +include/fox-%%MAJORVER%%/FXDisplay.h include/fox-%%MAJORVER%%/FXDockBar.h include/fox-%%MAJORVER%%/FXDockHandler.h include/fox-%%MAJORVER%%/FXDockSite.h @@ -118,6 +121,8 @@ include/fox-%%MAJORVER%%/FXEXEIcon.h include/fox-%%MAJORVER%%/FXEXEImage.h include/fox-%%MAJORVER%%/FXElement.h include/fox-%%MAJORVER%%/FXEvent.h +include/fox-%%MAJORVER%%/FXEventDispatcher.h +include/fox-%%MAJORVER%%/FXEventLoop.h include/fox-%%MAJORVER%%/FXException.h include/fox-%%MAJORVER%%/FXExpression.h include/fox-%%MAJORVER%%/FXExtentd.h @@ -147,6 +152,7 @@ include/fox-%%MAJORVER%%/FXGauge.h include/fox-%%MAJORVER%%/FXGradientBar.h include/fox-%%MAJORVER%%/FXGroupBox.h include/fox-%%MAJORVER%%/FXHash.h +include/fox-%%MAJORVER%%/FXHashOf.h include/fox-%%MAJORVER%%/FXHeader.h include/fox-%%MAJORVER%%/FXHorizontalFrame.h include/fox-%%MAJORVER%%/FXICOIcon.h @@ -171,6 +177,7 @@ include/fox-%%MAJORVER%%/FXJPGIcon.h include/fox-%%MAJORVER%%/FXJPGImage.h include/fox-%%MAJORVER%%/FXJSON.h include/fox-%%MAJORVER%%/FXJSONFile.h +include/fox-%%MAJORVER%%/FXJSONString.h include/fox-%%MAJORVER%%/FXKOI8RCodec.h include/fox-%%MAJORVER%%/FXKnob.h include/fox-%%MAJORVER%%/FXLFQueue.h @@ -238,6 +245,7 @@ include/fox-%%MAJORVER%%/FXRandom.h include/fox-%%MAJORVER%%/FXRangeSlider.h include/fox-%%MAJORVER%%/FXRanged.h include/fox-%%MAJORVER%%/FXRangef.h +include/fox-%%MAJORVER%%/FXReactor.h include/fox-%%MAJORVER%%/FXReadWriteLock.h include/fox-%%MAJORVER%%/FXRealSlider.h include/fox-%%MAJORVER%%/FXRealSpinner.h @@ -247,6 +255,8 @@ include/fox-%%MAJORVER%%/FXRefPtr.h include/fox-%%MAJORVER%%/FXRegion.h include/fox-%%MAJORVER%%/FXRegistry.h include/fox-%%MAJORVER%%/FXReplaceDialog.h +include/fox-%%MAJORVER%%/FXReverseDictionary.h +include/fox-%%MAJORVER%%/FXReverseDictionaryOf.h include/fox-%%MAJORVER%%/FXRex.h include/fox-%%MAJORVER%%/FXRootWindow.h include/fox-%%MAJORVER%%/FXRuler.h @@ -333,6 +343,7 @@ include/fox-%%MAJORVER%%/FXXBMIcon.h include/fox-%%MAJORVER%%/FXXBMImage.h include/fox-%%MAJORVER%%/FXXML.h include/fox-%%MAJORVER%%/FXXMLFile.h +include/fox-%%MAJORVER%%/FXXMLString.h include/fox-%%MAJORVER%%/FXXPMIcon.h include/fox-%%MAJORVER%%/FXXPMImage.h include/fox-%%MAJORVER%%/FXhalf.h @@ -357,11 +368,11 @@ include/fox-%%MAJORVER%%/xincs.h lib/libCHART-%%MAJORVER%%.a lib/libCHART-%%MAJORVER%%.so lib/libCHART-%%MAJORVER%%.so.0 -lib/libCHART-%%MAJORVER%%.so.0.0.64 +lib/libCHART-%%MAJORVER%%.so.0.0.74 lib/libFOX-%%MAJORVER%%.a lib/libFOX-%%MAJORVER%%.so lib/libFOX-%%MAJORVER%%.so.0 -lib/libFOX-%%MAJORVER%%.so.0.0.64 +lib/libFOX-%%MAJORVER%%.so.0.0.74 libdata/pkgconfig/fox17.pc man/man1/ControlPanel-17.1.gz %%PORTEXAMPLES%%man/man1/PathFinder-17.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101121501.10CF1vBH063342>