Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11035710
D9334.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D9334.diff
View Options
diff --git a/files/0001-fix-rust-1.45-build.patch b/files/0001-fix-rust-1.45-build.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-fix-rust-1.45-build.patch
@@ -0,0 +1,30 @@
+
+diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk
++++ b/config/makefiles/rust.mk
+@@ -56,17 +56,21 @@ endif
+ # These flags are passed via `cargo rustc` and only apply to the final rustc
+ # invocation (i.e., only the top-level crate, not its dependencies).
+ cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
+ ifndef DEVELOPER_OPTIONS
+ ifndef MOZ_DEBUG_RUST
+ # Enable link-time optimization for release builds, but not when linking
+ # gkrust_gtest.
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
++# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true
++# for newer ones that support it. Combining the latter with -Clto works, so
++# set both everywhere.
+ cargo_rustc_flags += -Clto
++export CARGO_PROFILE_RELEASE_LTO=true
+ endif
+ endif
+ endif
+
+ ifdef CARGO_INCREMENTAL
+ export CARGO_INCREMENTAL
+ endif
+
+
+
+
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : firefox
version : 79.0
-release : 195
+release : 196
source :
- https://ftp.mozilla.org/pub/firefox/releases/79.0/source/firefox-79.0.source.tar.xz : 12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713
- https://getsol.us/sources/mozilla/firefox-79.0-langpacks.tar.xz : b275494f960740e82734272c78f8c335c22362330a2b607fa35021c6c46969c2
@@ -46,7 +46,7 @@
cp $pkgfiles/config .mozconfig
sed 's@\#\#JOBCOUNT\#\#@%JOBS%@' -i .mozconfig
echo "ac_add_options --with-mozilla-api-keyfile=${workdir}/mozilla-api-key" >> .mozconfig
-
+ %patch -p1 -i $pkgfiles/0001-fix-rust-1.45-build.patch
./mach configure
build : |
xvfb-run -a -n 55 -s "-screen 0 1024x768x24 -ac +extension GLX +render -noreset" ./mach build
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>firefox</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>F. von Gellhorn</Name>
+ <Email>flinux@vongellhorn.ch</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<License>MPL-2.0</License>
@@ -172,12 +172,12 @@
</Files>
</Package>
<History>
- <Update release="195">
+ <Update release="196">
<Date>2020-07-27</Date>
<Version>79.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@streambits.io</Email>
+ <Name>F. von Gellhorn</Name>
+ <Email>flinux@vongellhorn.ch</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Aug 10, 6:14 PM (1 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5830353
Default Alt Text
D9334.diff (2 KB)
Attached To
Mode
D9334: Fix Firefox build for new rust version
Attached
Detach File
Event Timeline
Log In to Comment