Use blocks runtime from libdispatch

libobjc2 has [support for using an external blocks runtime](gnustep/libobjc2#199), and [only ships with its own copy of a blocks runtime because that was the only option at the time](gnustep/libobjc2#199 (comment))

Author: qmfrederik

.github/workflows/ci.yaml

@@ -46,12 +46,12 @@ jobs:
         if: ${{ github.ref != 'refs/heads/main' }}
       - name: Install gnustep-helpers
         run: conan create gnustep-helpers --profile:a=${{ github.workspace }}/profiles/windows-clang
+      - name: Install libdispatch
+        run: conan create libdispatch --profile:a=${{ github.workspace }}/profiles/windows-clang
       - name: Install libobjc2
         run: conan create libobjc2 --profile:a=${{ github.workspace }}/profiles/windows-clang
       - name: Install gnustep-make
         run: conan create gnustep-make --profile:a=${{ github.workspace }}/profiles/windows-clang
-      - name: Install libdispatch
-        run: conan create libdispatch --profile:a=${{ github.workspace }}/profiles/windows-clang
       - name: Install gnustep-base
         run: conan create gnustep-base --profile:a=${{ github.workspace }}/profiles/windows-clang -c tools.build:skip_test=True
       - name: Install gnustep-gui
@@ -141,12 +141,12 @@ jobs:
         if: ${{ github.ref != 'refs/heads/main' }}
       - name: Install gnustep-helpers
         run: .python3/bin/conan create gnustep-helpers --profile:a=profiles/linux-clang
+      - name: Install libdispatch
+        run: .python3/bin/conan create libdispatch --profile:a=profiles/linux-clang
       - name: Install libobjc2
         run: .python3/bin/conan create libobjc2 --profile:a=profiles/linux-clang
       - name: Install gnustep-make
         run: .python3/bin/conan create gnustep-make --profile:a=profiles/linux-clang
-      - name: Install libdispatch
-        run: .python3/bin/conan create libdispatch --profile:a=profiles/linux-clang
       - name: Install gnustep-base dependencies (Ubuntu)
         run: |
           apt-get update

libdispatch/0003-Use-external-BlocksRuntime.patch

@@ -7,4 +7,3 @@ sources:
 patches:
   - patch_file: "0001-Use-CMAKE_C_COMPILER_FRONTEND_VARIANT-to-detect-msvc.patch"
   - patch_file: "0002-Fix-Windows-compatibility.patch"
-  - patch_file: "0003-Use-external-BlocksRuntime.patch"

libdispatch/conandata.yml

@@ -25,9 +25,6 @@ def source(self):
         get(self, **sorted(self.conan_data["sources"].values())[0])
         apply_conandata_patches(self)
 
-    def requirements(self):
-        self.requires("libobjc2/[^2.2.1]")
-
     def config_options(self):
         if self.settings.os == "Windows":
             self.options.rm_safe("fPIC")
@@ -44,23 +41,6 @@ def generate(self):
         deps.generate()
         tc = CMakeToolchain(self)
 
-        # Use shared blocks runtime
-        libobjc2_package_folder = self.dependencies["libobjc2"].package_folder
-        libobjc_library_name = "libobjc.so"
-        
-        if self.settings.os == "Windows":
-            libobjc_library_name = "objc.lib"
-
-        libobjc_include_dir = os.path.join(libobjc2_package_folder, "include")
-        libobjc_library = os.path.join(libobjc2_package_folder, "lib", libobjc_library_name)
-
-        # There should be a more elegant way to handle these backwards slashes
-        if self.settings.os == "Windows":
-            libobjc_include_dir = libobjc_include_dir.replace('\\','/')
-            libobjc_library = libobjc_library.replace('\\','/')
-
-        tc.variables["BlocksRuntime_INCLUDE_DIR"] = libobjc_include_dir
-        tc.variables["BlocksRuntime_LIBRARIES"] = libobjc_library
         tc.variables["BUILD_TESTING"] = "NO"
         tc.generate()
 

libdispatch/conanfile.py

@@ -27,6 +27,9 @@ def source(self):
     def requirements(self):
         self.requires("tsl-robin-map/1.3.0")
 
+        # Use the blocks runtime which ships with libdispatch
+        self.requires("libdispatch/[^6.1.1]")
+
     def config_options(self):
         if self.settings.os == "Windows":
             self.options.rm_safe("fPIC")
@@ -47,6 +50,7 @@ def yes_no(opt): return "yes" if opt else "no"
         # Prevent picking up a default install location through gnustep-config
         tc.variables["GNUSTEP_INSTALL_TYPE"] = "NONE"
         tc.variables["TESTS"] = yes_no(not self.conf.get("tools.build:skip_test", default=False))
+        tc.variables["EMBEDDED_BLOCKS_RUNTIME"] = "OFF"
         tc.generate()
 
     def build(self):