File licq-gcc6-c11-shared_ptr-to-bool.patch of Package licq

Overview Repositories Revisions Requests Users Attributes Meta

File licq-gcc6-c11-shared_ptr-to-bool.patch of Package licq

Index: b/src/licq.cpp
===================================================================
--- a/src/licq.cpp
+++ b/src/licq.cpp
@@ -567,19 +567,30 @@ bool CLicq::Init(int argc, char **argv)
         sprintf(szKey, "Plugin%d", i + 1);
         if (!licqConf.get(szKey, pluginName))
           continue;
-
-        bool loaded = LoadPlugin(pluginName, argc, argv);
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 600)
+        bool loaded = (LoadPlugin(pluginName, argc, argv) != nullptr);
+#else
+	bool loaded = LoadPlugin(pluginName, argc, argv);
+#endif
 
         // 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")
         {
           gLog.warning(tr("Plugin kde-gui is no longer available, trying to load kde4-gui instead."));
-          loaded = LoadPlugin("kde4-gui", argc, argv);
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 600)
+          loaded = (LoadPlugin("kde4-gui", argc, argv) != nullptr);
+#else
+	  loaded = LoadPlugin("kde4-gui", argc, argv);
+#endif
         }
         if (!loaded && (pluginName == "qt-gui" || pluginName == "kde-gui"))
         {
           gLog.warning(tr("Plugin %s is no longer available, trying to load qt4-gui instead."), pluginName.c_str());
-          loaded = LoadPlugin("qt4-gui", argc, argv);
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 600)
+          loaded = (LoadPlugin("qt4-gui", argc, argv) != nullptr);
+#else
+	  loaded = LoadPlugin("qt4-gui", argc, argv);
+#endif
         }
 
         if (!loaded)

Places

File licq-gcc6-c11-shared_ptr-to-bool.patch of Package licq

Places