diff -dru licq-1.8.2.orig/src/licq.cpp licq-1.8.2/src/licq.cpp --- licq-1.8.2.orig/src/licq.cpp 2014-06-01 21:16:42.000000000 +0200 +++ licq-1.8.2/src/licq.cpp 2017-05-20 12:09:21.445220446 +0200 @@ -568,7 +568,7 @@ if (!licqConf.get(szKey, pluginName)) continue; - bool loaded = LoadPlugin(pluginName, argc, argv); + GeneralPlugin::Ptr loaded = LoadPlugin(pluginName, argc, argv); // Make upgrade from 1.3.x and older easier by automatically switching from kde/qt-gui to kde4/qt4-gui if (!loaded && pluginName == "kde-gui") diff -dru licq-1.8.2.orig/src/logging/tests/pluginlogsinktest.cpp licq-1.8.2/src/logging/tests/pluginlogsinktest.cpp --- licq-1.8.2.orig/src/logging/tests/pluginlogsinktest.cpp 2014-06-01 21:16:42.000000000 +0200 +++ licq-1.8.2/src/logging/tests/pluginlogsinktest.cpp 2017-05-20 15:12:13.680866917 +0200 @@ -76,7 +76,7 @@ message = NULL; LogSink::Message::Ptr first = sink.popMessage(); - ASSERT_TRUE(first); + ASSERT_TRUE(!!first); EXPECT_EQ("test", first->text); EXPECT_FALSE(sink.popMessage()); diff -dru licq-1.8.2.orig/src/plugin/tests/pluginthreadtest.cpp licq-1.8.2/src/plugin/tests/pluginthreadtest.cpp --- licq-1.8.2.orig/src/plugin/tests/pluginthreadtest.cpp 2014-06-01 21:16:42.000000000 +0200 +++ licq-1.8.2/src/plugin/tests/pluginthreadtest.cpp 2017-05-20 15:12:28.408614664 +0200 @@ -66,7 +66,7 @@ TEST_F(PluginThreadFixture, loadPlugin) { - EXPECT_TRUE(thread.loadPlugin("")); + EXPECT_TRUE(!!thread.loadPlugin("")); } TEST_F(PluginThreadFixture, loadMissingPlugin) diff -dru licq-1.8.2.orig/src/utils/tests/dynamiclibrarytest.cpp licq-1.8.2/src/utils/tests/dynamiclibrarytest.cpp --- licq-1.8.2.orig/src/utils/tests/dynamiclibrarytest.cpp 2014-06-01 21:16:42.000000000 +0200 +++ licq-1.8.2/src/utils/tests/dynamiclibrarytest.cpp 2017-05-20 15:10:32.310604816 +0200 @@ -24,7 +24,7 @@ #ifdef __APPLE__ #define LIBM "libm.dylib" #else -#define LIBM "libm.so" +#define LIBM "libm.so.6" #endif extern "C" int testfunc()