summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2020-02-12 14:07:47 +0100
committerMartin Stransky <stransky@redhat.com>2020-02-12 14:07:47 +0100
commite302ac42fff2027f6039e7c077ff2c51d90fccad (patch)
tree7e4e9e452a54fe46f1ef2f842349a20427740646
parentSet api keys to full patch (diff)
parentBuild fixes (diff)
downloadlibrewolf-fedora-ff-e302ac42fff2027f6039e7c077ff2c51d90fccad.tar.gz
librewolf-fedora-ff-e302ac42fff2027f6039e7c077ff2c51d90fccad.tar.bz2
librewolf-fedora-ff-e302ac42fff2027f6039e7c077ff2c51d90fccad.zip
Merge branch 'master' into f31
-rw-r--r--firefox-wayland.sh.in2
-rw-r--r--firefox-x11.sh.in2
-rw-r--r--firefox.sh.in2
-rw-r--r--firefox.spec5
4 files changed, 7 insertions, 4 deletions
diff --git a/firefox-wayland.sh.in b/firefox-wayland.sh.in
index ec0923d..bd68068 100644
--- a/firefox-wayland.sh.in
+++ b/firefox-wayland.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
#
# Run Firefox under Wayland
#
diff --git a/firefox-x11.sh.in b/firefox-x11.sh.in
index 6f9f760..94045c9 100644
--- a/firefox-x11.sh.in
+++ b/firefox-x11.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
#
# Run Firefox on X11 backend
#
diff --git a/firefox.sh.in b/firefox.sh.in
index 4fe71e4..f111801 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
diff --git a/firefox.spec b/firefox.spec
index 19015e7..fb07136 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,5 @@
# Set to true if it's going to be submitted as update.
-%global release_build 1
+%global release_build 0
%global debug_build 0
%global build_with_clang 0
%global build_with_asan 0
@@ -143,6 +143,7 @@ Patch41: build-disable-elfhack.patch
Patch44: build-arm-libopus.patch
#Patch45: build-disable-multijobs-rust.patch
Patch46: firefox-nss-version.patch
+Patch47: fedora-shebang-build.patch
# Fedora specific patches
Patch215: firefox-enable-addons.patch
@@ -339,6 +340,7 @@ This package contains results of tests executed during build.
%patch26 -p1 -b .icu
%endif
#%patch46 -p1 -b .nss-version
+%patch47 -p1 -b .fedora-shebang
# Fedora patches
%patch215 -p1 -b .addons
@@ -475,6 +477,7 @@ echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .
# Remove executable bit to make brp-mangle-shebangs happy.
chmod -x third_party/rust/itertools/src/lib.rs
chmod a-x third_party/rust/gfx-backend-vulkan/src/*.rs
+chmod a-x third_party/rust/gfx-hal/src/*.rs
#---------------------------------------------------------------------
bgstack15