Re: UPDATE: fmt 10.2.1
On 2024-04-05 4:43 a.m., Stuart Henderson wrote: On 2024/04/05 03:05, Brad Smith wrote: On 2024-04-05 2:59 a.m., Stuart Henderson wrote: On 2024/04/04 17:52, Brad Smith wrote: On 2024-04-04 5:49 p.m., Stuart Henderson wrote: On 2024/04/04 17:19, Brad Smith wrote: Here is an update to fmt 10.2.1. I tried 10.2.1 a few weeks ago (and an older one a month or two ago), I think kn did as well. Various breakage in dependent ports. Which ones? I fixed MariaDB and OpenImageIO was an issue, part of why I updated it. At least one of the emulators and I *think* 0ad. I stopped building after I saw problems in a few and not finding patches elsewhere for them. Not updating will start to become an issue as well. I know - I was trying to update it to attempt a port of simplomon which needs a newer version. I rolled the Dolphin port update right up to the commit where it switches to 10.1 and I have seen other projects going in the direction of wanting newer versions. Ok, well it's not a rush, but I'd like to get it through a bulk to get a proper view of the landscape to work on things. It's not that many ports, I normally do a build using SUBDIRLIST for things like that. I find bulk builds are only usually worth the hassle and time for more widespread changes. $ grep devel/fmt /usr/local/share/ports-INDEX | cut -d'|' -f2 | sed s/,-.*// | sort -u | grep -v devel/fmt | tee /tmp/plist.fmt audio/mpd audio/sdl2-audiolib databases/mariadb emulators/citra emulators/dolphin games/0ad/base games/devilutionx geo/osm2pgsql graphics/openimageio inputmethods/fcitx inputmethods/fcitx-chinese-addons inputmethods/fcitx-m17n inputmethods/fcitx-qt mail/grommunio/gromox multimedia/mkvtoolnix net/litecoin,no_x11 net/tdesktop textproc/goldendict-ng $ SUBDIRLIST=/tmp/plist.fmt make prepare FETCH_PACKAGES=; \ SUBDIRLIST=/tmp/plist.fmt make package REPORT_PROBLEM_LOGFILE=/tmp/fmt.problems Ok, well I sent you a diff to fix 0ad. The Dolphin update needs to go in, then I can do a small commit bump for fmt when that goes in.
Re: UPDATE: fmt 10.2.1
On Thu, Apr 04, 2024 at 05:19:28PM -0400, Brad Smith wrote: > Here is an update to fmt 10.2.1. > > > https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.md Here is the fmt diff for 10.2.1 again as well as deps adjustments. Index: devel/fmt/Makefile === RCS file: /cvs/ports/devel/fmt/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- devel/fmt/Makefile 7 Jun 2022 11:40:17 - 1.5 +++ devel/fmt/Makefile 17 Apr 2024 00:51:37 - @@ -2,9 +2,9 @@ COMMENT=alternative formatting library GH_ACCOUNT=fmtlib GH_PROJECT=fmt -GH_TAGNAME=8.1.1 +GH_TAGNAME=10.2.1 -SHARED_LIBS= fmt 1.1 +SHARED_LIBS= fmt 2.0 CATEGORIES=devel @@ -13,17 +13,11 @@ PERMIT_PACKAGE= Yes # C++11 COMPILER= base-clang ports-gcc + MODULES= devel/cmake -WANTLIB+= ${COMPILER_LIBCXX} +WANTLIB+= ${COMPILER_LIBCXX} m CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=on - -# Fix undefined references to pthread_* symbols on clang+ld.bfd archs by -# disabling -Wl,--as-needed. -.include -.if !${PROPERTIES:Mlld} && ${PROPERTIES:Mclang} -CONFIGURE_ARGS+= -DAS_NEEDED=off -.endif .include Index: devel/fmt/distinfo === RCS file: /cvs/ports/devel/fmt/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- devel/fmt/distinfo 7 Jun 2022 11:40:17 - 1.3 +++ devel/fmt/distinfo 17 Apr 2024 00:51:37 - @@ -1,2 +1,2 @@ -SHA256 (fmt-8.1.1.tar.gz) = PXlNPPZ2M7NLJ3Hrnwc73ofoRuDTldJU33shHvHsc0Y= -SIZE (fmt-8.1.1.tar.gz) = 826254 +SHA256 (fmt-10.2.1.tar.gz) = ElDkzFi/Bu5jFWdSP0iEjcRZYTPhY/AmFcl/eLq2yBE= +SIZE (fmt-10.2.1.tar.gz) = 854665 Index: devel/fmt/patches/patch-CMakeLists_txt === RCS file: devel/fmt/patches/patch-CMakeLists_txt diff -N devel/fmt/patches/patch-CMakeLists_txt --- devel/fmt/patches/patch-CMakeLists_txt 7 Jun 2022 11:40:17 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,24 +0,0 @@ -Allow linking without '-Wl,--as-needed', fix the build on clang+ld.bfd archs. -It's needed to do it like this since target_link_libraries takes preference -over LDFLAGS. - -Index: CMakeLists.txt CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -72,6 +72,7 @@ set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CA - option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF) - option(FMT_WERROR "Halt the compilation with an error on compiler warnings." -OFF) -+option(AS_NEEDED "Use -Wl,--as-needed for linking." ON) - - # Options that control generation of various targets. - option(FMT_DOC "Generate the doc target." ${FMT_MASTER_PROJECT}) -@@ -286,7 +287,7 @@ endif () - - if (BUILD_SHARED_LIBS) - if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND -- NOT EMSCRIPTEN) -+ NOT EMSCRIPTEN AND AS_NEEDED) - # Fix rpmlint warning: - # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0 /lib/libm.so.6. - target_link_libraries(fmt -Wl,--as-needed) Index: devel/fmt/patches/patch-src_os_cc === RCS file: devel/fmt/patches/patch-src_os_cc diff -N devel/fmt/patches/patch-src_os_cc --- /dev/null 1 Jan 1970 00:00:00 - +++ devel/fmt/patches/patch-src_os_cc 17 Apr 2024 00:51:37 - @@ -0,0 +1,24 @@ +Fix handling of the fileno macro +38881e5acfbac830bdf68ad1c101ae420ac5bc92 + +Index: src/os.cc +--- src/os.cc.orig src/os.cc +@@ -182,12 +182,12 @@ void buffered_file::close() { + } + + int buffered_file::descriptor() const { +-#if !defined(fileno) ++#ifdef FMT_HAS_SYSTEM ++ // fileno is a macro on OpenBSD. ++# ifdef fileno ++#undef fileno ++# endif + int fd = FMT_POSIX_CALL(fileno(file_)); +-#elif defined(FMT_HAS_SYSTEM) +- // fileno is a macro on OpenBSD so we cannot use FMT_POSIX_CALL. +-# define FMT_DISABLE_MACRO +- int fd = FMT_SYSTEM(fileno FMT_DISABLE_MACRO(file_)); + #else + int fd = fileno(file_); + #endif Index: devel/fmt/patches/patch-test_gtest-extra-test_cc === RCS file: /cvs/ports/devel/fmt/patches/patch-test_gtest-extra-test_cc,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-test_gtest-extra-test_cc --- devel/fmt/patches/patch-test_gtest-extra-test_cc11 Mar 2022 18:50:03 - 1.3 +++ devel/fmt/patches/patch-test_gtest-extra-test_cc17 Apr 2024 00:51:37 - @@ -1,7 +1,7 @@ Index: test/gtest-extra-test.cc --- test/gtest-extra-test.cc.orig +++ test/gtest-extra-test.cc -@@ -345,6 +345,10 @@ TEST(output_redirect_test, flush_error_in_ctor) { +@@ -347,6 +347,10 @@ TEST(output_redirect_test, flush_error_in_ctor) { write_copy.dup2(write_fd); // "undo" close or dtor will fail
Re: UPDATE: fmt 10.2.1
On Tue, Apr 16, 2024 at 09:34:25PM -0400, Brad Smith wrote: > On Thu, Apr 04, 2024 at 05:19:28PM -0400, Brad Smith wrote: > > Here is an update to fmt 10.2.1. > > > > > > https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.md > > Here is the fmt diff for 10.2.1 again as well as deps adjustments. And with fmt updated the system copy can be used by rspamd. Index: Makefile === RCS file: /cvs/ports/mail/rspamd/Makefile,v retrieving revision 1.127 diff -u -p -u -p -r1.127 Makefile --- Makefile28 Feb 2024 15:24:20 - 1.127 +++ Makefile17 Apr 2024 02:01:21 - @@ -1,7 +1,7 @@ COMMENT= event-driven spam filtering system in C/Lua DIST_TUPLE=github vstakhov rspamd 3.8.4 . - +REVISION= 0 CATEGORIES=mail HOMEPAGE= https://rspamd.com/ @@ -47,7 +47,8 @@ LIB_DEPENDS= archivers/zstd \ textproc/icu4c RUN_DEPENDS= databases/redis -BUILD_DEPENDS+=devel/ragel +BUILD_DEPENDS+=devel/fmt>=10.2.1 \ + devel/ragel # /var/rspamd needs to exist for tests to run TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH} TEST_DEPENDS+= databases/redis \ @@ -63,9 +64,8 @@ CONFIGURE_ARGS+= -DOPENBSD_BUILD=1 \ -DRUNDIR="${LOCALSTATEDIR}/run/rspamd" \ -DRSPAMD_USER="_rspamd" -# not using SYSTEM_FMT; bundled version is newer, but updating -# devel/fmt breaks mariadb build -CONFIGURE_ARGS+= -DSYSTEM_XXHASH=ON \ +CONFIGURE_ARGS+= -DSYSTEM_FMT=ON \ + -DSYSTEM_XXHASH=ON \ -DSYSTEM_ZSTD=ON \ -DENABLE_JEMALLOC=OFF
Re: UPDATE: fmt 10.2.1
On 2024/04/04 17:19, Brad Smith wrote: > Here is an update to fmt 10.2.1. I tried 10.2.1 a few weeks ago (and an older one a month or two ago), I think kn did as well. Various breakage in dependent ports. > > https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.md > > > Index: Makefile > === > RCS file: /cvs/ports/devel/fmt/Makefile,v > retrieving revision 1.5 > diff -u -p -u -p -r1.5 Makefile > --- Makefile 7 Jun 2022 11:40:17 - 1.5 > +++ Makefile 20 Mar 2024 00:29:29 - > @@ -2,9 +2,9 @@ COMMENT= alternative formatting library > > GH_ACCOUNT= fmtlib > GH_PROJECT= fmt > -GH_TAGNAME= 8.1.1 > +GH_TAGNAME= 10.2.1 > > -SHARED_LIBS= fmt 1.1 > +SHARED_LIBS= fmt 2.0 > > CATEGORIES= devel > > @@ -13,17 +13,11 @@ PERMIT_PACKAGE= Yes > > # C++11 > COMPILER=base-clang ports-gcc > + > MODULES= devel/cmake > -WANTLIB+=${COMPILER_LIBCXX} > > +WANTLIB+=${COMPILER_LIBCXX} m > > CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=on > - > -# Fix undefined references to pthread_* symbols on clang+ld.bfd archs by > -# disabling -Wl,--as-needed. > -.include > -.if !${PROPERTIES:Mlld} && ${PROPERTIES:Mclang} > -CONFIGURE_ARGS+= -DAS_NEEDED=off > -.endif > > .include > Index: distinfo > === > RCS file: /cvs/ports/devel/fmt/distinfo,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 distinfo > --- distinfo 7 Jun 2022 11:40:17 - 1.3 > +++ distinfo 20 Mar 2024 00:29:29 - > @@ -1,2 +1,2 @@ > -SHA256 (fmt-8.1.1.tar.gz) = PXlNPPZ2M7NLJ3Hrnwc73ofoRuDTldJU33shHvHsc0Y= > -SIZE (fmt-8.1.1.tar.gz) = 826254 > +SHA256 (fmt-10.2.1.tar.gz) = ElDkzFi/Bu5jFWdSP0iEjcRZYTPhY/AmFcl/eLq2yBE= > +SIZE (fmt-10.2.1.tar.gz) = 854665 > Index: patches/patch-CMakeLists_txt > === > RCS file: patches/patch-CMakeLists_txt > diff -N patches/patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 7 Jun 2022 11:40:17 - 1.4 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,24 +0,0 @@ > -Allow linking without '-Wl,--as-needed', fix the build on clang+ld.bfd archs. > -It's needed to do it like this since target_link_libraries takes preference > -over LDFLAGS. > - > -Index: CMakeLists.txt > CMakeLists.txt.orig > -+++ CMakeLists.txt > -@@ -72,6 +72,7 @@ set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CA > - option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF) > - option(FMT_WERROR "Halt the compilation with an error on compiler warnings." > -OFF) > -+option(AS_NEEDED "Use -Wl,--as-needed for linking." ON) > - > - # Options that control generation of various targets. > - option(FMT_DOC "Generate the doc target." ${FMT_MASTER_PROJECT}) > -@@ -286,7 +287,7 @@ endif () > - > - if (BUILD_SHARED_LIBS) > - if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND > -- NOT EMSCRIPTEN) > -+ NOT EMSCRIPTEN AND AS_NEEDED) > - # Fix rpmlint warning: > - # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0 > /lib/libm.so.6. > - target_link_libraries(fmt -Wl,--as-needed) > Index: patches/patch-src_os_cc > === > RCS file: patches/patch-src_os_cc > diff -N patches/patch-src_os_cc > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-src_os_cc 20 Mar 2024 00:29:29 - > @@ -0,0 +1,24 @@ > +Fix handling of the fileno macro > +38881e5acfbac830bdf68ad1c101ae420ac5bc92 > + > +Index: src/os.cc > +--- src/os.cc.orig > src/os.cc > +@@ -182,12 +182,12 @@ void buffered_file::close() { > + } > + > + int buffered_file::descriptor() const { > +-#if !defined(fileno) > ++#ifdef FMT_HAS_SYSTEM > ++ // fileno is a macro on OpenBSD. > ++# ifdef fileno > ++#undef fileno > ++# endif > + int fd = FMT_POSIX_CALL(fileno(file_)); > +-#elif defined(FMT_HAS_SYSTEM) > +- // fileno is a macro on OpenBSD so we cannot use FMT_POSIX_CALL. > +-# define FMT_DISABLE_MACRO > +- int fd = FMT_SYSTEM(fileno FMT_DISABLE_MACRO(file_)); > + #else > + int fd = fileno(file_); > + #endif > Index: patches/patch-test_gtest-extra-test_cc > === > RCS file: /cvs/ports/devel/fmt/patches/patch-test_gtest-extra-test_cc,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 patch-test_gtest-extra-test_cc > --- patches/patch-test_gtest-extra-test_cc11 Mar 2022 18:50:03 - > 1.3 > +++ patches/patch-test_gtest-extra-test_cc20 Mar 2024 00:29:29 - > @@ -1,7 +1,7 @@ > Index: test/gtest-extra-test.cc > --- test/gtest-extra-test.cc.orig > +++ test/gtest-extra-test.cc > -@@ -345,6 +345,10 @@ TEST(output_redirect_test, flush_error_in_ctor) { > +@@ -347,6 +347,10 @@ TEST(output_redirect_
Re: UPDATE: fmt 10.2.1
On 2024-04-04 5:49 p.m., Stuart Henderson wrote: On 2024/04/04 17:19, Brad Smith wrote: Here is an update to fmt 10.2.1. I tried 10.2.1 a few weeks ago (and an older one a month or two ago), I think kn did as well. Various breakage in dependent ports. Which ones? I fixed MariaDB and OpenImageIO was an issue, part of why I updated it. Not updating will start to become an issue as well.
Re: UPDATE: fmt 10.2.1
On 2024/04/04 17:52, Brad Smith wrote: > On 2024-04-04 5:49 p.m., Stuart Henderson wrote: > > On 2024/04/04 17:19, Brad Smith wrote: > > Here is an update to fmt 10.2.1. > > I tried 10.2.1 a few weeks ago (and an older one a month or two ago), > I think kn did as well. Various breakage in dependent ports. > > Which ones? I fixed MariaDB and OpenImageIO was an issue, part of why I > updated it. At least one of the emulators and I *think* 0ad. I stopped building after I saw problems in a few and not finding patches elsewhere for them. > Not updating will start to become an issue as well. I know - I was trying to update it to attempt a port of simplomon which needs a newer version.
Re: UPDATE: fmt 10.2.1
On 2024-04-05 2:59 a.m., Stuart Henderson wrote: On 2024/04/04 17:52, Brad Smith wrote: On 2024-04-04 5:49 p.m., Stuart Henderson wrote: On 2024/04/04 17:19, Brad Smith wrote: Here is an update to fmt 10.2.1. I tried 10.2.1 a few weeks ago (and an older one a month or two ago), I think kn did as well. Various breakage in dependent ports. Which ones? I fixed MariaDB and OpenImageIO was an issue, part of why I updated it. At least one of the emulators and I *think* 0ad. I stopped building after I saw problems in a few and not finding patches elsewhere for them. Not updating will start to become an issue as well. I know - I was trying to update it to attempt a port of simplomon which needs a newer version. I rolled the Dolphin port update right up to the commit where it switches to 10.1 and I have seen other projects going in the direction of wanting newer versions. Ok, well it's not a rush, but I'd like to get it through a bulk to get a proper view of the landscape to work on things.
Re: UPDATE: fmt 10.2.1
On 2024/04/05 03:05, Brad Smith wrote: > On 2024-04-05 2:59 a.m., Stuart Henderson wrote: > > On 2024/04/04 17:52, Brad Smith wrote: > > On 2024-04-04 5:49 p.m., Stuart Henderson wrote: > > On 2024/04/04 17:19, Brad Smith wrote: > > Here is an update to fmt 10.2.1. > > I tried 10.2.1 a few weeks ago (and an older one a month or two > ago), > I think kn did as well. Various breakage in dependent ports. > > Which ones? I fixed MariaDB and OpenImageIO was an issue, part of why > I updated it. > > At least one of the emulators and I *think* 0ad. I stopped building > after I saw problems in a few and not finding patches elsewhere for > them. > > > Not updating will start to become an issue as well. > > I know - I was trying to update it to attempt a port of simplomon which > needs a newer version. > > > I rolled the Dolphin port update right up to the commit where it switches to > 10.1 > and I have seen other projects going in the direction of wanting newer > versions. > > > Ok, well it's not a rush, but I'd like to get it through a bulk to get a > proper view > of the landscape to work on things. It's not that many ports, I normally do a build using SUBDIRLIST for things like that. I find bulk builds are only usually worth the hassle and time for more widespread changes. $ grep devel/fmt /usr/local/share/ports-INDEX | cut -d'|' -f2 | sed s/,-.*// | sort -u | grep -v devel/fmt | tee /tmp/plist.fmt audio/mpd audio/sdl2-audiolib databases/mariadb emulators/citra emulators/dolphin games/0ad/base games/devilutionx geo/osm2pgsql graphics/openimageio inputmethods/fcitx inputmethods/fcitx-chinese-addons inputmethods/fcitx-m17n inputmethods/fcitx-qt mail/grommunio/gromox multimedia/mkvtoolnix net/litecoin,no_x11 net/tdesktop textproc/goldendict-ng $ SUBDIRLIST=/tmp/plist.fmt make prepare FETCH_PACKAGES=; \ SUBDIRLIST=/tmp/plist.fmt make package REPORT_PROBLEM_LOGFILE=/tmp/fmt.problems