mirror of
https://abf.rosa.ru/djam/firefox.git
synced 2025-02-25 02:52:59 +00:00
Merge pull request #1 from law/firefox:rosa2014.1
Use time-independent uuid generator (for compatibility with timefreeze)
This commit is contained in:
commit
c828faa328
2 changed files with 15 additions and 1 deletions
12
firefox-37-build-with-time-independent-uuids.patch
Normal file
12
firefox-37-build-with-time-independent-uuids.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
diff -ur mozilla-release/python/mach/mach/main.py mozilla-release.new/python/mach/mach/main.py
|
||||
--- mozilla-release/python/mach/mach/main.py 2015-04-03 05:30:08.000000000 +0300
|
||||
+++ mozilla-release.new/python/mach/mach/main.py 2015-04-20 13:03:05.743443939 +0300
|
||||
@@ -261,7 +261,7 @@
|
||||
mod = imp.new_module(b'mach.commands')
|
||||
sys.modules[b'mach.commands'] = mod
|
||||
|
||||
- module_name = 'mach.commands.%s' % uuid.uuid1().get_hex()
|
||||
+ module_name = 'mach.commands.%s' % uuid.uuid4().get_hex()
|
||||
|
||||
imp.load_source(module_name, path)
|
||||
|
|
@ -30,7 +30,7 @@ Summary: Next generation web browser
|
|||
Name: firefox
|
||||
Version: %{major}
|
||||
Epoch: %{ff_epoch}
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: MPLv1+
|
||||
Group: Networking/WWW
|
||||
Url: http://www.mozilla.com/firefox/
|
||||
|
@ -56,6 +56,7 @@ Patch11: firefox-37-kde.patch
|
|||
Patch12: mozilla-37-kde.patch
|
||||
#Patch13: mozilla-kde-background.patch
|
||||
Patch34: xulrunner_nojit.patch
|
||||
Patch35: firefox-37-build-with-time-independent-uuids.patch
|
||||
|
||||
# Fedora specific patches
|
||||
# Unable to install addons from https pages
|
||||
|
@ -179,6 +180,7 @@ Files and macros mainly for building Firefox extensions.
|
|||
%patch34 -p1
|
||||
%endif
|
||||
%endif
|
||||
%patch35 -p1
|
||||
|
||||
# Fedora patches
|
||||
%patch204 -p2 -b .966424
|
||||
|
|
Loading…
Add table
Reference in a new issue