pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openttd: Update to 14.0



Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <frederic%fauberteau.org@localhost>
Pushed By:	frederic
Date:		Wed Apr 24 13:01:24 2024 +0200
Changeset:	8dacd20f8f50f56632a1515353af8eb915b26f70

Modified Files:
	openttd/Makefile
	openttd/distinfo
	openttd/patches/patch-cmake_InstallAndPackage.cmake

Log Message:
openttd: Update to 14.0

pkgsrc changes:
---------------
  * OpenTTD now requires C++20.
  * Check patches applications.

upstream changes:
-----------------
  * https://cdn.openttd.org/openttd-releases/14.0/changelog.txt

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8dacd20f8f50f56632a1515353af8eb915b26f70

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openttd/Makefile                                    | 7 +++----
 openttd/distinfo                                    | 8 ++++----
 openttd/patches/patch-cmake_InstallAndPackage.cmake | 4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diffs:
diff --git a/openttd/Makefile b/openttd/Makefile
index cb43a5459e..cd0e3d69ec 100644
--- a/openttd/Makefile
+++ b/openttd/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.121 2024/04/06 08:05:35 wiz Exp $
 
-DISTNAME=	openttd-13.4-source
+DISTNAME=	openttd-14.0-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	https://proxy.binaries.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
 MASTER_SITES+=	https://cdn.openttd.org/openttd-releases/${PKGVERSION_NOREV}/
@@ -17,12 +16,12 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
-USE_CXX_FEATURES+=	c++17 charconv
+USE_CXX_FEATURES+=	c++20 charconv
 
 BUILD_DEFS+=	VARBASE
 
 # Uses alloca, cannot use standard C++ on NetBSD
-FORCE_CXX_STD=		gnu++17
+FORCE_CXX_STD=		gnu++20
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/openttd/distinfo b/openttd/distinfo
index 67ffad2ab4..f159132758 100644
--- a/openttd/distinfo
+++ b/openttd/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.46 2023/10/15 15:32:26 triaxx Exp $
 
-BLAKE2s (openttd-13.4-source.tar.xz) = d2529ea293b329f14b24e1c6e115061f960f5be45f402a1e4e5c77d760726a74
-SHA512 (openttd-13.4-source.tar.xz) = 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001
-Size (openttd-13.4-source.tar.xz) = 7428012 bytes
+BLAKE2s (openttd-14.0-source.tar.xz) = 1008115055bd7f2f0e6a82e421c3137474974e9587e8c30d55a80a315142dbd6
+SHA512 (openttd-14.0-source.tar.xz) = 8c669f5f8578df116166587b85f7f94c4409876099590f5ee4a12b92cbd0e0f50002b8319df635a14b7cbf3e6308b2905587137a8127d0814146025e174925c4
+Size (openttd-14.0-source.tar.xz) = 7997536 bytes
+SHA1 (patch-cmake_InstallAndPackage.cmake) = c7af3d74c1d6c22989242a75b2108f6d28cc0164
 SHA1 (patch-cmake_PackageBundle.cmake) = a22c8080c03ac8885beac3fc4b2b1c2f94eafe6b
-SHA1 (patch-cmake_InstallAndPackage.cmake) = 47cf19bf6b77dc5bcf954ee5ffdb4967f2af19ea
 SHA1 (patch-src_core_alloc__func.hpp) = 9c5a855316e3262c51c1b4c836de760d53abb759
diff --git a/openttd/patches/patch-cmake_InstallAndPackage.cmake b/openttd/patches/patch-cmake_InstallAndPackage.cmake
index 241e59354d..bbb4998994 100644
--- a/openttd/patches/patch-cmake_InstallAndPackage.cmake
+++ b/openttd/patches/patch-cmake_InstallAndPackage.cmake
@@ -4,7 +4,7 @@ Do not try to generate Linux distribution packages.
 
 --- cmake/InstallAndPackage.cmake.orig	2023-06-11 16:42:59.000000000 +0000
 +++ cmake/InstallAndPackage.cmake
-@@ -121,7 +121,7 @@ set(CPACK_PACKAGE_EXECUTABLES "openttd;O
+@@ -152,7 +152,7 @@ set(CPACK_PACKAGE_EXECUTABLES "openttd;O
  set(CPACK_STRIP_FILES YES)
  set(CPACK_OUTPUT_FILE_PREFIX "bundles")
  
@@ -13,7 +13,7 @@ Do not try to generate Linux distribution packages.
      # Stripping would produce unreadable stacktraces.
      set(CPACK_STRIP_FILES NO)
      set(CPACK_GENERATOR "Bundle")
-@@ -154,10 +154,11 @@ elseif(UNIX)
+@@ -185,10 +185,11 @@ elseif(UNIX)
      if(OPTION_PACKAGE_DEPENDENCIES)
          set(CPACK_GENERATOR "TXZ")
          set(PLATFORM "generic")


Home | Main Index | Thread Index | Old Index