Merge 3b4c63aea4 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

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;;

internal/icons.zsh

@@ -75,6 +75,7 @@ function _p9k_init_icons() {
         LINUX_ENDEAVOUROS_ICON         '\uE271'$s             # 
         LINUX_ROCKY_ICON               '\uE271'$s             # 
         LINUX_ALMALINUX_ICON           '\uE271'$s             # 
+        LINUX_ZORIN_ICON               '\uE271'$s             # 
         LINUX_GUIX_ICON                '\uE271'$s             # 
         LINUX_NEON_ICON                '\uE271'$s             # 
         SUNOS_ICON                     '\U1F31E'$q            # 🌞
@@ -234,6 +235,7 @@ function _p9k_init_icons() {
         LINUX_ENDEAVOUROS_ICON         '\uF17C'$s             # 
         LINUX_ROCKY_ICON               '\uF17C'$s             # 
         LINUX_ALMALINUX_ICON           '\uF17C'$s             # 
+        LINUX_ZORIN_ICON               '\uF17C'$s             # 
         LINUX_GUIX_ICON                '\uF17C'$s             # 
         LINUX_NEON_ICON                '\uF17C'$s             # 
         SUNOS_ICON                     '\uF185 '              # 
@@ -394,6 +396,7 @@ function _p9k_init_icons() {
         LINUX_ENDEAVOUROS_ICON         "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
         LINUX_ROCKY_ICON               "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
         LINUX_ALMALINUX_ICON           "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
+        LINUX_ZORIN_ICON               "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
         LINUX_GUIX_ICON                "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
         LINUX_NEON_ICON                "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
         SUNOS_ICON                     "${CODEPOINT_OF_AWESOME_SUN_O:+\\u$CODEPOINT_OF_AWESOME_SUN_O }"
@@ -547,6 +550,7 @@ function _p9k_init_icons() {
         LINUX_ENDEAVOUROS_ICON         '\UF322'$s             # 
         LINUX_ROCKY_ICON               '\UF32B'$s             # 
         LINUX_ALMALINUX_ICON           '\UF31D'$s             # 
+        LINUX_ZORIN_OS                 '\uF32F'$s             # 
         LINUX_GUIX_ICON                '\UF325'$s             # 
         LINUX_NEON_ICON                '\uF17C'               # 
         LINUX_ICON                     '\uF17C'               # 
@@ -708,6 +712,7 @@ function _p9k_init_icons() {
         LINUX_ENDEAVOUROS_ICON         '\uF17C'               # 
         LINUX_ROCKY_ICON               '\uF17C'               # 
         LINUX_ALMALINUX_ICON           '\uF17C'               # 
+        LINUX_ZORIN_ICON               '\uF17C'               # 
         LINUX_GUIX_ICON                '\uF325'$s             # 
         LINUX_NEON_ICON                '\uF17C'               # 
         LINUX_ICON                     '\uF17C'               # 
@@ -862,6 +867,7 @@ function _p9k_init_icons() {
         LINUX_ENDEAVOUROS_ICON         'edvos'
         LINUX_ROCKY_ICON               'rocky'
         LINUX_ALMALINUX_ICON           'alma'
+        LINUX_ZORIN_ICON               'zorin'
         LINUX_GUIX_ICON                'guix'
         LINUX_NEON_ICON                'neon'
         SUNOS_ICON                     'sunos'
@@ -1017,6 +1023,7 @@ function _p9k_init_icons() {
         LINUX_ENDEAVOUROS_ICON         'Edv'
         LINUX_ROCKY_ICON               'Roc'
         LINUX_ALMALINUX_ICON           'Alma'
+        LINUX_ZORIN_ICON               'Zorin'
         LINUX_GUIX_ICON                'Guix'
         LINUX_NEON_ICON                'Neon'
         SUNOS_ICON                     'Sun'

internal/p10k.zsh

@@ -8679,6 +8679,7 @@ function _p9k_init_cacheable() {
           endeavouros)             _p9k_set_os Linux LINUX_ENDEAVOUROS_ICON;;
           rocky)                   _p9k_set_os Linux LINUX_ROCKY_ICON;;
           almalinux)               _p9k_set_os Linux LINUX_ALMALINUX_ICON;;
+          zorin)                   _p9k_set_os Linux LINUX_ZORIN_ICON;;
           guix)                    _p9k_set_os Linux LINUX_GUIX_ICON;;
           neon)                    _p9k_set_os Linux LINUX_NEON_ICON;;
           *)                       _p9k_set_os Linux LINUX_ICON;;

internal/wizard.zsh

@@ -1165,6 +1165,7 @@ function os_icon_name() {
           endeavouros)             echo LINUX_ENDEAVOUROS_ICON;;
           rocky)                   echo LINUX_ROCKY_ICON;;
           almalinux)               echo LINUX_ALMALINUX_ICON;;
+          ZORIN)                   echo LINUX_ZORIN_ICON;;
           guix)                    echo LINUX_GUIX_ICON;;
           neon)                    echo LINUX_NEON_ICON;;
           *)                       echo LINUX_ICON;;