Skip to content

Commit

Permalink
Update 3rd party:
Browse files Browse the repository at this point in the history
sparkle:  2.6.1  -> 2.6.4
spdlog:  1.14.1 -> 1.15.0
unordered_dense: 4.4.0 -> 4.5.0
  • Loading branch information
mikekazakov committed Dec 16, 2024
1 parent 4238342 commit 0844c90
Show file tree
Hide file tree
Showing 34 changed files with 214 additions and 148 deletions.
6 changes: 3 additions & 3 deletions 3rd_Party/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ Verify the Xcode version with `xcode-select -p`.
| pugixml | 1.14 | 2023.10.01 | https://github.com/zeux/pugixml.git
| rapidjson | head | 2024.10.07 | https://github.com/Tencent/rapidjson
| re2 | 2023-03-01 | 2023.03.01 | https://github.com/google/re2.git
| sparkle | 2.6.1 | 2024.06.02 | https://github.com/sparkle-project/Sparkle.git
| spdlog | 1.14.1 | 2024.04.30 | https://github.com/gabime/spdlog.git
| unordered_dense | 4.4.0 | 2023.12.24 | https://github.com/martinus/unordered_dense.git
| sparkle | 2.6.4 | 2024.07.01 | https://github.com/sparkle-project/Sparkle.git
| spdlog | 1.15.0 | 2024.11.09 | https://github.com/gabime/spdlog.git
| unordered_dense | 4.5.0 | 2024.12.03 | https://github.com/martinus/unordered_dense.git
| zlib | 1.3.1 | 2024.01.22 | https://zlib.net/zlib-1.3.1.tar.gz
| zstd | 1.5.6 | 2024.03.30 | https://github.com/facebook/zstd.git
Binary file modified 3rd_Party/Sparkle/Sparkle.framework/Versions/B/Autoupdate
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>23G93</string>
<string>24B83</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,31 +17,31 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.6.1</string>
<string>2.6.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>2037</string>
<string>2039.1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>15.0</string>
<string>15.2</string>
<key>DTSDKBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTSDKName</key>
<string>macosx15.0</string>
<string>macosx15.2</string>
<key>DTXcode</key>
<string>1600</string>
<string>1620</string>
<key>DTXcodeBuild</key>
<string>16A5230g</string>
<string>16C5032a</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
</dict>
Expand Down
Binary file not shown.
Binary file modified 3rd_Party/Sparkle/Sparkle.framework/Versions/B/Sparkle
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>23G93</string>
<string>24B83</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand Down Expand Up @@ -55,31 +55,31 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.6.1</string>
<string>2.6.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>2037</string>
<string>2039.1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>15.0</string>
<string>15.2</string>
<key>DTSDKBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTSDKName</key>
<string>macosx15.0</string>
<string>macosx15.2</string>
<key>DTXcode</key>
<string>1600</string>
<string>1620</string>
<key>DTXcodeBuild</key>
<string>16A5230g</string>
<string>16C5032a</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/SUStatus.nib</key>
<data>
ZAnGku07bS8gPWfDKzQvhK49E+A=
mvkHPsVFMOgSQABLEslAOaWhaM8=
</data>
</dict>
<key>files2</key>
Expand All @@ -15,7 +15,7 @@
<dict>
<key>hash2</key>
<data>
EKe925NYcAgvdxcboaIaOFNtL17zDmjuLzUz7/YDpM0=
LsINg7m9bj6muHQHWyyTTROoMm/yFWsbDnQqP9eo0O4=
</data>
</dict>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>23G93</string>
<string>24B83</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,31 +17,31 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>2.6.1</string>
<string>2.6.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>2037</string>
<string>2039.1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>15.0</string>
<string>15.2</string>
<key>DTSDKBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTSDKName</key>
<string>macosx15.0</string>
<string>macosx15.2</string>
<key>DTXcode</key>
<string>1600</string>
<string>1620</string>
<key>DTXcodeBuild</key>
<string>16A5230g</string>
<string>16C5032a</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
<key>NSAppTransportSecurity</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>23G93</string>
<string>24B83</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,31 +17,31 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>2.6.1</string>
<string>2.6.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>2037</string>
<string>2039.1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>15.0</string>
<string>15.2</string>
<key>DTSDKBuild</key>
<string>24A5324a</string>
<string>24C94</string>
<key>DTSDKName</key>
<string>macosx15.0</string>
<string>macosx15.2</string>
<key>DTXcode</key>
<string>1600</string>
<string>1620</string>
<key>DTXcodeBuild</key>
<string>16A5230g</string>
<string>16C5032a</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
<key>NSHumanReadableCopyright</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
<dict>
<key>Resources/Base.lproj/SUUpdateAlert.nib</key>
<data>
eBQK56K7Zi7fyb8hmUBvAAKDflo=
CwzRlLP+3NEQAAEUMnf22jOrOFU=
</data>
<key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib</key>
<data>
f1xkYDhE0BT0n3LxhxuDRcGBlLk=
31yM57uI4RmDcwpU90kssxX0OiI=
</data>
<key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib</key>
<data>
dCevxm0fvHkUqJiG9KJJJ7H1wtg=
WAxCULN6jwQjUkhdtZszbbEbElM=
</data>
<key>Resources/Base.lproj/Sparkle.strings</key>
<data>
yENpjnRY3Io5iY3w/nXBi2P2CFc=
</data>
<key>Resources/Info.plist</key>
<data>
CU9SOhCb7nYLmmQmJ5/NUIXgKig=
W6yAmG2KRiowMBGJXhNkTecRWaw=
</data>
<key>Resources/ReleaseNotesColorStyle.css</key>
<data>
NjIvb1z7eJuLCKf9HS15O5heg50=
</data>
<key>Resources/SUStatus.nib</key>
<data>
ZAnGku07bS8gPWfDKzQvhK49E+A=
mvkHPsVFMOgSQABLEslAOaWhaM8=
</data>
<key>Resources/ar.lproj/SUUpdateAlert.strings</key>
<dict>
Expand Down Expand Up @@ -939,10 +939,10 @@
<dict>
<key>cdhash</key>
<data>
0tP0lDyqGENjO38pU4Ou/nd9vWw=
xnw3pFjZ6UXTCyf2epi68wZqmTg=
</data>
<key>requirement</key>
<string>cdhash H"d2d3f4943caa1843633b7f295383aefe777dbd6c" or cdhash H"b958b1f76c4f2ae3d6b843a7ddc2279c7bc77700"</string>
<string>cdhash H"c67c37a458d9e945d30b27f67a98baf3066a9938" or cdhash H"ce61137493f0e45aa7d4176f2e30a258f7bd4ef1"</string>
</dict>
<key>Headers/SPUDownloadData.h</key>
<dict>
Expand Down Expand Up @@ -1158,21 +1158,21 @@
<dict>
<key>hash2</key>
<data>
2Z0dXFe+B5t9UpTEl02RwlVz8V2TtMBUE1dV576cPgo=
Ljl/rK2RBYbzB2DKeTqfO00nOp8F0b7te4vJoUFAMWE=
</data>
</dict>
<key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib</key>
<dict>
<key>hash2</key>
<data>
Vm3IuajHd6rLp7CLp0DPmYXQGC43+a5z6MU+ICu/2vk=
2ApUH/ejbTkxM01rBdnOhPZg35tsnPDYZwiQRPx9Q/c=
</data>
</dict>
<key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib</key>
<dict>
<key>hash2</key>
<data>
Uv3E6/aop9N4mHRhvET4JLnbkvPokib+LW5ygCdPpIs=
i4NBxlosPCkv293WsvkW7OmbJKiHVP9y06VIAOj5nC4=
</data>
</dict>
<key>Resources/Base.lproj/Sparkle.strings</key>
Expand All @@ -1186,7 +1186,7 @@
<dict>
<key>hash2</key>
<data>
4eIah47zOTXNyKQH/yKsb7Mg9oQD0h1kkVKr1rGDJlY=
fsMqE33Z5aa7QEzx4QGDXIN1Qg8vGSgruT1audGQDqo=
</data>
</dict>
<key>Resources/ReleaseNotesColorStyle.css</key>
Expand All @@ -1200,7 +1200,7 @@
<dict>
<key>hash2</key>
<data>
EKe925NYcAgvdxcboaIaOFNtL17zDmjuLzUz7/YDpM0=
LsINg7m9bj6muHQHWyyTTROoMm/yFWsbDnQqP9eo0O4=
</data>
</dict>
<key>Resources/ar.lproj/SUUpdateAlert.strings</key>
Expand Down Expand Up @@ -2107,28 +2107,28 @@
<dict>
<key>cdhash</key>
<data>
tooTko0dE29snYyRAxnWxvqP+lc=
y6EwVDg/cZorn6hRNcAIlZLsS0A=
</data>
<key>requirement</key>
<string>cdhash H"b68a13928d1d136f6c9d8c910319d6c6fa8ffa57" or cdhash H"80defc6b85ef53f965055cbe43e1be46056f9bae"</string>
<string>cdhash H"cba13054383f719a2b9fa85135c0089592ec4b40" or cdhash H"c4fd5f9fb1fa4f17afaa6dcfbfdd171ed04ef074"</string>
</dict>
<key>XPCServices/Downloader.xpc</key>
<dict>
<key>cdhash</key>
<data>
A+xHakKuGXizsz6k3xifwWuafzw=
ghsrUsH8Tga48y4sSiV9Qfp0+qE=
</data>
<key>requirement</key>
<string>cdhash H"03ec476a42ae1978b3b33ea4df189fc16b9a7f3c" or cdhash H"2e8bf408dc29a6159a27bc57dfac39fdea3093b4"</string>
<string>cdhash H"821b2b52c1fc4e06b8f32e2c4a257d41fa74faa1" or cdhash H"7e6b47da0fac3efdd6673713ba9787297c9446a1"</string>
</dict>
<key>XPCServices/Installer.xpc</key>
<dict>
<key>cdhash</key>
<data>
0M5djLhamWuot0RTeXljgaaNKJg=
EvmcbgHNySUzjJvBr6v0Bg8KBpU=
</data>
<key>requirement</key>
<string>cdhash H"d0ce5d8cb85a996ba8b7445379796381a68d2898" or cdhash H"e77e789ad007a20a6ab38608b1991aa494aa9ffe"</string>
<string>cdhash H"12f99c6e01cdc925338c9bc1afabf4060f0a0695" or cdhash H"e030a21edffffadeca298029d0f0de7e86a0710f"</string>
</dict>
</dict>
<key>rules</key>
Expand Down
2 changes: 1 addition & 1 deletion 3rd_Party/Sparkle/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TMP_DIR=${CUR_DIR}/sparkle.tmp
mkdir ${TMP_DIR}
cd ${TMP_DIR}

git clone -b 2.6.1 --single-branch --depth=1 --recursive https://github.com/sparkle-project/Sparkle.git
git clone -b 2.6.4 --single-branch --depth=1 --recursive https://github.com/sparkle-project/Sparkle.git

cd Sparkle

Expand Down
2 changes: 1 addition & 1 deletion 3rd_Party/spdlog/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TMP_DIR=${CUR_DIR}/spdlog.tmp
mkdir ${TMP_DIR}
cd ${TMP_DIR}

git clone -b v1.14.1 --single-branch --depth=1 https://github.com/gabime/spdlog.git
git clone -b v1.15.0 --single-branch --depth=1 https://github.com/gabime/spdlog.git
cd spdlog

clang++ -c \
Expand Down
6 changes: 3 additions & 3 deletions 3rd_Party/spdlog/include/spdlog/details/mpmc_blocking_q.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,19 @@ class mpmc_blocking_queue {
#endif

size_t overrun_counter() {
std::unique_lock<std::mutex> lock(queue_mutex_);
std::lock_guard<std::mutex> lock(queue_mutex_);
return q_.overrun_counter();
}

size_t discard_counter() { return discard_counter_.load(std::memory_order_relaxed); }

size_t size() {
std::unique_lock<std::mutex> lock(queue_mutex_);
std::lock_guard<std::mutex> lock(queue_mutex_);
return q_.size();
}

void reset_overrun_counter() {
std::unique_lock<std::mutex> lock(queue_mutex_);
std::lock_guard<std::mutex> lock(queue_mutex_);
q_.reset_overrun_counter();
}

Expand Down
Loading

0 comments on commit 0844c90

Please sign in to comment.