chore: Revive spell check feature.

TokTok · Nov 17, 2024 · ac039b9 · ac039b9
1 parent b9f3780
commit ac039b9
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/buildscripts/docker/Dockerfile.alpine b/buildscripts/docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 
 RUN ["apk", "add", \
  "clang", \
@@ -18,8 +18,11 @@ RUN ["apk", "add", \
  "qt6-qttools", \
  "qt6-qttools-dev", \
  "samurai", \
+ "sonnet-dev", \
  "sqlcipher-dev"]
 
+ENV CC=clang CXX=clang++
+
 RUN git clone --recurse-submodules --depth=1 https://github.com/TokTok/c-toxcore /work/c-toxcore
 WORKDIR /work/c-toxcore
 RUN cmake -B_build -H. -GNinja

diff --git a/buildscripts/docker/Dockerfile.archlinux b/buildscripts/docker/Dockerfile.archlinux
@@ -27,6 +27,7 @@ RUN pacman -Syu --noconfirm --needed \
     ffmpeg \
     libexif \
     qrencode \
+    sonnet \
     sqlcipher \
     openal \
     git \

diff --git a/buildscripts/docker/Dockerfile.fedora b/buildscripts/docker/Dockerfile.fedora
@@ -37,6 +37,7 @@ RUN dnf --nodocs -y install dnf-plugins-core && \
         libexif-devel \
         qrencode-devel \
         openal-soft-devel \
+        kf6-sonnet-devel \
         libXScrnSaver-devel \
         patch \
         sqlite-devel \

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -135,10 +135,10 @@ search_dependency(SQLCIPHER           PACKAGE sqlcipher)
 search_dependency(VPX                 PACKAGE vpx)
 
 if(${SPELL_CHECK})
-    find_package(KF5Sonnet)
-    if(KF5Sonnet_FOUND)
+    find_package(KF6Sonnet)
+    if(KF6Sonnet_FOUND)
       add_definitions(-DSPELL_CHECKING)
-      add_dependency(KF5::SonnetUi)
+      add_dependency(KF6::SonnetUi)
     else()
       message(WARNING "Sonnet not found. Spell checking will be disabled.")
     endif()

diff --git a/simple_make.sh b/simple_make.sh
@@ -35,14 +35,14 @@ apt_install() {
         libopenal-dev
         libopus-dev
         libqrencode-dev
-        libqt5opengl5-dev
-        libqt5svg5-dev
+        libqt6opengl5-dev
+        libqt6svg5-dev
         libsodium-dev
         libtool
         libvpx-dev
         libxss-dev
         qrencode
-        qt5-default
+        qt6-default
         qttools5-dev
         qttools5-dev-tools
         libsqlcipher-dev
@@ -61,7 +61,7 @@ pacman_install() {
         openal
         opus
         qrencode
-        qt5
+        qt6
         sqlcipher
     )
     sudo pacman -S --needed "${pacman_packages[@]}"
@@ -87,7 +87,7 @@ dnf_install() {
         git
         glib2-devel
         gtk2-devel
-        kf5-sonnet-devel
+        kf6-sonnet-devel
         libconfig-devel
         libexif-devel
         libsodium-devel
@@ -97,12 +97,12 @@ dnf_install() {
         openssl-devel
         opus-devel
         qrencode-devel
-        qt5-devel
-        qt5-qtdoc
-        qt5-qtsvg
-        qt5-qtsvg-devel
-        qt5-qttools-devel
-        qtsingleapplication-qt5
+        qt6-devel
+        qt6-qtdoc
+        qt6-qtsvg
+        qt6-qtsvg-devel
+        qt6-qttools-devel
+        qtsingleapplication-qt6
         readline-devel
         sqlcipher-devel
         sqlite-devel
@@ -137,15 +137,15 @@ zypper_install() {
         libavdevice-devel
         libopus-devel
         libexif-devel
-        libQt5Concurrent-devel
-        libqt5-linguist
-        libqt5-linguist-devel
-        libQt5Network-devel
-        libQt5OpenGL-devel
-        libqt5-qtbase-common-devel
-        libqt5-qtsvg-devel
-        libQt5Test-devel
-        libQt5Xml-devel
+        libQt6Concurrent-devel
+        libqt6-linguist
+        libqt6-linguist-devel
+        libQt6Network-devel
+        libQt6OpenGL-devel
+        libqt6-qtbase-common-devel
+        libqt6-qtsvg-devel
+        libQt6Test-devel
+        libQt6Xml-devel
         libsodium-devel
         libvpx-devel
         libXScrnSaver-devel

diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
@@ -40,7 +40,7 @@
 #include <QtGlobal>
 
 #ifdef SPELL_CHECKING
-#include <KF5/SonnetUi/sonnet/spellcheckdecorator.h>
+#include <KF6/SonnetUi/sonnet/spellcheckdecorator.h>
 #endif
 
 /**