Skip to content

Commit 266911a

Browse files
committed
Fix build with upcoming rust 1.36.
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.
1 parent baf80b4 commit 266911a

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

www/tor-browser/browser/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $OpenBSD: Makefile,v 1.33 2019/06/25 20:25:23 sthen Exp $
1+
# $OpenBSD: Makefile,v 1.34 2019/07/02 16:52:09 landry Exp $
22
# Some of this comes from www/firefox-esr as apropos, since Tor
33
# browser is a fork of ESR. It is a good idea to look at that
44
# Makefile when editing this one (ESR versions not always the same).
@@ -15,7 +15,7 @@ PATCHORIG = .pat.orig
1515

1616
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
1717
DISTNAME = ${BROWSER_NAME}-${TB_VERSION}
18-
REVISION = 0
18+
REVISION = 1
1919

2020
SO_VERSION = 4.0
2121
MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
$OpenBSD: patch-servo_components_style_build_gecko_rs,v 1.1 2019/07/02 16:52:09 landry Exp $
2+
3+
Fix build with rust 1.36.
4+
5+
Index: servo/components/style/build_gecko.rs
6+
--- servo/components/style/build_gecko.rs.orig
7+
+++ servo/components/style/build_gecko.rs
8+
@@ -36,6 +36,7 @@ mod bindings {
9+
use std::fs::{self, File};
10+
use std::io::{Read, Write};
11+
use std::path::{Path, PathBuf};
12+
+ use std::panic::UnwindSafe;
13+
use std::process::{Command, exit};
14+
use std::slice;
15+
use std::sync::Mutex;
16+
@@ -384,6 +385,7 @@ mod bindings {
17+
fn generate_structs() {
18+
#[derive(Debug)]
19+
struct Callbacks(HashMap<String, RegexSet>);
20+
+ impl UnwindSafe for Callbacks {}
21+
impl ParseCallbacks for Callbacks {
22+
fn enum_variant_behavior(&self,
23+
enum_name: Option<&str>,

0 commit comments

Comments
 (0)