On 2020-11-23 11:57, Nam Nguyen wrote:
> Tom Murphy writes:
>> Hi,
>>
>> Attached below is an update for games/freeorion. This updates the game
>> to 0.4.10.1.
>>
>> I removed GLU from WANTLIB (as it was complaining about Extra) and
>> patches/patch-cmake_make_versioncpp_py has been removed (fixed
>> upstream)
>>
>> Full changelog for the game can be found here:
>>
>> https://github.com/freeorion/freeorion/blob/v0.4.10.1/ChangeLog.md
>>
>> OK?
>>
>> Thanks,
>> Tom
>
>> Hi,
>>
>> Just pinging the list about this diff. I posted it last month.
>> Re-attaching the diff.
>>
>> OK?
>>
>> Thanks!
>> Tom
>
> Thank you for the update. Here is a fresh diff with two additional
> tweaks:
> - WANTLIB remove boost_system-mt and 80 column fix
> - remove patch-cmake_FindBoost_cmake because boost python bindings are
> now named boost_python38-mt
>
> I am looking for another OK to commit and Tom's approval.
>
> I tested runtime and it works.
>
> Details
> -------
> I went through the types of warnings and they seem harmless. The same
> warnings appear in the previous version as this update. Here are the
> gory details on why they are harmless:
>
> -Wdelete-abstract-non-virtual-dtor:
> -----------------------------------
> Fixed upstream
> https://github.com/freeorion/freeorion/commit/ff55c8ca0d534c9cb035412067a02d05211dfc11
>
> -Wrange-loop-construct:
> -----------------------
> /usr/obj/pobj/freeorion-0.4.10.1/src-tarball/GG/src/GUI.cpp:1685:21:
> warning: loop variable 'drop_wnd' of type 'const std::__1::pair<const
> std::__1::shared_ptr<GG::Wnd>, GG::Pt>' creates a copy from type 'const
> std::__1::pair<const std::__1::shared_ptr<GG::Wnd>, GG::Pt>'
> [-Wrange-loop-construct]
>
> Loop variable can be replaced with reference to make this warning go
> away, but it is harmless. Similar to:
> https://github.com/opencv/opencv/pull/18559/commits/2dd2d6095584b957b243bb86948b13223ecb39b3
>
> -Wreturn-std-move
> -----------------
> GUI.cpp:908:16: warning: local variable 'focus_wnd' will be copied
> despite being returned by name [-Wreturn-std-move]
>
> Declared r-value but it ends up being copied anyways.
>
> -Wunused-lambda-capture
> -----------------------
> /usr/obj/pobj/freeorion-0.4.10.1/src-tarball/universe/IDAllocator.cpp:346:60:
> warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
>
> These lambda captures really aren't used. Class members can be accessed
> with 'this' in the capture list, but they actually aren't used.
>
> UI/DesignWnd.cpp:1984:10: warning: lambda capture 'BUTTON_EDGE_PAD' is
> not required to be captured for this use [-Wunused-lambda-capture]
>
> However, this unused-lambda-capture is a bit confusing because
> BUTTON_EDGE_PAD is actually used in the lambda.
>
> -Woverloaded-shift-op-parentheses
> ---------------------------------
> ConditionParser7.cpp:157:40: warning: overloaded operator >> has higher
> precedence than comparison operator [-Woverloaded-shift-op-parentheses]
>
> This program uses the boost qi library to make a parser, and it relies
> on overloading C++ syntax.
>
> https://www.boost.org/doc/libs/1_74_0/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/freeorion/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile
> --- Makefile 15 Aug 2020 20:30:53 -0000 1.8
> +++ Makefile 23 Nov 2020 11:27:18 -0000
> @@ -1,11 +1,10 @@
> # $OpenBSD: Makefile,v 1.8 2020/08/15 20:30:53 rsadowski Exp $
>
> -V = 0.4.10
> +V = 0.4.10.1
> COMMENT = turn-based space empire and galactic conquest computer game
> -DISTNAME = FreeOrion_v${V}_2020-07-10.f3d403e_Source
> +DISTNAME = FreeOrion_v${V}_2020-09-25.39cfe10_Source
> PKGNAME = freeorion-${V}
> CATEGORIES = games
> -REVISION = 0
>
> HOMEPAGE = https://www.freeorion.org/
> MAINTAINER = Tom Murphy <openbsd@pertho.net>
> @@ -14,11 +13,11 @@ MAINTAINER = Tom Murphy <openbsd@pertho.
> #Assets: CC-BY-SA 3.0
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU SDL2 boost_atomic-mt
> +WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL2 boost_atomic-mt
> WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
> WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt
> boost_log_setup-mt
> -WANTLIB += boost_python${MODPY_VERSION:C/\.//g}-mt boost_regex-mt
> boost_serialization-mt
> -WANTLIB += boost_system-mt boost_thread-mt c freetype m ogg openal
> +WANTLIB += boost_python${MODPY_VERSION:C/\.//g}-mt boost_regex-mt
> +WANTLIB += boost_serialization-mt boost_thread-mt c freetype m ogg
> openal
> WANTLIB += png ${MODPY_WANTLIB} vorbis vorbisenc vorbisfile z
>
> MASTER_SITES
> = https://github.com/freeorion/freeorion/releases/download/v${V}/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/freeorion/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 9 Aug 2020 09:37:07 -0000 1.3
> +++ distinfo 23 Nov 2020 11:27:18 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) =
> 5yq0LLoe6IQlBzQJMe84nmQBHgQKStx0rdX0mXu8uos=
> -SIZE (FreeOrion_v0.4.10_2020-07-10.f3d403e_Source.tar.gz) = 124810803
> +SHA256 (FreeOrion_v0.4.10.1_2020-09-25.39cfe10_Source.tar.gz) =
> AAYZGttQRtURFvblpld3PyAVr3wjaE8p4qff99r15Oc=
> +SIZE (FreeOrion_v0.4.10.1_2020-09-25.39cfe10_Source.tar.gz) =
> 124809524
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/freeorion/patches/patch-CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 9 Aug 2020 09:37:07 -0000 1.3
> +++ patches/patch-CMakeLists_txt 23 Nov 2020 11:27:18 -0000
> @@ -4,7 +4,7 @@ Remove hardcoded optimisation option.
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -436,7 +436,6 @@ target_compile_options(freeorionparseobj
> +@@ -423,7 +423,6 @@ target_compile_options(freeorionparseobj
> PRIVATE
> $<$<CXX_COMPILER_ID:Clang>:-ftemplate-depth=512>
> $<$<CXX_COMPILER_ID:AppleClang>:-ftemplate-depth=512>
> Index: patches/patch-cmake_FindBoost_cmake
> ===================================================================
> RCS file: patches/patch-cmake_FindBoost_cmake
> diff -N patches/patch-cmake_FindBoost_cmake
> --- patches/patch-cmake_FindBoost_cmake 9 Aug 2020 09:37:07 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-cmake_FindBoost_cmake,v 1.1 2020/08/09 09:37:07 kirby
> Exp $
> -
> -Unset the Python minor version since OpenBSD uses library names
> -like boost_python3-mt instead of boost_python38-mt
> -
> -Index: cmake/FindBoost.cmake
> ---- cmake/FindBoost.cmake.orig
> -+++ cmake/FindBoost.cmake
> -@@ -1778,6 +1778,7 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
> - endif()
> -
> - unset(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
> -+ unset(COMPONENT_PYTHON_VERSION_MINOR)
> - if (COMPONENT_PYTHON_VERSION_MINOR)
> - # Boost >= 1.67
> - list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME
> "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
> Index: patches/patch-cmake_make_versioncpp_py
> ===================================================================
> RCS file: patches/patch-cmake_make_versioncpp_py
> diff -N patches/patch-cmake_make_versioncpp_py
> --- patches/patch-cmake_make_versioncpp_py 9 Aug 2020 09:37:07
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,33 +0,0 @@
> -$OpenBSD: patch-cmake_make_versioncpp_py,v 1.1 2020/08/09 09:37:07
> kirby Exp $
> -
> -Patch script to provide same information as if you had run git on the
> -checked out tree. This script should not be executing git since this
> -is the official source tarball and it does not provide any git info.
> -Index: cmake/make_versioncpp.py
> ---- cmake/make_versioncpp.py.orig
> -+++ cmake/make_versioncpp.py
> -@@ -124,20 +124,12 @@ if system() == 'Darwin':
> - generators.append(Generator('packaging/Info.plist.in',
> 'packaging/Info.plist'))
> -
> - version = "0.4.10"
> --branch = ""
> -+branch = "release-v0.4.10"
> - build_no = INVALID_BUILD_NO
> -+commit = 'a3e7a51'
> -+timestamp = 1595927480
> -
> --try:
> -- branch = check_output(['git', 'rev-parse', '--abbrev-ref',
> 'HEAD'], universal_newlines=True).strip()
> -- if (branch == "master") or (branch[:7] == "release"):
> -- branch = ""
> -- else:
> -- branch += " "
> -- commit = check_output(["git", "show", "--no-show-signature",
> "-s", "--format=%h", "--abbrev=7", "HEAD"],
> universal_newlines=True).strip()
> -- timestamp = float(check_output(["git", "show",
> "--no-show-signature", "-s", "--format=%ct", "HEAD"],
> universal_newlines=True).strip())
> -- build_no =
> ".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"),
> commit])
> --except IOError:
> -- print("WARNING: git not installed or not setup correctly")
> -+build_no =
> ".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"),
> commit])
> -
> - for generator in generators:
> - generator.execute(version, branch, build_no, build_sys)
Tested and works fine for me. Thanks very much, Nam!
-Tom
No comments:
Post a Comment