Merge remote-tracking branch 'origin/master' into fcitx

fcitx · Dec 24, 2024 · 2358d1e · 2358d1e
2 parents 56fbb9c + 990c417
commit 2358d1e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/MODULE.bazel b/src/MODULE.bazel
@@ -72,7 +72,17 @@ bazel_dep(
 )
 single_version_override(
     module_name = "rules_android_ndk",
-    patches = ["bazel/rules_android_ndk.patch"],
+    # Bazel's built-in patch engine cannot deal with a patch file that affects
+    # multiple files. This is why we have two separate patch files here.
+    # https://github.com/bazelbuild/bazel/issues/10267
+    patches = [
+        # Look like this should have been included in the following PR.
+        # https://github.com/bazelbuild/rules_android_ndk/pull/37
+        "bazel/rules_android_ndk.allow_empty_glob.patch",
+        # Might be removed after the folloing PR.
+        # https://github.com/bazelbuild/rules_android_ndk/pull/63
+        "bazel/rules_android_ndk.patch",
+    ],
     version = "0.1.2",
 )
 

diff --git a/src/bazel/BUILD.qt_win.bazel b/src/bazel/BUILD.qt_win.bazel
@@ -25,7 +25,9 @@ cc_library(
         ],
     }),
     hdrs = glob([
-        "include",
+        "include/QtCore/*",
+        "include/QtGui/*",
+        "include/QtWidgets/*",
     ]),
     includes = [
         "include",

diff --git a/src/bazel/rules_android_ndk.allow_empty_glob.patch b/src/bazel/rules_android_ndk.allow_empty_glob.patch
@@ -0,0 +1,11 @@
+--- BUILD.ndk_clang.tpl
++++ BUILD.ndk_clang.tpl
+@@ -49,7 +49,7 @@
+       "bin/*",
+       "lib64/**/*",
+       "lib/**/*",
+-    ]),
++    ], allow_empty = True),
+ )
+
+ filegroup(