Modified unpacking dir, added build patch for wrong .toml file
This commit is contained in:
parent
ed27cec155
commit
69d0a80cfb
12
build-toml-fix.patch
Normal file
12
build-toml-fix.patch
Normal 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"}
|
||||||
|
|
@ -38,7 +38,7 @@
|
|||||||
|
|
||||||
# Use system libicu?
|
# Use system libicu?
|
||||||
%if 0%{?fedora} > 27
|
%if 0%{?fedora} > 27
|
||||||
%define system_libicu 1
|
%define system_libicu 0
|
||||||
%else
|
%else
|
||||||
%define system_libicu 0
|
%define system_libicu 0
|
||||||
%endif
|
%endif
|
||||||
@ -135,6 +135,7 @@ Patch302: mozilla-1228540.patch
|
|||||||
Patch303: mozilla-1253216.patch
|
Patch303: mozilla-1253216.patch
|
||||||
Patch304: mozilla-1245783.patch
|
Patch304: mozilla-1245783.patch
|
||||||
Patch305: build-fix-dupes.patch
|
Patch305: build-fix-dupes.patch
|
||||||
|
Patch306: build-toml-fix.patch
|
||||||
|
|
||||||
# Fedora specific patches
|
# Fedora specific patches
|
||||||
Patch400: rhbz-966424.patch
|
Patch400: rhbz-966424.patch
|
||||||
@ -245,8 +246,7 @@ your bug already has a solution!
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q
|
||||||
cd %{tarballdir}
|
|
||||||
|
|
||||||
%patch0 -p1 -b .dir
|
%patch0 -p1 -b .dir
|
||||||
%patch100 -p2 -b .objdir
|
%patch100 -p2 -b .objdir
|
||||||
@ -277,6 +277,7 @@ cd mozilla
|
|||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
%patch305 -p1 -b .fix-dupes
|
%patch305 -p1 -b .fix-dupes
|
||||||
|
%patch306 -p1 -b .build-toml-fix
|
||||||
%patch105 -p1 -b .bad-langs
|
%patch105 -p1 -b .bad-langs
|
||||||
%patch200 -p1 -b .addons
|
%patch200 -p1 -b .addons
|
||||||
|
|
||||||
@ -430,8 +431,6 @@ case "%{sqlite_build_version}" in
|
|||||||
esac
|
esac
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
cd %{tarballdir}
|
|
||||||
|
|
||||||
%if 0%{?big_endian}
|
%if 0%{?big_endian}
|
||||||
echo "Generate big endian version of config/external/icu/data/icud58l.dat"
|
echo "Generate big endian version of config/external/icu/data/icud58l.dat"
|
||||||
cd mozilla
|
cd mozilla
|
||||||
@ -513,7 +512,7 @@ make -C %{objdir} buildsymbols
|
|||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd %{tarballdir}/%{objdir}
|
cd %{objdir}
|
||||||
|
|
||||||
DESTDIR=$RPM_BUILD_ROOT make install
|
DESTDIR=$RPM_BUILD_ROOT make install
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user