mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 21:09:00 +02:00
commit
14fb155d3e
|
@ -1,26 +0,0 @@
|
||||||
Yep, it's a "return code was ignored" bug.
|
|
||||||
diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c
|
|
||||||
index aaaaaaaaaaa..bbbbbbbbbbb 100644
|
|
||||||
--- a/media/libcubeb/src/cubeb_pulse.c
|
|
||||||
+++ b/media/libcubeb/src/cubeb_pulse.c
|
|
||||||
@@ -473,6 +473,8 @@
|
|
||||||
static int
|
|
||||||
pulse_context_init(cubeb * ctx)
|
|
||||||
{
|
|
||||||
+ int r;
|
|
||||||
+
|
|
||||||
if (ctx->context) {
|
|
||||||
assert(ctx->error == 1);
|
|
||||||
pulse_context_destroy(ctx);
|
|
||||||
@@ -486,9 +488,9 @@
|
|
||||||
WRAP(pa_context_set_state_callback)(ctx->context, context_state_callback, ctx);
|
|
||||||
|
|
||||||
WRAP(pa_threaded_mainloop_lock)(ctx->mainloop);
|
|
||||||
- WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
|
|
||||||
+ r = WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
|
|
||||||
|
|
||||||
- if (wait_until_context_ready(ctx) != 0) {
|
|
||||||
+ if (r < 0 || wait_until_context_ready(ctx) != 0) {
|
|
||||||
WRAP(pa_threaded_mainloop_unlock)(ctx->mainloop);
|
|
||||||
pulse_context_destroy(ctx);
|
|
||||||
ctx->context = NULL;
|
|
|
@ -1,25 +0,0 @@
|
||||||
diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp
|
|
||||||
--- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
|
|
||||||
+++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
|
|
||||||
@@ -36,10 +36,6 @@
|
|
||||||
nsIAboutModule::ALLOW_SCRIPT
|
|
||||||
},
|
|
||||||
{
|
|
||||||
- "buildconfig", "chrome://global/content/buildconfig.html",
|
|
||||||
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
|
|
||||||
- },
|
|
||||||
- {
|
|
||||||
"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
|
|
||||||
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
|
||||||
nsIAboutModule::ALLOW_SCRIPT
|
|
||||||
diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolkit/content/jar.mn
|
|
||||||
--- firefox-55.0.3-orig/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
|
|
||||||
+++ firefox-55.0.3/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
|
|
||||||
@@ -40,7 +40,6 @@
|
|
||||||
content/global/plugins.css
|
|
||||||
content/global/browser-child.js
|
|
||||||
content/global/browser-content.js
|
|
||||||
-* content/global/buildconfig.html
|
|
||||||
content/global/buildconfig.css
|
|
||||||
content/global/contentAreaUtils.js
|
|
||||||
content/global/datepicker.xhtml
|
|
|
@ -1,16 +1,7 @@
|
||||||
{ config, lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }:
|
{ config, lib, callPackage, fetchurl }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
common = opts: callPackage (import ./common.nix opts) {};
|
common = opts: callPackage (import ./common.nix opts) {};
|
||||||
|
|
||||||
# Needed on older branches since rustc: 1.32.0 -> 1.33.0
|
|
||||||
missing-documentation-patch = fetchurl {
|
|
||||||
name = "missing-documentation.patch";
|
|
||||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch"
|
|
||||||
+ "?h=firefox-esr&id=03bdd01f9cf";
|
|
||||||
sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb";
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
|
|
Loading…
Reference in a new issue