fix: build without KConfig is possible once more

fix: build without kwallet

.gitea/workflows/release.yml

@@ -0,0 +1,45 @@
+name: Squawk Release workflow
+run-name: ${{ gitea.actor }} is running Squawk Release workflow on release ${{ gitea.event.release.tag_name }}
+on:
+  release:
+    types: [published]
+
+jobs:
+  Archlinux:
+    runs-on: archlinux
+    steps:
+      - name: Download the release tarball
+        run: curl -sL ${{ gitea.server_url }}/${{ gitea.repository }}/archive/${{ gitea.event.release.tag_name }}.tar.gz --output tarball.tar.gz
+
+      - name: Calculate SHA256 for the tarball
+        run: echo "tbSum=$(sha256sum tarball.tar.gz | cut -d ' ' -f 1)" >> $GITHUB_ENV
+
+      - name: Unarchive tarball
+        run: tar -xvzf tarball.tar.gz
+
+      - name: Clone the AUR repository
+        run: |
+          echo "${{ secrets.DEPLOY_TO_AUR_PRIVATE_KEY }}" > key
+          chmod 600 key
+          GIT_SSH_COMMAND="ssh -i key -o 'IdentitiesOnly yes' -o 'StrictHostKeyChecking no'" git clone ssh://aur@aur.archlinux.org/squawk.git aur
+          chmod 777 -R aur
+          cd aur
+          git config user.name ${{ secrets.DEPLOY_TO_AUR_USER_NAME }}
+          git config user.email ${{ secrets.DEPLOY_TO_AUR_EMAIL }}
+
+
+      - name: Copy PKGBUILD to the directory
+        run: cp squawk/packaging/Archlinux/PKGBUILD aur/
+
+      - name: Put SHA256 sum to PKGBUILD file, and generate .SRCINFO
+        working-directory: aur
+        run: |
+          sed -i "/sha256sums=/c\sha256sums=('${{ env.tbSum }}')" PKGBUILD
+          sudo -u build makepkg --printsrcinfo > .SRCINFO
+
+      - name: Commit package to aur
+        working-directory: aur
+        run: |
+          git add PKGBUILD .SRCINFO
+          git commit -m "${{ gitea.event.release.body//\"/\\\" }}"
+          GIT_SSH_COMMAND="ssh -i ../key -o 'IdentitiesOnly yes' -o 'StrictHostKeyChecking no'" git push

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "external/qxmpp"]
 	path = external/qxmpp
 	url = https://github.com/qxmpp-project/qxmpp.git
+[submodule "external/storage"]
+	path = external/storage
+	url = https://git.macaw.me/blue/storage
+[submodule "external/lmdbal"]
+	path = external/lmdbal
+	url = gitea@git.macaw.me:blue/lmdbal.git

CHANGELOG.md

@@ -1,5 +1,90 @@
 # Changelog
 
+## Squawk 0.2.3 (February 04, 2024)
+### Bug fixes
+- "Add contact" and "Join conference" menu are enabled once again (pavavno)!
+- availability is now read from the same section of config file it was stored
+- automatic avatars (if a contact doesn't have one) get generated once again
+
+### Improvements
+- deactivated accounts now don't appear in combobox of "Add contact" and "Join conference" dialogues
+- all of the expandable roster items now get saved between launches
+- settings file on the disk is not rewritten every roster element expansion or collapse
+- removed unnecessary own vcard request at sturtup (used to do it to discover my own avatar)
+- vcard window now is Info system and it can display more information
+- reduced vcard request spam in MUCs
+
+### New features
+- now you can enable tray icon from settings!
+- there is a job queue now, this allowes to spread a bit the spam on the server at connection time
+- squawk now queries clients of it's peers, you can see what programs other people use
+
+## Squawk 0.2.2 (May 05, 2022)
+### Bug fixes
+- now when you remove an account it actually gets removed
+- segfault on uninitialized Availability in some rare occasions
+- fixed crash when you open a dialog with someone that has only error messages in archive
+- message height is now calculated correctly on Chinese and Japanese paragraphs
+- the app doesn't crash on SIGINT anymore
+
+### Improvements
+- there is a way to disable an account and it wouldn't connect when you change availability
+- if you cancel password query an account becomes inactive and doesn't annoy you anymore
+- if you filled password field and chose KWallet as a storage Squawk wouldn't ask you again for the same password
+- if left the password field empty and chose KWallet as a storage Squawk will try to get that password from KWallet before asking you to input it
+- accounts now connect to the server asynchronously - if one is stopped on password prompt another is connecting
+- actualized translations, added English localization file
+
+### New features
+- new "About" window with links, license, gratitudes
+- if the authentication failed Squawk will ask again for your password and login
+- now there is an amount of unread messages showing on top of Squawk launcher icon
+- notifications now have buttons to open a conversation or to mark that message as read
+
+## Squawk 0.2.1 (Apr 02, 2022)
+### Bug fixes
+- build in release mode now no longer spams warnings
+- build now correctly installs all build plugin libs
+- a bug where the correction message was received, the indication was on but the text didn't actually change
+- message body now doesn't intecept context menu from the whole message
+- message input now doesn't increase font when you remove everything from it
+
+### Improvements
+- reduced amount of places where platform specific path separator is used
+- now message input is automatically focused when you open a dialog or a room
+- what() method on unhandled exception now actually tells what happened
+
+### New features
+- the settings are here! You con config different stuff from there
+- now it's possible to set up different qt styles from settings
+- if you have KConfig nad KConfigWidgets packages installed - you can choose from global color schemes
+- it's possible now to choose a folder where squawk is going to store downloaded files
+- now you can correct your message
+
+## Squawk 0.2.0 (Jan 10, 2022)
+### Bug fixes
+- carbon copies switches on again after reconnection
+- requesting the history of the current chat after reconnection
+- global availability (in drop down list) gets restored after reconnection
+- status icon in active chat changes when presence of the pen pal changes
+- infinite progress when open the dialogue with something that has no history to show
+- fallback icons for buttons, when no supported theme is installed (shunf4)
+- better handling messages with no id (shunf4)
+- removed dependency: uuid, now it's on Qt (shunf4)
+- better requesting latest history (shunf4)
+
+### Improvements
+- slightly reduced the traffic on the startup by not requesting history of all MUCs
+- completely rewritten message feed, now it works way faster and looks cooler
+- OPTIONAL RUNTIME dependency: "KIO Widgets" that is supposed to allow you to open a file in your default file manager
+- show in folder now is supposed to try it's best to show file in folder, even you don't have KIO installed
+- once uploaded local files don't get second time uploaded - the remote URL is reused
+- way better compilation time (vae)
+
+### New features
+- pasting images from clipboard to attachment (shunf4)
+- possible compilation for windows and macOS (shunf4)
+
 ## Squawk 0.1.5 (Jul 29, 2020)
 ### Bug fixes
 - error with sending attached files to the conference

CMakeLists.txt

@@ -1,117 +1,247 @@
-cmake_minimum_required(VERSION 3.0)
-project(squawk)
+cmake_minimum_required(VERSION 3.16)
+project(squawk VERSION 0.2.3 LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_CXX_STANDARD 14)
+cmake_policy(SET CMP0076 NEW)
+cmake_policy(SET CMP0077 NEW)
+cmake_policy(SET CMP0079 NEW)
+cmake_policy(SET CMP0167 NEW)
+set(CMAKE_CXX_STANDARD 17)
 
+set(QT_VERSION_MAJOR 5)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 include(GNUInstallDirs)
-include_directories(.)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
-find_package(Qt5Widgets CONFIG REQUIRED)
-find_package(Qt5LinguistTools)
-
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Debug)
+set(WIN32_FLAG "")
+set(MACOSX_BUNDLE_FLAG "")
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+  if (WIN32)
+    set(WIN32_FLAG WIN32)
+  endif(WIN32)
+  if (APPLE)
+    set(MACOSX_BUNDLE_FLAG MACOSX_BUNDLE)
+  endif(APPLE)
 endif()
 
-set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wextra")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+add_executable(squawk ${WIN32_FLAG} ${MACOSX_BUNDLE_FLAG})
+target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR})
+
+option(SYSTEM_QXMPP "Use system qxmpp lib" ON)
+option(SYSTEM_LMDBAL "Use system lmdbal lib" ON)
+option(WITH_KWALLET "Build KWallet support module" ON)
+option(WITH_KIO "Build KIO support module" ON)
+option(WITH_KCONFIG "Build KConfig support module" ON)
+option(WITH_OMEMO "Build OMEMO support module" OFF)   #it should be off by default untill I sort the problems out
+option(WITH_SIMPLE_CRYPT "Builds with SimpleCrypt to obfuscate password" ON)
+
+# Dependencies
+## Qt
+if (NOT DEFINED QT_VERSION_MAJOR)
+  find_package(QT NAMES Qt6 Qt5 CONFIG REQUIRED COMPONENTS Widgets DBus Gui Xml Network Core)
+else ()
+  find_package(Qt${QT_VERSION_MAJOR} CONFIG REQUIRED COMPONENTS Widgets DBus Gui Xml Network Core)
+endif()
+
+find_package(Boost COMPONENTS)
+
+target_include_directories(squawk PRIVATE ${Boost_INCLUDE_DIRS})
+
+## OMEMO
+if (WITH_OMEMO)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(OMEMO libomemo-c)
+    if (OMEMO_FOUND)
+      target_compile_definitions(squawk PRIVATE WITH_OMEMO)
+      message("Building with support of OMEMO")
+    else ()
+      message("libomemo-c package wasn't found, trying to build without OMEMO support")
+      set(WITH_OMEMO OFF)
+    endif ()
+  else ()
+    message("PKG_CONFIG module wasn't found, can not check libomemo-c support, trying to build without OMEMO support")
+    set(WITH_OMEMO OFF)
+  endif ()
+endif ()
+
+## KIO
+if (WITH_KIO)
+  find_package(KF5KIO CONFIG)
+
+  if (NOT KF5KIO_FOUND)
+    set(WITH_KIO OFF)
+    message("KIO package wasn't found, KIO support modules wouldn't be built")
+  else ()
+    target_compile_definitions(squawk PRIVATE WITH_KIO)
+    message("Building with support of KIO")
+  endif ()
+endif ()
+
+## KWallet
+if (WITH_KWALLET)
+  find_package(KF5Wallet CONFIG)
+
+  if (NOT KF5Wallet_FOUND)
+    set(WITH_KWALLET OFF)
+    message("KWallet package wasn't found, KWallet support module wouldn't be built")
+  else ()
+    target_compile_definitions(squawk PRIVATE WITH_KWALLET)
+    message("Building with support of KWallet")
+  endif ()
+endif ()
+
+## KConfig
+if (WITH_KCONFIG)
+  find_package(KF5Config CONFIG)
+  if (NOT KF5Config_FOUND)
+    set(WITH_KCONFIG OFF)
+    message("KConfig package wasn't found, KConfig support modules wouldn't be built")
+  else()
+    find_package(KF5ConfigWidgets CONFIG)
+    if (NOT KF5ConfigWidgets_FOUND)
+      set(WITH_KCONFIG OFF)
+      message("KConfigWidgets package wasn't found, KConfigWidgets support modules wouldn't be built")
+    else()
+      target_compile_definitions(squawk PRIVATE WITH_KCONFIG)
+      message("Building with support of KConfig")
+      message("Building with support of KConfigWidgets")
+    endif()
+  endif()
+endif()
+
+## QXmpp
+if (SYSTEM_QXMPP)
+  if (WITH_OMEMO)
+    find_package(QXmpp CONFIG COMPONENTS Omemo)
+  else ()
+    find_package(QXmpp CONFIG)
+  endif ()
+
+  if (NOT QXmpp_FOUND)
+    set(SYSTEM_QXMPP OFF)
+    message("QXmpp package wasn't found, trying to build with bundled QXmpp")
+  else ()
+    message("Building with system QXmpp")
+  endif ()
+endif ()                #it's endif() + if() and not else() because I want it to have a fallback behaviour
+if (NOT SYSTEM_QXMPP)   #we can fail finding system QXmpp and this way we'll check bundled before failing completely
+  message("Building with bundled QXmpp")
+
+  target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR}/external/qxmpp/src/base)
+  target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR}/external/qxmpp/src/client)
+  target_include_directories(squawk PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/external/qxmpp/src)
+
+  if (WITH_OMEMO)
+    target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR}/external/qxmpp/src/omemo)
+    target_include_directories(squawk PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/external/qxmpp/src/omemo)
+    set(BUILD_OMEMO ON)
+    set(BUILD_TESTS OFF)
+  else ()
+    set(BUILD_OMEMO OFF)
+  endif ()
+  add_subdirectory(external/qxmpp)
+  add_library(QXmpp::QXmpp ALIAS QXmppQt${QT_VERSION_MAJOR})
+  if (WITH_OMEMO)
+    target_include_directories(QXmppOmemoQt${QT_VERSION_MAJOR} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/external/qxmpp/src)
+    add_library(QXmpp::Omemo ALIAS QXmppOmemoQt${QT_VERSION_MAJOR})
+  endif ()
+endif ()
+
+## LMDBAL
+if (SYSTEM_LMDBAL)
+  find_package(lmdbal)
+  if (NOT lmdbal_FOUND)
+    set(SYSTEM_LMDBAL OFF)
+    message("LMDBAL package wasn't found, trying to build with bundled LMDBAL")
+  else ()
+    message("Building with system LMDBAL")
+  endif ()
+else()
+  message("Building with bundled LMDBAL")
+  set(BUILD_STATIC ON)
+  add_subdirectory(external/lmdbal)
+  add_library(LMDBAL::LMDBAL ALIAS LMDBAL)
+endif()
+
+## Linking
+target_link_libraries(squawk
+  PRIVATE
+  Qt${QT_VERSION_MAJOR}::Core
+  Qt${QT_VERSION_MAJOR}::Widgets
+  Qt${QT_VERSION_MAJOR}::DBus
+  Qt${QT_VERSION_MAJOR}::Network
+  Qt${QT_VERSION_MAJOR}::Gui
+  Qt${QT_VERSION_MAJOR}::Xml
+  LMDBAL::LMDBAL
+  QXmpp::QXmpp
+)
+
+if (WITH_OMEMO)
+  target_link_libraries(squawk PRIVATE QXmpp::Omemo)
+endif ()
+
+if (WITH_SIMPLE_CRYPT)
+  target_compile_definitions(squawk PRIVATE WITH_SIMPLE_CRYPT)
+  add_subdirectory(external/simpleCrypt)
+  target_link_libraries(squawk PRIVATE simpleCrypt)
+endif ()
+
+## Link thread libraries on Linux
+if(UNIX AND NOT APPLE)
+  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package(Threads REQUIRED)
+  target_link_libraries(squawk PRIVATE Threads::Threads)
+endif()
+
+## Build type
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Debug)
+endif ()
+
 message("Build type: ${CMAKE_BUILD_TYPE}")
 
+if(CMAKE_COMPILER_IS_GNUCXX)
+  set (COMPILE_OPTIONS -fno-sized-deallocation)   # for eliminating _ZdlPvm
+  if (CMAKE_BUILD_TYPE STREQUAL "Release")
+    list(APPEND COMPILE_OPTIONS -O3)
+  endif()
+  if (CMAKE_BUILD_TYPE STREQUAL Debug)
+    list(APPEND COMPILE_OPTIONS -g)
+    list(APPEND COMPILE_OPTIONS -Wall)
+    list(APPEND COMPILE_OPTIONS -Wextra)
+  endif()
 
-set(squawk_SRC
-  main.cpp
-  exception.cpp
-  signalcatcher.cpp
-  shared/global.cpp
-  shared/utils.cpp
-  shared/message.cpp
-  shared/vcard.cpp
-  shared/icons.cpp
-)
+  message("Compilation options: " ${COMPILE_OPTIONS})
+  target_compile_options(squawk PRIVATE ${COMPILE_OPTIONS})
+endif(CMAKE_COMPILER_IS_GNUCXX)
 
-set(squawk_HEAD
-  exception.h
-  signalcatcher.h
-  shared.h
-  shared/enums.h