Maxim Cournoyer authored 2 years ago and Sébastien Blin committed 2 years ago

Relates to <#882>.

This problem was discovered when attempting to build the test suite:

   ld: ../src/libclient/liblibjamiclient.a(avmodel.cpp.o): undefined
   reference to symbol 'xcb_get_setup'

* CMakeLists.txt: [!(APPLE or MSVC] Move xcb includes and link directives to...
* src/libclient/CMakeLists.txt [!(APPLE or MSVC]: ... here.

Change-Id: If9b6653e157081300caad8f13cafe4979a49630b

Nicolas Vengeon authored 2 years ago and Sébastien Blin committed 2 years ago

Change-Id: Ia54d01ec56e01d0c04e360ec06da87aa37fe74fe
GitLab: #510

This is the first in a series for cleaning up the top directory (root)
of the repository and move various files/folders into nicely organized
directory structures.

GitLab: #749
Change-Id: If59b74fff981df242bc26e62a070bdb81d7baded

* src/libclient/CMakeLists.txt: Set the right 'hint' path for the call
to find_library for ffmpeg avutil from daemon's contrib, to match the
directory name used by daemon's 'contrib/bootstrap' script: the name
of the directory is the value returned by the C++ compiler (either GNU
or Clang) when invoked with the '-dumpmachine' option.

Change-Id: I03de150aa941a1e32471e5b4cbe507e5d09787f5

Maxim Cournoyer authored 2 years ago and Amin Bandali committed 2 years ago

Otherwise, when libjami is compiled as a shared library and
dynamically linked with all its dependencies (including ffmpeg), the
build would fail with:

  ld: src/libclient/liblibjamiclient.a(directrenderer.cpp.o):
  undefined reference to symbol 'av_frame_alloc@@LIBAVUTIL_56'
  ld: /gnu/store/...-ffmpeg-jami-4.4.2/lib/libavutil.so.56:
  error adding symbols: DSO missing from command line

* src/libclient/CMakeLists.txt: Call find_library for avutil, with
hints for contrib path on GNU/Linux and macOS.
[ENABLE_LIBWRAP]: Add target link to avutil if not on Windows.

Co-authored-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Co-authored-by: Amin Bandali <amin.bandali@savoirfairelinux.com>
Change-Id: Id9681132b046fd828002cd3daa24afc8a6dd1eae

Aline Gondim Santos authored 2 years ago and Sébastien Blin committed 2 years ago

Change-Id: I749159077ac20da0862dcfc774729bff4a356404

Amin Bandali authored 2 years ago and Sébastien Blin committed 2 years ago

The CMAKE_<LANG>_COMPILER_VERSION variables have been available in
CMake for many years, so let's use them.

Change-Id: I133b2bf9ea4ea5a50b178b75ca2d3b796a0574aa

Sébastien Blin authored 2 years ago and Amin Bandali committed 2 years ago

Change-Id: Idc960c96e4647dbb6f8c1d64f545fe25c80bbaa5

Sébastien Blin authored 2 years ago and Amin Bandali committed 2 years ago

It was badly set as client-qt never used this but is enabled
since the merge of jami-libclient, making it not possible to
remove an account.

Change-Id: If7acb9aedacaa9309f741078e89a900ee2940df9

Amin Bandali authored 2 years ago and Adrien Béraud committed 2 years ago

Change-Id: I67e37155cdca75b83943497c008aaf18edb9a95f

GitLab: #749
Change-Id: Ie58f458d44b1d643632842e2fb44aad19571405b

This is libjamiclient from the jami-libclient.git repository as of
767c45b8b09806ac05cbada720864df93588c047, with the following changes:

* src/libclient/newaccountmodel.cpp:
(NewAccountModelPimpl::removeFromAccounts): The lock wait inside
'#ifdef CHK_FREEABLE_BEFORE_ERASE_ACCOUNT' was not updated when the
type of 'accounts' was changed over the years from this:
std::map<std::string, account::Info>
to this:
std::map<QString, std::pair<account::Info, std::shared_ptr<Database>>>
Basically we need to get the 'first' of the pair for 'account::Info'.
So we now do that.

* src/libclient/avmodel.cpp:
* src/libclient/callbackshandler.cpp:
* src/libclient/contactmodel.cpp:
* src/libclient/conversationmodel.cpp:
* src/libclient/database.cpp:
* src/libclient/namedirectory.cpp:
* src/libclient/newaccountmodel.cpp:
* src/libclient/newcallmodel.cpp:
* src/libclient/newdevicemodel.cpp:
* src/libclient/peerdiscoverymodel.cpp:
* src/libclient/pluginmodel.cpp:
* src/libclient/smartinfohub.cpp:
* src/libclient/vcard.h:
* src/libclient/authority/storagehelper.cpp:  Replace Qt's 'foreach'
with 'Q_FOREACH' and its 'emit' with 'Q_EMIT' because in the client-qt
code base we have '-DQT_NO_KEYWORDS' to avoid conflicts with other
libraries we use.

* cmake/FindLibJami.cmake: Import cmake/FindRing.cmake from the
jami-libclient.git repository.  Then, rename RING_BUILD_DIR to
LIBJAMI_BUILD_DIR (though the old name is still supported for now).
Also update other references of Ring to Jami.  Further, add additional
calls to 'find_library' to make sure specified local paths for libjami
are checked before system-wide ones (in case of older/obsolete libjami
being available system-wide, which might happen on GNU/Linux systems).

* translations/lrc_*.ts: Import translation files from the libclient
repository.  The message location paths were corrected by running
"sed -i 's|../src|&/libclient|g' lrc_*.ts" in 'translations/'.

.tx/config: Add section for the newly-imported libclient translations.

* CMakeLists.txt: Reformat, plus various fixes and cleanups, such as
changing indentation to 2 spaces and wrapping lines at 70 characters,
renaming the parent directory of translations from 'ring' to 'jami',
and using all lowercase function calls.  Also add copyright headers.

* src/app/appsettingsmanager.cpp:
(AppSettingsManager::loadTranslations):
* src/app/utilsadapter.cpp (UtilsAdapter::supportedLang): Update to
adapt to the renaming of the parent directory of translations from
'ring' to 'jami'.

GitLab: #748
Change-Id: I86e3b0fb30e554755023e7b858b6a0d132cd59ab