[konheko] fix compatibility with new sdk and clean up validator issues

.gitlab-ci.yml

-image: coderus/sailfishos-platform-sdk:3.3.0.14
+image: coderus/sailfishos-platform-sdk:3.4.0.22
 
 cache:
   key: ${CI_JOB_NAME}
@@ -12,7 +12,7 @@ build:
     - sdk-assistant list
     - cp -a . /home/nemo/build
     - pushd /home/nemo/build
-    - mb2 -t SailfishOS-3.3.0.14-armv7hl build
+    - mb2 -t SailfishOS-3.4.0.22-armv7hl build
     - popd
     - mv /home/nemo/build/RPMS .
     - mv /home/nemo/build/.build/ ./.build/ 2>/dev/null

harbour-konheko.desktop

 [Desktop Entry]
 Type=Application
 Icon=harbour-konheko
-Exec=invoker -s --type=silica-qt5 /usr/bin/harbour-konheko
+Exec=harbour-konheko
+X-Nemo-Application-Type=silica-qt5
 Name=Konheko
 Categories=Chat;Network
 # translation example:
@@ -9,4 +10,4 @@ Categories=Chat;Network
 #
 # Remember to comment out the following line, if you do not want to use
 # a different app name in German locale (de).
-Name[de]=Konheko
+#Name[de]=Konheko

meson.build

@@ -6,6 +6,7 @@ inc = include_directories('src')
 
 cmake_pref = get_option('cget_prefix')
 
+#boost_dep = dependency('boost', static: true)
 boost_dep = dependency('boost', modules : [
 	'iostreams',
 	'system',

rpm/harbour-konheko.spec

@@ -11,8 +11,8 @@ Name:       harbour-konheko
 %define bdir %(echo $PWD)/.build/rpmbuilddir-%{_arch}
 
 # disable stripping for debugging
-%global __strip /bin/true
-%global debug_package %{nil}
+#  global __strip /bin/true
+#  global debug_package %{nil}
 # << macros
 
 Summary:    Sailfish OS Matrix Client
@@ -64,13 +64,10 @@ export CXXFLAGS="${CXXFLAGS} -fPIC -Og -DBOOST_ASIO_DISABLE_EPOLL"
 
 [ -f ~/.local/bin/cget ] || (python3 -m pip install --user cget && sed 's/set(B2_TOOLCHAIN_VERSION cget)/set(B2_TOOLCHAIN_VERSION \$\{CMAKE_CXX_COMPILER_VERSION\})/' -i ~/.local/lib/python3.7/site-packages/cget/cmake/boost.cmake)
 
-#~/.local/bin/cget remove -p %{bdir}/%{name}-cget -y Nheko-Reborn/mtxclient
-#rm -Rf %{bdir}/%{name}-cget
-
 ~/.local/bin/cget install -p %{bdir}/%{name}-cget -DCMAKE_BUILD_TYPE=DEBUG
 
-export BOOST_ROOT=%{bdir}/%{name}-cget/
-export CMAKE_PREFIX_PATH=%{bdir}/%{name}-cget/
+# Can't use prefix plain BOOST_ROOT=%{bdir}/%{name}-cget/, as meson does not like symlinks
+export BOOST_ROOT=%{bdir}/%{name}-cget/cget/pkg/boost/install
 
 
 #rm -rf %{bdir}/build

rpm/harbour-spoon.yaml → rpm/harbour-konheko.yaml

@@ -32,10 +32,7 @@ PkgConfigBR:
   - keepalive
 
 # Build dependencies without a pkgconfig setup can be listed here
-# PkgBR:
-#   - package-needed-to-build
 PkgBR:
-  #  - opt-gcc6
   - cmake
   - ninja
   - meson

rpm/harbour-spoon.changes.in

-# Rename this file as harbour-matrix.changes to include changelog
-# entries in your RPM file.
-#
-# Add new changelog entries following the format below.
-# Add newest entries to the top of the list.
-# Separate entries from eachother with a blank line.
-#
-# Alternatively, if your changelog is automatically generated (e.g. with
-# the git-change-log command provided with Sailfish OS SDK), create a
-# harbour-matrix.changes.run script to let mb2 run the required commands for you.
-
-# * date Author's Name <author's email> version-release
-# - Summary of changes
-
-* Sun Apr 13 2014 Jack Tar <jack.tar@example.com> 0.0.1-1
-- Scrubbed the deck
-- Hoisted the sails
-