Removing qnx 7.0 stuff

recipes/glib/all/conandata.yml

@@ -50,67 +50,3 @@ patches:
       patch_type: bugfix
       patch_description: fix for clang compilation
       patch_source: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2898
-  "2.76.1":
-    - patch_file: "patches/0002-2.76.x-qnx_meson_build.patch"
-      patch_type: portability
-      patch_description: Adding qnx version to defines
-    - patch_file: "patches/0003-2.76.x-glocalfile_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir include header
-    - patch_file: "patches/0004-qnx700_h.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir header file
-    - patch_file: "patches/0005-qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir source file
-    - patch_file: "patches/0006-2.76.x-build_qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir build source
-  "2.76.2":
-    - patch_file: "patches/0002-2.76.x-qnx_meson_build.patch"
-      patch_type: portability
-      patch_description: Adding qnx version to defines
-    - patch_file: "patches/0003-2.76.x-glocalfile_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir include header
-    - patch_file: "patches/0004-qnx700_h.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir header file
-    - patch_file: "patches/0005-qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir source file
-    - patch_file: "patches/0006-2.76.x-build_qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir build source
-  "2.76.3":
-    - patch_file: "patches/0002-2.76.x-qnx_meson_build.patch"
-      patch_type: portability
-      patch_description: Adding qnx version to defines
-    - patch_file: "patches/0003-2.76.x-glocalfile_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir
-    - patch_file: "patches/0004-qnx700_h.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir
-    - patch_file: "patches/0005-qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir
-    - patch_file: "patches/0006-2.76.x-build_qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir
-  "2.77.0":
-    - patch_file: "patches/0002-2.77.0-qnx_meson_build.patch"
-      patch_type: portability
-      patch_description: Adding qnx version to defines
-    - patch_file: "patches/0003-2.77.0-glocalfile_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir
-    - patch_file: "patches/0004-qnx700_h.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir
-    - patch_file: "patches/0005-qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir
-    - patch_file: "patches/0006-2.77.0-build_qnx700_c.patch"
-      patch_type: portability
-      patch_description: Adding missing qnx 700 implementation of openat and fdopendir

recipes/glib/all/conanfile.py

@@ -58,7 +58,6 @@ def config_options(self):
         if self.settings.os == "Neutrino":
             del self.options.with_elf
 
-
     def configure(self):
         if self.options.shared:
             self.options.rm_safe("fPIC")
@@ -114,7 +113,6 @@ def generate(self):
 
         if self.settings.os == "Neutrino":
             tc.cross_build["host"]["system"] = "qnx"
-            tc.properties["qnx_version"] = self.settings.get_safe('os.version')
             tc.c_args = ["-Wno-nonnull", "-Wno-format-nonliteral", "-Wno-unused-variable", "-Wno-unused-function", "-Wno-sign-compare", "-Wno-error=implicit-function-declaration", "-Wno-int-conversion"]
             tc.c_link_args.append("-lm")
             tc.c_link_args.append("-lsocket")
@@ -231,13 +229,10 @@ def package_info(self):
             self.cpp_info.components["gmodule-export-2.0"].sharedlinkflags.append("-Wl,--export-dynamic")
             self.cpp_info.components["gmodule-2.0"].sharedlinkflags.append("-Wl,--export-dynamic")
             self.cpp_info.components["glib-2.0"].system_libs.append("m")
-
-            if self.settings.os.version == "7.0":
-                self.cpp_info.components["gmodule-no-export-2.0"].system_libs.append("dl")
-                self.cpp_info.components["gio-2.0"].system_libs.append("dl")
-            elif self.settings.os.version == "7.1":
-                self.cpp_info.components["gmodule-no-export-2.0"].system_libs.append("c")
-                self.cpp_info.components["gio-2.0"].system_libs.append("c")
+            self.cpp_info.components["glib-2.0"].system_libs.append("socket")
+            self.cpp_info.components["gmodule-no-export-2.0"].system_libs.append("c")
+            self.cpp_info.components["gio-2.0"].system_libs.append("c")
+            self.cpp_info.components["gio-2.0"].system_libs.append("socket")
 
         if self.settings.os == "Windows":
             self.cpp_info.components["glib-2.0"].system_libs += ["ws2_32", "ole32", "shell32", "user32", "advapi32"]