Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11037659
D2523.id6180.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
11 KB
Referenced Files
None
Subscribers
None
D2523.id6180.diff
View Options
diff --git a/files/firefox-install-dir.patch b/files/firefox-install-dir.patch
deleted file mode 100644
--- a/files/firefox-install-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/mozilla-release/config/baseconfig.mk
---- mozilla-release/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200
-+++ mozilla-release/config/baseconfig.mk 2014-04-22 15:42:20.387481673 +0200
-@@ -4,7 +4,7 @@
- # whether a normal build is happening or whether the check is running.
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifndef TOP_DIST
- TOP_DIST = dist
diff --git a/files/moz1436251.patch b/files/moz1436251.patch
new file mode 100644
--- /dev/null
+++ b/files/moz1436251.patch
@@ -0,0 +1,66 @@
+
+# HG changeset patch
+# User Manish Goregaokar <manishearth@gmail.com>
+# Date 1517972763 28800
+# Node ID fe90c7d53a7c80e6f174e52965b59ff6130dcf9e
+# Parent c149e5048e652f6826510979b8d5ad904df32213
+Bug 1436251 - Set codegen-units=1 in --enable-release; r=glandium
+
+MozReview-Commit-ID: 8kGTFAXfB2i
+
+diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
+--- a/python/mozbuild/mozbuild/frontend/emitter.py
++++ b/python/mozbuild/mozbuild/frontend/emitter.py
+@@ -550,16 +550,17 @@ class TreeMetadataEmitter(LoggingMixin):
+ 'panic': 'abort',
+ }
+ else:
+ expected_profile = {
+ 'opt-level': 2,
+ 'rpath': False,
+ 'debug-assertions': False,
+ 'panic': 'abort',
++ 'codegen-units': 1,
+ }
+
+ if profile != expected_profile:
+ raise SandboxValidationError(
+ 'Cargo profile.%s for %s is incorrect' % (profile_name, libname),
+ context)
+
+ cargo_target_dir = context.get('RUST_LIBRARY_TARGET_DIR', '.')
+diff --git a/toolkit/library/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml
+--- a/toolkit/library/gtest/rust/Cargo.toml
++++ b/toolkit/library/gtest/rust/Cargo.toml
+@@ -40,12 +40,13 @@ debug-assertions = true
+ codegen-units = 4
+ panic = "abort"
+
+ [profile.release]
+ opt-level = 2
+ rpath = false
+ debug-assertions = false
+ panic = "abort"
++codegen-units = 1
+
+ [patch.crates-io]
+ libudev-sys = { path = "../../../../dom/webauthn/libudev-sys" }
+ serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums4", feature = "deserialize_in_place" }
+diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
+--- a/toolkit/library/rust/Cargo.toml
++++ b/toolkit/library/rust/Cargo.toml
+@@ -40,12 +40,13 @@ debug-assertions = true
+ codegen-units = 4
+ panic = "abort"
+
+ [profile.release]
+ opt-level = 2
+ rpath = false
+ debug-assertions = false
+ panic = "abort"
++codegen-units = 1
+
+ [patch.crates-io]
+ libudev-sys = { path = "../../../dom/webauthn/libudev-sys" }
+ serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums4", feature = "deserialize_in_place" }
+
diff --git a/files/prefs.js b/files/prefs.js
--- a/files/prefs.js
+++ b/files/prefs.js
@@ -1,5 +1,5 @@
pref("general.smoothScroll", true);
-pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
pref("toolkit.networkmanager.disable", false);
pref("toolkit.storage.synchronous", 0);
pref("offline.autoDetect", true);
@@ -21,4 +21,4 @@
pref("layers.acceleration.force-enabled", false);
pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
pref("browser.tabs.remote.autostart", true);
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
\ No newline at end of file
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,9 @@
name : firefox
-version : 58.0.2
-release : 119
+version : '59.0'
+release : 120
source :
- - https://ftp.mozilla.org/pub/firefox/releases/58.0.2/source/firefox-58.0.2.source.tar.xz : 2b7794e4c2a24fa388f3acb2956c96bb2c3eae455467f0e386788ebaea7240c3
- - https://solus-project.com/sources/mozilla/firefox-58.0.2-langpacks.tar.xz : 878ba751dfa73bbf977c713f64e4e89cfbd7e2f4fbf07e046d99406d03e44453
+ - https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_59_0_RELEASE.tar.bz2 : 10144301f54a9aec8993c715be55904c58161a73c7b5065c8319c776fc95927c
+ - https://solus-project.com/sources/mozilla/firefox-59.0-langpacks.tar.xz : 8733e0519e5b14e94d8730ecb59900228af3ac57e7b0ef55d595d74c586cf147
license :
- GPL-2.0
- MPL-2.0
@@ -21,7 +21,6 @@
- pkgconfig(gtk+-3.0)
- pkgconfig(hunspell)
- pkgconfig(libevent)
- - pkgconfig(libffi)
- pkgconfig(libpulse)
- pkgconfig(libstartup-notification-1.0)
- pkgconfig(libturbojpeg)
@@ -35,13 +34,12 @@
- bzip2-devel
- cargo
- llvm-clang
- - rust
- yasm
rundeps :
- ffmpeg
setup : |
- # Fix installation directory woes
- %patch -p1 < $pkgfiles/firefox-install-dir.patch
+ # This is fixed in FF 60
+ %patch -p1 < $pkgfiles/moz1436251.patch
cp $pkgfiles/mozilla-api-key .
cp $pkgfiles/config mozconfig
@@ -50,6 +48,7 @@
# GCC6 produces completely broken Firefox
export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
export CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+
./mach build
./mach buildsymbols
install : |
@@ -65,10 +64,11 @@
export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
export CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+
DESTDIR=$installdir ./mach install
mkdir -p $installdir/usr/share/pixmaps
- ln -sv %libdir%/firefox/browser/icons/mozicon128.png $installdir/usr/share/pixmaps/firefox.png
+ ln -sv %libdir%/firefox/browser/chrome/icons/default/default128.png $installdir/usr/share/pixmaps/firefox.png
ln -sv %libdir%/mozilla/plugins $installdir/%libdir%/firefox/plugins
@@ -78,4 +78,3 @@
mkdir -p $installdir/%libdir%/firefox/browser/defaults/preferences
install -m 00644 $pkgfiles/prefs.js $installdir/%libdir%/firefox/browser/defaults/preferences/prefs.js
install -m 00644 $pkgfiles/firefox-l10n.js $installdir/%libdir%/firefox/browser/defaults/preferences/firefox-l10n.js
-
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@stroblindustries.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>GPL-2.0</License>
<License>MPL-2.0</License>
@@ -25,9 +25,11 @@
<Path fileType="library">/usr/lib/firefox/application.ini</Path>
<Path fileType="library">/usr/lib/firefox/browser/blocklist.xml</Path>
<Path fileType="library">/usr/lib/firefox/browser/chrome.manifest</Path>
+ <Path fileType="library">/usr/lib/firefox/browser/chrome/icons/default/default128.png</Path>
<Path fileType="library">/usr/lib/firefox/browser/chrome/icons/default/default16.png</Path>
<Path fileType="library">/usr/lib/firefox/browser/chrome/icons/default/default32.png</Path>
<Path fileType="library">/usr/lib/firefox/browser/chrome/icons/default/default48.png</Path>
+ <Path fileType="library">/usr/lib/firefox/browser/chrome/icons/default/default64.png</Path>
<Path fileType="library">/usr/lib/firefox/browser/crashreporter-override.ini</Path>
<Path fileType="library">/usr/lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi</Path>
<Path fileType="library">/usr/lib/firefox/browser/features/activity-stream@mozilla.org.xpi</Path>
@@ -39,7 +41,6 @@
<Path fileType="library">/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi</Path>
<Path fileType="library">/usr/lib/firefox/browser/features/shield-recipe-client@mozilla.org.xpi</Path>
<Path fileType="library">/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi</Path>
- <Path fileType="library">/usr/lib/firefox/browser/icons/mozicon128.png</Path>
<Path fileType="library">/usr/lib/firefox/browser/omni.ja</Path>
<Path fileType="library">/usr/lib/firefox/chrome.manifest</Path>
<Path fileType="library">/usr/lib/firefox/crashreporter</Path>
@@ -54,7 +55,7 @@
<Path fileType="library">/usr/lib/firefox/gmp-clearkey/0.1/libclearkey.so</Path>
<Path fileType="library">/usr/lib/firefox/gmp-clearkey/0.1/manifest.json</Path>
<Path fileType="library">/usr/lib/firefox/gtk2/libmozgtk.so</Path>
- <Path fileType="library">/usr/lib/firefox/icudt59l.dat</Path>
+ <Path fileType="library">/usr/lib/firefox/icudt60l.dat</Path>
<Path fileType="library">/usr/lib/firefox/libfreeblpriv3.chk</Path>
<Path fileType="library">/usr/lib/firefox/libfreeblpriv3.so</Path>
<Path fileType="library">/usr/lib/firefox/liblgpllibs.so</Path>
@@ -130,6 +131,7 @@
<Path fileType="library">/usr/lib64/firefox/browser/extensions/langpack-hsb@firefox.mozilla.org.xpi</Path>
<Path fileType="library">/usr/lib64/firefox/browser/extensions/langpack-hu@firefox.mozilla.org.xpi</Path>
<Path fileType="library">/usr/lib64/firefox/browser/extensions/langpack-hy-AM@firefox.mozilla.org.xpi</Path>
+ <Path fileType="library">/usr/lib64/firefox/browser/extensions/langpack-ia@firefox.mozilla.org.xpi</Path>
<Path fileType="library">/usr/lib64/firefox/browser/extensions/langpack-id@firefox.mozilla.org.xpi</Path>
<Path fileType="library">/usr/lib64/firefox/browser/extensions/langpack-is@firefox.mozilla.org.xpi</Path>
<Path fileType="library">/usr/lib64/firefox/browser/extensions/langpack-it@firefox.mozilla.org.xpi</Path>
@@ -185,12 +187,12 @@
</Files>
</Package>
<History>
- <Update release="119">
- <Date>2018-03-05</Date>
- <Version>58.0.2</Version>
+ <Update release="120">
+ <Date>2018-03-15</Date>
+ <Version>59.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
-</PISI>
\ No newline at end of file
+</PISI>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Aug 10, 9:04 PM (1 d, 4 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5807419
Default Alt Text
D2523.id6180.diff (11 KB)
Attached To
Mode
D2523: Update firefox to 59.0
Attached
Detach File
Event Timeline
Log In to Comment