Use meson dep & repair malformed shims

Replace direct git dependency on a meson fork with the standard meson package in contourpy and pandas recipes (recipes/contourpy/meta.yaml, recipes/pandas/meta.yaml). In src/forge/build.py add handling to detect and repair a legacy malformed shim where the separator line was accidentally merged with Python code (e.g. "' '''import sys"). The builder now logs the repair and rewrites the shim with a proper separator line (and preserves any trailing suffix). Also small formatting/newline adjustments to shim writing were made to ensure correct output.

Author: FeodorFitsner

recipes/contourpy/meta.yaml

@@ -6,7 +6,7 @@ requirements:
   build:
     - ninja
     - cmake
-    - git+https://github.com/flet-dev/meson@ios-dynamiclib
+    - meson
   host:
     - pybind11
 # {% if sdk == 'android' %}
@@ -16,4 +16,4 @@ requirements:
 build:
   backend-args:
     - -Csetup-args=--cross-file
-    - -Csetup-args={MESON_CROSS_FILE}
+    - -Csetup-args={MESON_CROSS_FILE}

recipes/pandas/meta.yaml

@@ -8,7 +8,7 @@ package:
 requirements:
   build:
     - ninja
-    - git+https://github.com/flet-dev/meson@ios-dynamiclib
+    - meson
   host:
     - numpy ^2.0.0
 # {% if sdk == 'android' %}

src/forge/build.py

@@ -104,10 +104,27 @@ def fix_host_tool_shims(self):
                         [
                             "#!/bin/sh\n",
                             "'''exec' {} \"$0\" \"$@\"\n".format(python_path),
-                            "' '''\n",
+                            "' '''\n\n",
                         ]
                         + lines[1:]
                     )
+            elif (
+                len(lines) > 2
+                and lines[0].strip() == "#!/bin/sh"
+                and lines[1].startswith("'''exec' ")
+                and lines[2].startswith("' '''")
+                and lines[2].strip() != "' '''"
+            ):
+                # Repair legacy malformed shim output where the separator line was
+                # accidentally merged with Python code (e.g. "' '''import sys").
+                log(self.log_file, f"Repairing malformed host shim: {shim}")
+                suffix = lines[2][len("' '''") :]
+                repaired = [lines[0], lines[1], "' '''\n"]
+                if suffix:
+                    repaired.append(suffix)
+                repaired += lines[3:]
+                with open(shim, "w") as f:
+                    f.writelines(repaired)
 
     @abstractmethod
     def download_source_url(self): ...