Blob Blame History Raw
diff -up firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/build.rs
--- firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver	2020-08-17 20:34:46.000000000 +0200
+++ firefox-78.2.0/third_party/rust/libdbus-sys/build.rs	2020-09-09 21:06:34.932374254 +0200
@@ -3,5 +3,5 @@ extern crate pkg_config;
 fn main() {
     // See https://github.com/joshtriplett/metadeps/issues/9 for why we don't use
     // metadeps here, but instead keep this manually in sync with Cargo.toml.
-    pkg_config::Config::new().atleast_version("1.6").probe("dbus-1").unwrap();
+    pkg_config::Config::new().atleast_version("1.2").probe("dbus-1").unwrap();
 }
diff -up firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json
--- firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver	2020-08-17 20:35:05.000000000 +0200
+++ firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json	2020-09-09 21:11:37.045287830 +0200
@@ -1 +1 @@
-{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"9fbc218277d76a570c01c5795a7c8008f5458317cc036d7c88b1dc1a4af22fb7","src/lib.rs":"c8a0d43a3b7e9c8828d4946437379f1985492bd6b04fdd5e967bbcace2197c3d"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"}
\ No newline at end of file
+{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"41d24ea34bd37eb7a47253ac0681da2dde73e52caf04bbcecf795965e5d36466","src/lib.rs":"31e939a4a7f537265a84c91ba940ac31ac0f66c53a49971f1b21bbd2e4a7b5e9"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"}
diff -up firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs
--- firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver	2020-08-17 20:34:38.000000000 +0200
+++ firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs	2020-09-09 21:06:34.933374260 +0200
@@ -252,13 +252,14 @@ extern "C" {
     pub fn dbus_signature_validate_single(signature: *const c_char, error: *mut DBusError) -> u32;
 
     pub fn dbus_threads_init_default() -> c_int;
+}
+    pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32 {return 1;}
+    pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32 {return 1;}
+    pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32 {return 1;}
+    pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32 {return 1;}
+    pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32 {return 1;}
 
-    pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32;
-    pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32;
-    pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32;
-    pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32;
-    pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32;
-
+extern "C" {
     pub fn dbus_watch_get_enabled(watch: *mut DBusWatch) -> u32;
     pub fn dbus_watch_get_flags(watch: *mut DBusWatch) -> c_uint;
     pub fn dbus_watch_get_unix_fd(watch: *mut DBusWatch) -> c_int;