v2.6

na-trium-144 · Jan 15, 2025 · f992de0 · f992de0
1 parent e574c3e
commit f992de0
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## [2.6.0] - 2025-01-15
+### Changed
+* ABIバージョン: 22
+* READMEを適当に英語に翻訳 (#439)
+* spdlogを -hidden-l ではなく visibility=inlineshidden でビルドしてリンクするように変更 (#444)
+* サーバー側の画像変換に使うライブラリをImageMagickからlibvipsに変更 (#441)
+* デフォルト状態のMesonのオプションを buildtype=release → debug に、 wrap_mode=forcefallback → default に変更 (#445)
+* verbose, traceモードで表示されるログの内容を変更 (#460)
+* ヘッダーのinclude忘れで不完全型を使おうとしてコンパイルエラーになる場合 static_assert でわかりやすいエラーメッセージを出すようにした (#457)
+* libcurl >=8.10, <8.12 は使用しないようにした (#458)
+* libcurl <7.86 は使用しないようにした (#468)
+### Added
+* View::inserter() (#462)
+* Viewの要素に width, height プロパティ追加 (#467)
+* Field::children(), childrenRecurse(), hasChildren() (#464)
+### Fixed
+* libcurl >=8.10 でcurl_ws_sendがメッセージを1回で送信できない場合の再送処理 (#455, #458)
+
 ## [2.5.2] - 2024-12-11
 ### Changed
 * MacOSのビルド済みバイナリの配布はこのバージョンからMacOS13でのビルドになります

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(webcface VERSION 2.5.2)
+project(webcface VERSION 2.6.0)
 
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(IS_MAIN on)

diff --git a/Doxyfile b/Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = "WebCFace"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "2.5.2"
+PROJECT_NUMBER         = "2.6.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/README.md b/README.md
@@ -249,10 +249,10 @@ It is built on Ubuntu 20.04, so it may not work on older versions of Ubuntu or o
 <details open><summary>x86_64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.2/webcface_2.5.2_amd64.deb
-curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3/webcface-tools_2.1.3_amd64.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.11.0/webcface-webui_1.11.0_all.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.11.0/webcface-desktop_1.11.0_linux_amd64.deb
+curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.6.0/webcface_2.6.0_amd64.deb
+curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3-22/webcface-tools_2.1.3_amd64.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.12.0/webcface-webui_1.12.0_all.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.12.0/webcface-desktop_1.12.0_linux_amd64.deb
 sudo apt install ./webcface*.deb
 rm ./webcface*.deb
 ```
@@ -261,10 +261,10 @@ rm ./webcface*.deb
 <details><summary>arm64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.2/webcface_2.5.2_arm64.deb
-curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3/webcface-tools_2.1.3_arm64.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.11.0/webcface-webui_1.11.0_all.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.11.0/webcface-desktop_1.11.0_linux_arm64.deb
+curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.6.0/webcface_2.6.0_arm64.deb
+curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3-22/webcface-tools_2.1.3_arm64.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.12.0/webcface-webui_1.12.0_all.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.12.0/webcface-desktop_1.12.0_linux_arm64.deb
 sudo apt install ./webcface*.deb
 rm ./webcface*.deb
 ```
@@ -273,10 +273,10 @@ rm ./webcface*.deb
 <details><summary>armhf</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.2/webcface_2.5.2_armhf.deb
-curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3/webcface-tools_2.1.3_armhf.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.11.0/webcface-webui_1.11.0_all.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.11.0/webcface-desktop_1.11.0_linux_armv7l.deb
+curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.6.0/webcface_2.6.0_armhf.deb
+curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3-22/webcface-tools_2.1.3_armhf.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.12.0/webcface-webui_1.12.0_all.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.12.0/webcface-desktop_1.12.0_linux_armv7l.deb
 sudo apt install ./webcface*.deb
 rm ./webcface*.deb
 ```
@@ -310,9 +310,9 @@ If you want to download and extract from the command line, use the following.
 <details open><summary>x86_64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.2-1/webcface_2.5.2-1_linux_amd64.zip
-sudo unzip webcface_2.5.2-1_linux_amd64.zip -d /opt/webcface
-rm webcface_2.5.2-1_linux_amd64.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.6.0/webcface_2.6.0_linux_amd64.zip
+sudo unzip webcface_2.6.0_linux_amd64.zip -d /opt/webcface
+rm webcface_2.6.0_linux_amd64.zip
 echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc
 echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc
 sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
@@ -322,9 +322,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
 <details><summary>arm64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.2-1/webcface_2.5.2-1_linux_arm64.zip
-sudo unzip webcface_2.5.2-1_linux_arm64.zip -d /opt/webcface
-rm webcface_2.5.2-1_linux_arm64.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.6.0/webcface_2.6.0_linux_arm64.zip
+sudo unzip webcface_2.6.0_linux_arm64.zip -d /opt/webcface
+rm webcface_2.6.0_linux_arm64.zip
 echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc
 echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/aarch64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc
 sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
@@ -334,9 +334,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
 <details><summary>armhf</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.2-1/webcface_2.5.2-1_linux_armhf.zip
-sudo unzip webcface_2.5.2-1_linux_armhf.zip -d /opt/webcface
-rm webcface_2.5.2-1_linux_armhf.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.6.0/webcface_2.6.0_linux_armhf.zip
+sudo unzip webcface_2.6.0_linux_armhf.zip -d /opt/webcface
+rm webcface_2.6.0_linux_armhf.zip
 echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc
 echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/arm-linux-gnueabihf/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc
 sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
@@ -373,12 +373,12 @@ Instead, you can avoid Gatekeeper by downloading and extracting it from the comm
 > も必要になるかもしれません。
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.2-1/webcface_2.5.2-1_macos_universal.zip
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.2-1/webcface-desktop_2.5.2-1_macos_app.zip
-sudo unzip webcface_2.5.2-1_macos_universal.zip -d /opt/webcface
-sudo unzip webcface-desktop_2.5.2-1_macos_app.zip -d /Applications
-rm webcface_2.5.2-1_macos_universal.zip
-rm webcface-desktop_2.5.2-1_macos_app.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.6.0/webcface_2.6.0_macos_universal.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.6.0/webcface-desktop_2.6.0_macos_app.zip
+sudo unzip webcface_2.6.0_macos_universal.zip -d /opt/webcface
+sudo unzip webcface-desktop_2.6.0_macos_app.zip -d /Applications
+rm webcface_2.6.0_macos_universal.zip
+rm webcface-desktop_2.6.0_macos_app.zip
 echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.zshrc
 echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.zshrc
 ```

diff --git a/docs/31_setup.md b/docs/31_setup.md
@@ -32,7 +32,7 @@ MesonまたはCMakeを使用する場合は、subproject/subdirectoryとしてWe
     ```
     [wrap-git]
     url = https://github.com/na-trium-144/webcface.git
-    revision = v2.5.2
+    revision = v2.6.0
     depth = 1
     [provide]
     dependency_names = webcface
@@ -66,7 +66,7 @@ MesonまたはCMakeを使用する場合は、subproject/subdirectoryとしてWe
     ```cmake
     FetchContent_Declare(webcface
       GIT_REPOSITORY https://github.com/na-trium-144/webcface.git
-      GIT_TAG        v2.5.2
+      GIT_TAG        v2.6.0
     )
     FetchContent_MakeAvailable(webcface)
     ```

diff --git a/docs/84_versioning.md b/docs/84_versioning.md
@@ -21,8 +21,8 @@ C/C++のWebCFaceライブラリと、JavaScript、PythonのWebCFaceライブラ
 | 1.10〜1.11 | | 1.6 | 1.6〜1.7 | Viewのinput要素 |
 | 2.0 | | 1.7 | 1.8.0 | SyncInitEnd |
 | 2.1〜2.3 | 2.0 | 1.8 | 1.8.1〜1.8.3 | LogEntry |
-| 2.4 | 2.1〜2.4 | 1.9 | 1.9〜1.10 | Log (kind=85 → 8) |
-| 2.5 | 3.0 | | | View (3→9), Canvas2D (4→10), 3D (7→11) |
+| 2.4 | 2.1〜2.4 | 1.9〜1.10 | 1.9〜1.12 | Log (kind=85 → 8) |
+| 2.5 | 3.0〜3.1 | | | View (3→9), Canvas2D (4→10), 3D (7→11) |
 
 ## ABI Compatibility
 
@@ -55,7 +55,8 @@ ABIのマイナーバージョンはMacで `otool` などを使った場合に
 | 2.1.0〜2.3.0 | 20.2 | |
 | 2.4.0〜2.4.1 | 20.3 | 2.1.0〜2.1.1 |
 | 2.4.2 | 20.4 | |
-| 2.5 | 21.0 | 2.1.2〜 |
+| 2.5 | 21.0 | 2.1.2〜3 |
+| 2.6 | 22.0 | 2.1.3-22 |
 
 <div class="section_buttons">
 

diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('webcface', 'c', 'cpp',
-  version: '2.5.2',
+  version: '2.6.0',
   license: 'MIT',
   meson_version: '>=1.3.0',
   default_options: [
@@ -176,9 +176,9 @@ cmake = import('cmake')
 cxx = meson.get_compiler('cpp')
 py = find_program('python3')
 
-webcface_abi_major = '21' # ABIの破壊的変更で1増やす
+webcface_abi_major = '22' # ABIの破壊的変更で1増やす
 webcface_abi_minor = '0' # ABIの追加で1増やす
-webcface_webui_version = '1.11.0'
+webcface_webui_version = '1.12.0'
 
 webcface_description = 'Web-based Communication Framework'
 webcface_contact = '[email protected]'