Merge pull request #100 from AppImage/ld_load_libgobject-2.0.so.0

Ld load libgobject 2.0.so.0

Author: TheAssassin

src/libappimage/utils/DLHandle.h

@@ -25,13 +25,37 @@ namespace appimage {
              * @param libName
              * @param mode
              */
-            explicit DLHandle(const std::string& libName, int mode) : libName(libName) {
+            explicit DLHandle(const std::string& libName, int mode) : handle(nullptr), libName(libName) {
                 handle = dlopen(libName.c_str(), mode);
 
-                if (!handle)
+                if (handle == nullptr)
                     throw DLHandleError("Unable to load " + libName);
             }
 
+            /**
+             * Load one of the libraries listed in <libNames> with the given <mode> flags. For details about
+             * the allowed flags see the dlopen doc.
+             * @param libName
+             * @param mode
+             */
+            explicit DLHandle(std::initializer_list<const std::string> libNames, int mode) : handle(nullptr) {
+                for (const auto& item: libNames) {
+                    handle = dlopen(item.c_str(), mode);
+                    if (handle != nullptr) {
+                        libName = item;
+                        break;
+                    }
+                }
+
+                if (handle == nullptr) {
+                    std::string libNamesStr;
+                    for (const auto& item: libNames)
+                        libNamesStr += " " + item;
+
+                    throw DLHandleError("Unable to load any of: " + libNamesStr);
+                }
+            }
+
             virtual ~DLHandle() {
                 dlclose(handle);
             };

src/libappimage/utils/IconHandle.cpp

@@ -224,14 +224,18 @@ namespace appimage {
                 g_object_unref_t object_unref = nullptr;
 
                 /**
-                 * @brief Load libgobject-2.0.so and resolve the symbol addresses required by the IconHandle.
+                 * @brief Load libgobject-2 and resolve the symbol addresses required by the IconHandle.
+                 *
+                 * Known library name by distribution:
+                 * - CentOS: libgobject-2.0.so.0
+                 * - Debian/Ubuntu: libgobject-2.0.so
                  *
                  * Mode comments:
                  * RTLD_LAZY - load the lib only the required symbols
                  * RTLD_NODELETE - do not unload the lib, as it wasn't designed to be used this way it
                  *                  will produce a big crash.
                  */
-                GLibOjbectHandle() : DLHandle("libgobject-2.0.so", RTLD_LAZY | RTLD_NODELETE) {
+                GLibOjbectHandle() : DLHandle({"libgobject-2.0.so", "libgobject-2.0.so.0"}, RTLD_LAZY | RTLD_NODELETE) {
                     DLHandle::loadSymbol(object_unref, "g_object_unref");
                 }
             };