-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
found by semarie@ in https://reviews.freebsd.org/D20810#change-K68aYoUXfAu1, regression in rust itself tracked in rust-lang/rust#62301 Builds fine with rust 1.35.
- Loading branch information
Showing
2 changed files
with
25 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
www/tor-browser/browser/patches/patch-servo_components_style_build_gecko_rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
$OpenBSD: patch-servo_components_style_build_gecko_rs,v 1.1 2019/07/02 16:52:09 landry Exp $ | ||
|
||
Fix build with rust 1.36. | ||
|
||
Index: servo/components/style/build_gecko.rs | ||
--- servo/components/style/build_gecko.rs.orig | ||
+++ servo/components/style/build_gecko.rs | ||
@@ -36,6 +36,7 @@ mod bindings { | ||
use std::fs::{self, File}; | ||
use std::io::{Read, Write}; | ||
use std::path::{Path, PathBuf}; | ||
+ use std::panic::UnwindSafe; | ||
use std::process::{Command, exit}; | ||
use std::slice; | ||
use std::sync::Mutex; | ||
@@ -384,6 +385,7 @@ mod bindings { | ||
fn generate_structs() { | ||
#[derive(Debug)] | ||
struct Callbacks(HashMap<String, RegexSet>); | ||
+ impl UnwindSafe for Callbacks {} | ||
impl ParseCallbacks for Callbacks { | ||
fn enum_variant_behavior(&self, | ||
enum_name: Option<&str>, |