detect static library and regenerate gir

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

gio/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

gio/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

glib/gobject-sys/Cargo.toml

@@ -1,6 +1,5 @@
 [build-dependencies]
 system-deps = "7"
-pkg-config = "0.3"
 
 [dependencies]
 libc = "0.2"
@@ -29,7 +28,7 @@ v2_82 = ["v2_80"]
 name = "gobject_sys"
 
 [package]
-build = "build.rs"
+build = "build_manual.rs"
 description = "FFI bindings to libgobject-2.0"
 keywords = ["gobject", "ffi", "gtk-rs", "gnome"]
 name = "gobject-sys"
@@ -99,3 +98,7 @@ version = "2.81"
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
 all-features = true
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = ["cfg(msvc_dll)"]

glib/gobject-sys/build_manual.rs

@@ -0,0 +1,23 @@
+#[cfg(docsrs)]
+fn main() {} // prevent linking libraries to avoid documentation failure
+
+#[cfg(not(docsrs))]
+fn main() {
+    match system_deps::Config::new().probe() {
+        Ok(deps) => {
+            let msvc = std::env::var("CARGO_CFG_TARGET_ENV")
+                .expect("Cargo should set this variable")
+                == "msvc";
+            let lib = deps
+                .get_by_name("gobject_2_0")
+                .expect("The dependency key for gobject in its Cargo.toml should not change");
+            if msvc && !lib.statik {
+                println!("cargo:rustc-cfg=msvc_dll");
+            }
+        }
+        Err(s) => {
+            println!("cargo:warning={s}");
+            std::process::exit(1);
+        }
+    }
+}

glib/gobject-sys/src/manual.rs

@@ -1,24 +1,30 @@
 use glib_sys::GType;
 
-#[cfg(not(target_os = "windows"))]
+#[cfg(not(msvc_dll))]
 type GParamSpecType = *const GType;
 
-#[cfg(target_os = "windows")]
+#[cfg(msvc_dll)]
 type GParamSpecType = *const *const GType;
 
+// When using MSVC, variables marked with dllexport only have the load time linking version
+// (prefixed by `__imp_`) publicly exported in the library. This means that it is necessary to either
+// call dllimport those symbols (in Rust, this only happens when using the `#[link]` attribute), or
+// to manually link to the `__imp_` version when using dynamic libraries. Since we need more customization
+// of the library name than the link attribute currently allows, we choose the second option.
 extern "C" {
-    #[cfg_attr(target_os = "windows", link_name = "__imp_g_param_spec_types")]
+    #[cfg_attr(msvc_dll, link_name = "__imp_g_param_spec_types")]
     static g_param_spec_types: GParamSpecType;
 }
 
 /// # Safety
 /// This should be safe as long as the offset added to g_param_spec_types is in bounds.
 pub unsafe fn g_param_spec_types_get_type(offset: usize) -> GType {
-    #[cfg(not(target_os = "windows"))]
+    #[cfg(not(msvc_dll))]
     let ptr = g_param_spec_types;
 
-    // One more step of indirection on windows because of the __imp_ prefix
-    #[cfg(target_os = "windows")]
+    // One more step of indirection on windows because `__imp_` signifies a pointer to the
+    // underlying symbol https://learn.microsoft.com/en-us/windows/win32/dlls/load-time-dynamic-linking.
+    #[cfg(msvc_dll)]
     let ptr = *g_param_spec_types;
 
     *ptr.add(offset)

glib/gobject-sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

glib/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

glib/sys/Cargo.toml

@@ -99,16 +99,6 @@ version = "2.80"
 [package.metadata.system-deps.glib_2_0.v2_82]
 version = "2.81"
 
-[package.metadata.system-deps.gobject_2_0]
-name = "gobject-2.0"
-version = "2.56"
-
-[package.metadata.system-deps.gobject_2_0.v2_58]
-version = "2.58"
-
-[package.metadata.system-deps.gobject_2_0.v2_62]
-version = "2.62"
-
 [package.metadata.docs.rs]
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]

glib/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

graphene/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

graphene/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

pango/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

pango/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

pangocairo/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)

pangocairo/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ f0a4546b0a06)
+Generated by gir (https://github.com/gtk-rs/gir @ ea1ee40bf933)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4d1189172a70)