Date: Thu, 22 Feb 2024 21:27:22 +0000 From: jbo@insane.engineer To: Po-Chuan Hsieh <sunpoet@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 450aafcba559 - main - textproc/tinyxml2: Update to 10.0.0 Message-ID: <JYI0ZuMmj_UA5y1exhZLr-GyJbrSAynz2w8xGeMXWxC8-QyhP4fwMmyZP7zSvw6Gw1U9ey-6KI7FPrHVgYq9tX7n5cAHYF077JW7O2Bbq6U=@insane.engineer> In-Reply-To: <202402211520.41LFK8mS022399@gitrepo.freebsd.org> References: <202402211520.41LFK8mS022399@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wednesday, February 21st, 2024 at 16:20, Po-Chuan Hsieh <sunpoet@FreeBSD= .org> wrote:=20 > The branch main has been updated by sunpoet: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D450aafcba559f95c94c5f195= d83b5fe4fdc3748a >=20 > commit 450aafcba559f95c94c5f195d83b5fe4fdc3748a > Author: Po-Chuan Hsieh sunpoet@FreeBSD.org >=20 > AuthorDate: 2024-02-21 14:29:27 +0000 > Commit: Po-Chuan Hsieh sunpoet@FreeBSD.org >=20 > CommitDate: 2024-02-21 15:06:47 +0000 >=20 > textproc/tinyxml2: Update to 10.0.0 >=20 > - Convert to meson > - Fix 0c022f0fc854184d95ff3303049a063a39b1f551 > - Bump PORTREVISION for package change > - Bump PORTREVISION of dependent ports for shlib change > - Remove duplicate PORTREVISION from math/linbox >=20 > Changes: https://github.com/leethomason/tinyxml2/releases > https://github.com/leethomason/tinyxml2/commits/master > --- > devel/ignition-common/Makefile | 2 +- > games/aquaria/Makefile | 2 +- > games/irrlamb/Makefile | 2 +- > games/stuntrally/Makefile | 2 +- > games/trigger-rally/Makefile | 2 +- > math/linbox/Makefile | 3 +-- > misc/dartsim/Makefile | 2 +- > misc/sdformat/Makefile | 2 +- > net/ecal/Makefile | 4 ++-- > net/ecal/files/patch-CMakeLists.txt | 13 +++++++++-- > .../patch-app_rec_rec__server__core_CMakeLists.txt | 18 +++++++++++++++ > .../files/patch-app_sys_sys__core_CMakeLists.txt | 18 +++++++++++++++ > sysutils/fusefs-encfs/Makefile | 2 +- > textproc/tinyxml2/Makefile | 26 +++++++++++++--------- > textproc/tinyxml2/pkg-plist | 7 ++---- > 15 files changed, 76 insertions(+), 29 deletions(-) >=20 > diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makef= ile > index c72ad19d551d..037d37d1be2f 100644 > --- a/devel/ignition-common/Makefile > +++ b/devel/ignition-common/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D ignition-common > DISTVERSION=3D 3.0.0 > -PORTREVISION=3D 7 > +PORTREVISION=3D 8 > CATEGORIES=3D devel > MASTER_SITES=3D https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${B= B_COMMIT}.tar.gz?dummy=3D/ >=20 > diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile > index 0190b93653c5..1c88efd31d6a 100644 > --- a/games/aquaria/Makefile > +++ b/games/aquaria/Makefile > @@ -2,7 +2,7 @@ PORTNAME=3D aquaria > DISTVERSIONPREFIX=3D OSE-v > DISTVERSION=3D 1.002-22 > DISTVERSIONSUFFIX=3D -g84366ad > -PORTREVISION=3D 9 > +PORTREVISION=3D 10 > CATEGORIES=3D games >=20 > PATCH_SITES=3D https://github.com/AquariaOSE/Aquaria/commit/ > diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile > index f7af030fc0fc..b73849fa824f 100644 > --- a/games/irrlamb/Makefile > +++ b/games/irrlamb/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D irrlamb > PORTVERSION=3D 1.0.3 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > DISTVERSIONPREFIX=3D v > CATEGORIES=3D games >=20 > diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile > index be93e34acbc1..16a17e50fd3a 100644 > --- a/games/stuntrally/Makefile > +++ b/games/stuntrally/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D stuntrally > PORTVERSION=3D 2.7 > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D games >=20 > MAINTAINER=3D amdmi3@FreeBSD.org > diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile > index ff6d08904240..d398cfe85fe9 100644 > --- a/games/trigger-rally/Makefile > +++ b/games/trigger-rally/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D trigger-rally > PORTVERSION=3D 0.6.6.1 > -PORTREVISION=3D 4 > +PORTREVISION=3D 5 > CATEGORIES=3D games > MASTER_SITES=3D SF/trigger-rally/trigger-${PORTVERSION} >=20 > diff --git a/math/linbox/Makefile b/math/linbox/Makefile > index e1c1f52f8fd2..feb5573bb39e 100644 > --- a/math/linbox/Makefile > +++ b/math/linbox/Makefile > @@ -1,8 +1,7 @@ > PORTNAME=3D linbox > PORTVERSION=3D 1.7.0 > -PORTREVISION=3D 1 > DISTVERSIONPREFIX=3D v > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D math >=20 > MAINTAINER=3D thierry@FreeBSD.org > diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile > index cb519fbc0c7e..99e20177cc9d 100644 > --- a/misc/dartsim/Makefile > +++ b/misc/dartsim/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D dartsim > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 6.13.0 > -PORTREVISION=3D 4 > +PORTREVISION=3D 5 > CATEGORIES=3D misc >=20 > MAINTAINER=3D yuri@FreeBSD.org > diff --git a/misc/sdformat/Makefile b/misc/sdformat/Makefile > index 055c562630b8..3452825ca889 100644 > --- a/misc/sdformat/Makefile > +++ b/misc/sdformat/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D sdformat > DISTVERSION=3D 8.0.0 > -PORTREVISION=3D 4 > +PORTREVISION=3D 5 > CATEGORIES=3D misc > MASTER_SITES=3D https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${B= B_COMMIT}.tar.gz?dummy=3D/ >=20 > diff --git a/net/ecal/Makefile b/net/ecal/Makefile > index 7fc5223617ab..b984fdfc6696 100644 > --- a/net/ecal/Makefile > +++ b/net/ecal/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D ecal > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 5.12.1 > -PORTREVISION=3D 3 > +PORTREVISION=3D 4 > CATEGORIES=3D net devel >=20 > MAINTAINER=3D yuri@FreeBSD.org > @@ -53,7 +53,7 @@ CMAKE_ARGS=3D -DGIT_REVISION_MAJOR=3D${DISTVERSION:R:R}= \ > -Dqwt_LIBRARY=3D${LOCALBASE}/lib/qt5/libqwt6.so >=20 > CXXFLAGS+=3D -pthread # see https://github.com/eclipse-ecal/ecal/issues/9= 33 > -LDFLAGS+=3D -labsl_hash -labsl_log_internal_message -labsl_log_internal_= nullguard -labsl_spinlock_wait > +LDFLAGS+=3D -labsl_hash -labsl_log_internal_message -labsl_log_internal_= nullguard -labsl_spinlock_wait -ltinyxml2 > USE_CXXSTD=3D c++17 >=20 > PLIST_SUB=3D VERSION=3D${DISTVERSION} > diff --git a/net/ecal/files/patch-CMakeLists.txt b/net/ecal/files/patch-C= MakeLists.txt > index 2f925210f236..86a38629e154 100644 > --- a/net/ecal/files/patch-CMakeLists.txt > +++ b/net/ecal/files/patch-CMakeLists.txt > @@ -1,6 +1,15 @@ > ---- CMakeLists.txt.orig 2022-12-23 09:10:20 UTC > +--- CMakeLists.txt.orig 2023-10-27 08:38:06 UTC > +++ CMakeLists.txt > -@@ -231,7 +231,7 @@ endif() > +@@ -182,7 +182,7 @@ endif() > + set(possible_subprojects > + Protobuf > + spdlog > +- tinyxml2 > ++ #tinyxml2 > + fineftp > + termcolor > + recycle > +@@ -234,7 +234,7 @@ endif() >=20 > find_package(CMakeFunctions REQUIRED) >=20 > diff --git a/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.tx= t b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt > new file mode 100644 > index 000000000000..25e820f74e07 > --- /dev/null > +++ b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt > @@ -0,0 +1,18 @@ > +--- app/rec/rec_server_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC > ++++ app/rec/rec_server_core/CMakeLists.txt > +@@ -20,7 +20,6 @@ find_package(Threads REQUIRED) > + find_package(Protobuf REQUIRED) > + find_package(spdlog REQUIRED) > + find_package(fineftp REQUIRED) > +-find_package(tinyxml2 REQUIRED) > + > + set(PROJECT_NAME rec_server_core) > + > +@@ -66,7 +65,6 @@ create_targets_protobuf() > + > + target_link_libraries(${PROJECT_NAME} > + PRIVATE > +- tinyxml2::tinyxml2 > + protobuf::libprotobuf > + eCAL::core > + eCAL::app_pb > diff --git a/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt b/net/= ecal/files/patch-app_sys_sys__core_CMakeLists.txt > new file mode 100644 > index 000000000000..67c058691f49 > --- /dev/null > +++ b/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt > @@ -0,0 +1,18 @@ > +--- app/sys/sys_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC > ++++ app/sys/sys_core/CMakeLists.txt > +@@ -21,7 +21,6 @@ project(sys_core) > + find_package(Threads REQUIRED) > + find_package(Protobuf REQUIRED) > + find_package(spdlog REQUIRED) > +-find_package(tinyxml2 REQUIRED) > + > + set(ecalsyscore_src > + include/ecalsys/ecal_sys.h > +@@ -88,7 +87,6 @@ create_targets_protobuf() > + > + target_link_libraries(${PROJECT_NAME} > + Threads::Threads > +- tinyxml2::tinyxml2 > + spdlog::spdlog > + protobuf::libprotobuf > + eCAL::core > diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makef= ile > index 533886cd24a9..4734f5ee05ea 100644 > --- a/sysutils/fusefs-encfs/Makefile > +++ b/sysutils/fusefs-encfs/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D encfs > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 1.9.5 > -PORTREVISION=3D 6 > +PORTREVISION=3D 7 > CATEGORIES=3D sysutils > PKGNAMEPREFIX=3D fusefs- >=20 > diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile > index c465308fda25..1dc724e82cf4 100644 > --- a/textproc/tinyxml2/Makefile > +++ b/textproc/tinyxml2/Makefile > @@ -1,27 +1,30 @@ > PORTNAME=3D tinyxml2 > -DISTVERSION=3D 10.0.0 > +PORTVERSION=3D 10.0.0 > +PORTREVISION=3D 1 > PORTEPOCH=3D 1 > CATEGORIES=3D textproc >=20 > MAINTAINER=3D sunpoet@FreeBSD.org > COMMENT=3D Small C++ XML Parser > -WWW=3D https://github.com/leethomason/tinyxml2 > +WWW=3D https://leethomason.github.io/tinyxml2/ \ > + https://github.com/leethomason/tinyxml2 >=20 > LICENSE=3D ZLIB > LICENSE_FILE=3D ${WRKSRC}/LICENSE.txt >=20 > -USES=3D cmake:testing compiler:c++11-lang cpe dos2unix pathfix > -CPE_VENDOR=3D tinyxml2_project > +USES=3D compiler:c++11-lang cpe dos2unix meson pathfix > + > +MESON_ARGS=3D --default-library=3Dboth \ > + -Ddebug=3Dfalse \ > + -Dtests=3Dtrue > USE_LDCONFIG=3D yes >=20 > -USE_GITHUB=3D yes > -GH_ACCOUNT=3D leethomason > +PLIST_SUB=3D PORTVERSION=3D${PORTVERSION} >=20 > -CMAKE_TESTING_ON=3D tinyxml2_BUILD_TESTING > -PLIST_SUB=3D DISTVERSION=3D${DISTVERSION} > +GH_ACCOUNT=3D leethomason > +USE_GITHUB=3D yes >=20 > -CMAKE_OFF=3D tinyxml2_BUILD_TESTING > -CMAKE_ON=3D BUILD_SHARED_LIBS > +CPE_VENDOR=3D tinyxml2_project >=20 > OPTIONS_DEFINE=3D EXAMPLES >=20 > @@ -29,4 +32,7 @@ post-install-EXAMPLES-on: > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ > cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/ >=20 > +do-test: > + cd ${WRKSRC}/ && _build/xmltest > + > .include <bsd.port.mk> >=20 > diff --git a/textproc/tinyxml2/pkg-plist b/textproc/tinyxml2/pkg-plist > index c12561808480..d18bc5bb434e 100644 > --- a/textproc/tinyxml2/pkg-plist > +++ b/textproc/tinyxml2/pkg-plist > @@ -1,11 +1,8 @@ > include/tinyxml2.h > -lib/cmake/tinyxml2/tinyxml2-config-version.cmake > -lib/cmake/tinyxml2/tinyxml2-config.cmake > -lib/cmake/tinyxml2/tinyxml2-shared-targets-%%CMAKE_BUILD_TYPE%%.cmake > -lib/cmake/tinyxml2/tinyxml2-shared-targets.cmake > +lib/libtinyxml2.a > lib/libtinyxml2.so > lib/libtinyxml2.so.10 > -lib/libtinyxml2.so.%%DISTVERSION%% > +lib/libtinyxml2.so.%%PORTVERSION%% > libdata/pkgconfig/tinyxml2.pc > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/dream.xml > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/empty.xml Hi, This commit is in my opinion problematic. The change in build system is causing consumers to no longer being able to = use CMake's find_package() and=20 the workaround that was put into place for some consumers is hacky at best = and unacceptable at worst. find_package() is doing a lot more under the hood than just setting an LDFL= AG. At least one consumer is still broken now (devel/gpds). See PR #277227 Also, the commit message suggests that there was an update to 10.0.0 but th= e port was already at 10.0.0. Best regards, ~ jbo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?JYI0ZuMmj_UA5y1exhZLr-GyJbrSAynz2w8xGeMXWxC8-QyhP4fwMmyZP7zSvw6Gw1U9ey-6KI7FPrHVgYq9tX7n5cAHYF077JW7O2Bbq6U=>