apply patch for macos

fltk-rs · Jan 5, 2024 · 257e73e · 257e73e
1 parent 9149d39
commit 257e73e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, macos-10.15, ubuntu-18.04]
+        os: [windows-latest, macos-latest, ubuntu-latest]
 
     steps:
     - name: Download deps

diff --git a/fltk-webview-sys/build.rs b/fltk-webview-sys/build.rs
@@ -38,12 +38,6 @@ fn compile_webview() {
     let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
     let exe_pth = out_dir.clone();
 
-    Command::new("git")
-        .args(&["submodule", "update", "--init", "--recursive"])
-        .current_dir(&manifest_dir)
-        .status()
-        .expect("Git is needed to retrieve the fltk & webview source files!");
-
     println!("cargo:rerun-if-changed=webview/webview.h");
     println!("cargo:rerun-if-changed=webview/webview.cc");
     println!("cargo:rerun-if-changed=src/gtk_helper.c");
@@ -132,6 +126,11 @@ fn compile_webview() {
             }
         }
     } else if target.contains("apple") {
+        Command::new("git")
+            .args(&["apply", "webview.patch"])
+            .current_dir(&manifest_dir)
+            .status()
+            .expect("Git is needed to retrieve the fltk & webview source files!");
         build.flag("-DWEBVIEW_COCOA");
         build.flag("-std=c++11");
         println!("cargo:rustc-link-lib=framework=Cocoa");

diff --git a/webview.patch → fltk-webview-sys/webview.patch b/webview.patch → fltk-webview-sys/webview.patch
@@ -11,11 +11,11 @@ index 01f81e6..622bfdf 100644
 +
  #ifndef WEBVIEW_H
  #define WEBVIEW_H
- 
+
 @@ -715,6 +718,12 @@ inline id operator"" _str(const char *s, std::size_t) {
    return objc::msg_send<id>("NSString"_cls, "stringWithUTF8String:"_sel, s);
  }
- 
+
 +inline std::string unique_name(std::string base) {
 +  static int name_counter = 0;
 +  base += std::to_string(name_counter++);
@@ -53,7 +53,7 @@ index 01f81e6..622bfdf 100644
      class_addMethod(
          cls,
 @@ -2292,4 +2301,4 @@ WEBVIEW_API const webview_version_info_t *webview_version() {
- 
+
  #endif /* WEBVIEW_HEADER */
  #endif /* __cplusplus */
 -#endif /* WEBVIEW_H */