Modified unpacking dir, added build patch for wrong .toml file

This commit is contained in:
Jan Horak 2017-08-21 12:22:33 +02:00
parent ed27cec155
commit 69d0a80cfb
2 changed files with 17 additions and 6 deletions

12
build-toml-fix.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up thunderbird-52.3.0/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml.toml-fix thunderbird-52.3.0/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml
--- thunderbird-52.3.0/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml.toml-fix 2017-08-21 10:51:01.408785691 +0200
+++ thunderbird-52.3.0/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml 2017-08-21 10:51:05.904787854 +0200
@@ -20,8 +20,6 @@ exclude = [
build = false
-build = false
-
[dependencies]
"mp4parse" = {version = "0.6.0", path = "../mp4parse"}

View File

@ -38,7 +38,7 @@
# Use system libicu?
%if 0%{?fedora} > 27
%define system_libicu 1
%define system_libicu 0
%else
%define system_libicu 0
%endif
@ -135,6 +135,7 @@ Patch302: mozilla-1228540.patch
Patch303: mozilla-1253216.patch
Patch304: mozilla-1245783.patch
Patch305: build-fix-dupes.patch
Patch306: build-toml-fix.patch
# Fedora specific patches
Patch400: rhbz-966424.patch
@ -245,8 +246,7 @@ your bug already has a solution!
%prep
%setup -q -c
cd %{tarballdir}
%setup -q
%patch0 -p1 -b .dir
%patch100 -p2 -b .objdir
@ -277,6 +277,7 @@ cd mozilla
cd ..
%patch305 -p1 -b .fix-dupes
%patch306 -p1 -b .build-toml-fix
%patch105 -p1 -b .bad-langs
%patch200 -p1 -b .addons
@ -430,8 +431,6 @@ case "%{sqlite_build_version}" in
esac
%endif
cd %{tarballdir}
%if 0%{?big_endian}
echo "Generate big endian version of config/external/icu/data/icud58l.dat"
cd mozilla
@ -513,7 +512,7 @@ make -C %{objdir} buildsymbols
#===============================================================================
%install
cd %{tarballdir}/%{objdir}
cd %{objdir}
DESTDIR=$RPM_BUILD_ROOT make install