use Patches and fix packaging

eastdc/all/conandata.yml

@@ -2,3 +2,8 @@ sources:
   "25082026":
     url: "https://github.com/electronicarts/EAStdC/archive/fbcc34e89c63636054334888f3a5bd7ac2fd4b76.zip"
     sha256: "023ddb703c824d2e7a9a670b8d5f4a9d9989e07b068f148448c6bb87402bd67d"
+patches:
+  "25082026":
+    - patch_file: "patches/25082026-0001-use-conan.patch"
+      patch_description: "bump cmake_minimum_required past what CMake >= 4 accepts, drop the submodule-only CommonCppFlags include, use cci's EABase/EAAssert/EAThread, add install definitions"
+      patch_type: "conan"

eastdc/all/conanfile.py

@@ -2,7 +2,7 @@ import os
 
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import copy, get, replace_in_file, rmdir
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
 
 required_conan_version = ">=1.52.0"
 
@@ -27,6 +27,9 @@ class EAStdCConan(ConanFile):
         "fPIC": True,
     }
 
+    def export_sources(self):
+        export_conandata_patches(self)
+
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
@@ -51,37 +54,8 @@ class EAStdCConan(ConanFile):
         tc.generate()
         CMakeDeps(self).generate()
 
-    def _patch_sources(self):
-        cmakelists = os.path.join(self.source_folder, "CMakeLists.txt")
-
-        # CMake >= 4 dropped support for the compatibility policies VERSION 3.1 requires.
-        replace_in_file(self, cmakelists, "cmake_minimum_required(VERSION 3.1)", "cmake_minimum_required(VERSION 3.5)")
-        replace_in_file(self, cmakelists, "include(CommonCppFlags)", "")
-
-        # The upstream CMakeLists.txt expects bare "EABase"/"EAAssert"/"EAThread" targets from a git
-        # submodule setup that doesn't exist when building from the release archive via Conan. Point
-        # it at Conan's packages instead, and add install rules (upstream has none).
-        replace_in_file(
-            self,
-            cmakelists,
-            "target_link_libraries(EAStdC EABase)\n"
-            "target_link_libraries(EAStdC EAAssert)\n"
-            "target_link_libraries(EAStdC EAThread)\n",
-            "find_package(EABase REQUIRED CONFIG)\n"
-            "find_package(EAAssert REQUIRED CONFIG)\n"
-            "find_package(EAThread REQUIRED CONFIG)\n"
-            "target_link_libraries(EAStdC EABase::EABase EAAssert::EAAssert EAThread::EAThread)\n"
-            "\n"
-            "include(GNUInstallDirs)\n"
-            "install(TARGETS EAStdC\n"
-            "        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}\n"
-            "        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}\n"
-            "        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})\n"
-            "install(DIRECTORY include/EAStdC DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})\n",
-        )
-
     def build(self):
-        self._patch_sources()
+        apply_conandata_patches(self)
         cmake = CMake(self)
         cmake.configure()
         cmake.build()

eastdc/all/patches/25082026-0001-use-conan.patch

@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9bf3131..36ab616 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ #-------------------------------------------------------------------------------------------
+ # Copyright (C) Electronic Arts Inc.  All rights reserved.
+ #-------------------------------------------------------------------------------------------
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ project(EAStdC CXX)
+ 
+ #-------------------------------------------------------------------------------------------
+@@ -13,7 +13,6 @@ option(EASTDC_BUILD_TESTS "Enable generation of build files for tests" OFF)
+ # Compiler Flags
+ #-------------------------------------------------------------------------------------------
+ set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/test/packages/EASTL/scripts/CMake")
+-include(CommonCppFlags)
+ 
+ #-------------------------------------------------------------------------------------------
+ # Library definition
+@@ -41,7 +40,18 @@ target_include_directories(EAStdC PUBLIC include)
+ #-------------------------------------------------------------------------------------------
+ # Dependencies
+ #-------------------------------------------------------------------------------------------
+-target_link_libraries(EAStdC EABase)
+-target_link_libraries(EAStdC EAAssert)
+-target_link_libraries(EAStdC EAThread)
++find_package(EABase REQUIRED CONFIG)
++find_package(EAAssert REQUIRED CONFIG)
++find_package(EAThread REQUIRED CONFIG)
++target_link_libraries(EAStdC EABase::EABase EAAssert::EAAssert EAThread::EAThread)
++
++#-------------------------------------------------------------------------------------------
++# Installation
++#-------------------------------------------------------------------------------------------
++include(GNUInstallDirs)
++install(TARGETS EAStdC
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(DIRECTORY include/EAStdC DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+