Merge b336fa098a into 604f19a9ea

075baf6e Fix gitstatus build failure with Apple Clang 17 (Xcode 16+)
6bcf109c Compiling on mips64 (#476)

git-subtree-dir: gitstatus
git-subtree-split: 075baf6ecb19f58b09c9562f33c20b842e870961

config/p10k-classic.zsh

@@ -999,6 +999,9 @@
   typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false
   # If set to false, hide python version if it's equal to "system".
   typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true
+  # Show pyenv only when the command you are typing matches one of these strings.
+  # Tip: You might want to enable POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW above.
+  # typeset -g POWERLEVEL9K_PYENV_SHOW_ON_COMMAND='py*|pip*|poetry|virtualenv'
 
   # Pyenv segment format. The following parameters are available within the expansion.
   #
@@ -1010,7 +1013,7 @@
   # 1. Display just "$P9K_CONTENT" if it's equal to "$P9K_PYENV_PYTHON_VERSION" or
   #    starts with "$P9K_PYENV_PYTHON_VERSION/".
   # 2. Otherwise display "$P9K_CONTENT $P9K_PYENV_PYTHON_VERSION".
-  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+ $P9K_PYENV_PYTHON_VERSION}'
+  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+$P9K_PYENV_PYTHON_VERSION}'
 
   # Custom icon.
   # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐'

config/p10k-lean-8colors.zsh

@@ -974,6 +974,9 @@
   typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false
   # If set to false, hide python version if it's equal to "system".
   typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true
+  # Show pyenv only when the command you are typing matches one of these strings.
+  # Tip: You might want to enable POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW above.
+  # typeset -g POWERLEVEL9K_PYENV_SHOW_ON_COMMAND='py*|pip*|poetry|virtualenv'
 
   # Pyenv segment format. The following parameters are available within the expansion.
   #
@@ -985,7 +988,7 @@
   # 1. Display just "$P9K_CONTENT" if it's equal to "$P9K_PYENV_PYTHON_VERSION" or
   #    starts with "$P9K_PYENV_PYTHON_VERSION/".
   # 2. Otherwise display "$P9K_CONTENT $P9K_PYENV_PYTHON_VERSION".
-  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+ $P9K_PYENV_PYTHON_VERSION}'
+  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+$P9K_PYENV_PYTHON_VERSION}'
 
   # Custom icon.
   # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐'

config/p10k-lean.zsh

@@ -974,6 +974,9 @@
   typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false
   # If set to false, hide python version if it's equal to "system".
   typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true
+  # Show pyenv only when the command you are typing matches one of these strings.
+  # Tip: You might want to enable POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW above.
+  # typeset -g POWERLEVEL9K_PYENV_SHOW_ON_COMMAND='py*|pip*|poetry|virtualenv'
 
   # Pyenv segment format. The following parameters are available within the expansion.
   #
@@ -985,7 +988,7 @@
   # 1. Display just "$P9K_CONTENT" if it's equal to "$P9K_PYENV_PYTHON_VERSION" or
   #    starts with "$P9K_PYENV_PYTHON_VERSION/".
   # 2. Otherwise display "$P9K_CONTENT $P9K_PYENV_PYTHON_VERSION".
-  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+ $P9K_PYENV_PYTHON_VERSION}'
+  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+$P9K_PYENV_PYTHON_VERSION}'
 
   # Custom icon.
   # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐'

config/p10k-rainbow.zsh

@@ -1049,6 +1049,9 @@
   typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false
   # If set to false, hide python version if it's equal to "system".
   typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true
+  # Show pyenv only when the command you are typing matches one of these strings.
+  # Tip: You might want to enable POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW above.
+  # typeset -g POWERLEVEL9K_PYENV_SHOW_ON_COMMAND='py*|pip*|poetry|virtualenv'
 
   # Pyenv segment format. The following parameters are available within the expansion.
   #
@@ -1060,7 +1063,7 @@
   # 1. Display just "$P9K_CONTENT" if it's equal to "$P9K_PYENV_PYTHON_VERSION" or
   #    starts with "$P9K_PYENV_PYTHON_VERSION/".
   # 2. Otherwise display "$P9K_CONTENT $P9K_PYENV_PYTHON_VERSION".
-  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+ $P9K_PYENV_PYTHON_VERSION}'
+  typeset -g POWERLEVEL9K_PYENV_CONTENT_EXPANSION='${P9K_CONTENT}${${P9K_CONTENT:#$P9K_PYENV_PYTHON_VERSION(|/*)}:+$P9K_PYENV_PYTHON_VERSION}'
 
   # Custom icon.
   # typeset -g POWERLEVEL9K_PYENV_VISUAL_IDENTIFIER_EXPANSION='⭐'

gitstatus/build

@@ -272,9 +272,9 @@ case "$gitstatus_kernel" in
       gitstatus_cxxflags="$gitstatus_cxxflags -I"$brew_prefix"/opt/libiconv/include"
     fi
     libgit2_cmake_flags="$libgit2_cmake_flags -DUSE_ICONV=ON"
-    gitstatus_ldlibs="$gitstatus_ldlibs -liconv"
+    gitstatus_ldlibs="$gitstatus_ldlibs -liconv -lz"
     gitstatus_ldflags="$gitstatus_ldflags -L${workdir}/lib"
-    libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF"
+    libgit2_cmake_flags="$libgit2_cmake_flags -DENABLE_REPRODUCIBLE_BUILDS=OFF -DUSE_BUNDLED_ZLIB=OFF"
   ;;
   msys*|mingw*)
     gitstatus_ldflags="$gitstatus_ldflags ${static_pie:--static}"
@@ -551,6 +551,7 @@ if [ -z "$gitstatus_cpu" ]; then
     arm64|aarch64)  gitstatus_cpu=armv8-a;;
     ppc64|ppc64le)  gitstatus_cpu=powerpc64le;;
     riscv64)        gitstatus_cpu=rv64imafdc;;
+    mips64)         gitstatus_cpu=mips64;;
     loongarch64)    gitstatus_cpu=loongarch64;;
     x86_64|amd64)   gitstatus_cpu=x86-64;;
     x86)            gitstatus_cpu=i586;;