Djam/firefox-esr78
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr78.git synced 2025-02-25 02:32:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply upstream patches

Browse source
This commit is contained in:
Tigro 2013-04-03 15:42:00 +04:00
parent fa538f3f67
commit 5efdf5b77d
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
firefox.spec
View file

@ -74,11 +74,13 @@ Patch12: mozilla-20.0-kde.patch
Patch13: firefox-13-fix-nspr-include.patch
Patch14: firefox-18-fix-cairo-build.patch
Patch17: xulrunner-15.0-gcc47.patch
#Patch19: rhbz-304121.patch
Patch19: rhbz-304121.patch
Patch34: xulrunner_nojit.patch
# fix moz#806099
Patch100: mozilla-806099-fix.patch
# Upstream patches
Patch101: mozilla-791626.patch
Patch102: mozilla-239254.patch
# (cjw) use system virtualenv
Patch36: firefox-17.0-virtualenv.patch
BuildRequires: gtk+2-devel
@ -187,7 +189,7 @@ Files and macros mainly for building Firefox extensions.
%patch10 -p1 -b .default-mail-handler
%patch14 -p1
%patch17 -p2 -b .gcc47
#patch19 -p2 -b .rhbz-304121
patch19 -p2 -b .rhbz-304121
## KDE INTEGRATION
# Disable kde integration , need refactoring
@ -201,7 +203,8 @@ Files and macros mainly for building Firefox extensions.
%endif
#%patch36 -p1 -b .system-virtualenv
#%patch100 -p1 -b .806099
%patch101 -p1 -b .791626
%patch102 -p1 -b .239254
pushd js/src
autoconf-2.13

13
rhbz-304121.patch
View file

@ -1,13 +1,12 @@
diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile.old firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile
diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
--- firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old 2013-01-05 00:44:41.000000000 +0100
+++ firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-10 14:48:58.418321640 +0100
@@ -376,7 +376,7 @@ class MakefileGenerator(object):
diff -up xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.rhbz-304121 xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
--- xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.rhbz-304121 2013-03-26 23:17:58.000000000 +0100
+++ xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-04-01 11:11:56.938411785 +0200
@@ -377,7 +377,7 @@ class MakefileGenerator(object):
WriteMakefile(output_file, data, build_file, depth, top,
# we set srcdir up one directory, since the subdir
# doesn't actually exist in the source directory
- swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
+ swapslashes(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
self.relative_srcdir)
self.relative_srcdir,
self.common_mk_path)
return True