Merge pull request #1527 from FreeRDP/flatpack_stats

Make compilation and stats collection FLATPAK aware

Author: giox069

CMakeLists.txt

@@ -183,6 +183,10 @@ if(SNAP_BUILD)
     add_definitions(-DSNAP_BUILD)
 endif()
 
+if(FLATPAK_BUILD)
+	add_definitions(-DFLATPAK_BUILD)
+endif()
+
 # Uninstall support
 configure_file(
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"

flatpak/org.remmina.Remmina.json

@@ -472,7 +472,8 @@
             "config-opts": [
                 "-DCMAKE_BUILD_TYPE:STRING=Release",
                 "-DWITH_MANPAGES:BOOL=OFF",
-                "-DWITH_TELEPATHY:BOOL=OFF"
+                "-DWITH_TELEPATHY:BOOL=OFF",
+                "-DFLATPAK_BUILD:BOOL=ON"
             ],
             "sources": [
                 {

remmina/src/remmina_stats.c

@@ -360,6 +360,14 @@ JsonNode *remmina_stats_get_version()
 #else
 	json_builder_add_int_value(b, 0);
 #endif
+
+	json_builder_set_member_name(b, "flatpak_build");
+#ifdef FLATPAK_BUILD
+	json_builder_add_int_value(b, 1);
+#else
+	json_builder_add_int_value(b, 0);
+#endif
+
 	json_builder_end_object(b);
 	r = json_builder_get_root(b);
 	g_object_unref(b);