Skip to content

Commit baf80b4

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 74e6bbf commit baf80b4

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

www/firefox-esr/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $OpenBSD: Makefile,v 1.99 2019/06/25 20:25:23 sthen Exp $
1+
# $OpenBSD: Makefile,v 1.100 2019/07/02 16:51:49 landry Exp $
22

33
COMMENT = Firefox web browser, Extended Support Release
44
ONLY_FOR_ARCHS = amd64 i386
@@ -13,7 +13,7 @@ HOMEPAGE = https://www.mozilla.org/firefox/organizations/
1313
PKGNAME = ${MOZILLA_PROJECT}-esr-${MOZILLA_VERSION:S/esr//}
1414
SO_VERSION = 5.0
1515
MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
16-
REVISION = 0
16+
REVISION = 1
1717

1818
CATEGORIES = www
1919

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

0 commit comments

Comments
 (0)